Commit af571a61 authored by BlackAngle233's avatar BlackAngle233
Browse files

212

parent 1d9b5391
using System; using System;
namespace Packages.Rider.Editor { namespace Packages.Rider.Editor {
class GUIDProvider : IGUIDGenerator class GUIDProvider : IGUIDGenerator
{ {
public string ProjectGuid(string projectName, string assemblyName) public string ProjectGuid(string projectName, string assemblyName)
{ {
return SolutionGuidGenerator.GuidForProject(projectName + assemblyName); return SolutionGuidGenerator.GuidForProject(projectName + assemblyName);
} }
public string SolutionGuid(string projectName, string extension) public string SolutionGuid(string projectName, string extension)
{ {
return SolutionGuidGenerator.GuidForSolution(projectName, extension); // GetExtensionOfSourceFiles(assembly.sourceFiles) return SolutionGuidGenerator.GuidForSolution(projectName, extension); // GetExtensionOfSourceFiles(assembly.sourceFiles)
} }
} }
} }
fileFormatVersion: 2 fileFormatVersion: 2
guid: 8cfde1a59fb35574189691a9de1df93b guid: 8cfde1a59fb35574189691a9de1df93b
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Security; using System.Security;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Packages.Rider.Editor.Util; using Packages.Rider.Editor.Util;
using UnityEditor; using UnityEditor;
using UnityEditor.Compilation; using UnityEditor.Compilation;
using UnityEditor.PackageManager; using UnityEditor.PackageManager;
using UnityEditorInternal; using UnityEditorInternal;
using UnityEngine; using UnityEngine;
namespace Packages.Rider.Editor namespace Packages.Rider.Editor
{ {
public interface IGenerator public interface IGenerator
{ {
bool SyncIfNeeded(IEnumerable<string> affectedFiles, IEnumerable<string> reimportedFiles); bool SyncIfNeeded(IEnumerable<string> affectedFiles, IEnumerable<string> reimportedFiles);
void Sync(); void Sync();
bool HasSolutionBeenGenerated(); bool HasSolutionBeenGenerated();
string SolutionFile(); string SolutionFile();
string ProjectDirectory { get; } string ProjectDirectory { get; }
void GenerateAll(bool generateAll); void GenerateAll(bool generateAll);
} }
public interface IFileIO public interface IFileIO
{ {
bool Exists(string fileName); bool Exists(string fileName);
string ReadAllText(string fileName); string ReadAllText(string fileName);
void WriteAllText(string fileName, string content); void WriteAllText(string fileName, string content);
} }
public interface IGUIDGenerator public interface IGUIDGenerator
{ {
string ProjectGuid(string projectName, string assemblyName); string ProjectGuid(string projectName, string assemblyName);
string SolutionGuid(string projectName, string extension); string SolutionGuid(string projectName, string extension);
} }
public interface IAssemblyNameProvider public interface IAssemblyNameProvider
{ {
string GetAssemblyNameFromScriptPath(string path); string GetAssemblyNameFromScriptPath(string path);
IEnumerable<Assembly> GetAssemblies(Func<string, bool> shouldFileBePartOfSolution); IEnumerable<Assembly> GetAssemblies(Func<string, bool> shouldFileBePartOfSolution);
IEnumerable<string> GetAllAssetPaths(); IEnumerable<string> GetAllAssetPaths();
UnityEditor.PackageManager.PackageInfo FindForAssetPath(string assetPath); UnityEditor.PackageManager.PackageInfo FindForAssetPath(string assetPath);
ResponseFileData ParseResponseFile(string responseFilePath, string projectDirectory, string[] systemReferenceDirectories); ResponseFileData ParseResponseFile(string responseFilePath, string projectDirectory, string[] systemReferenceDirectories);
} }
class AssemblyNameProvider : IAssemblyNameProvider class AssemblyNameProvider : IAssemblyNameProvider
{ {
public string GetAssemblyNameFromScriptPath(string path) public string GetAssemblyNameFromScriptPath(string path)
{ {
return CompilationPipeline.GetAssemblyNameFromScriptPath(path); return CompilationPipeline.GetAssemblyNameFromScriptPath(path);
} }
public IEnumerable<Assembly> GetAssemblies(Func<string, bool> shouldFileBePartOfSolution) public IEnumerable<Assembly> GetAssemblies(Func<string, bool> shouldFileBePartOfSolution)
{ {
return CompilationPipeline.GetAssemblies() return CompilationPipeline.GetAssemblies()
.Where(i => 0 < i.sourceFiles.Length && i.sourceFiles.Any(shouldFileBePartOfSolution)); .Where(i => 0 < i.sourceFiles.Length && i.sourceFiles.Any(shouldFileBePartOfSolution));
} }
public IEnumerable<string> GetAllAssetPaths() public IEnumerable<string> GetAllAssetPaths()
{ {
return AssetDatabase.GetAllAssetPaths(); return AssetDatabase.GetAllAssetPaths();
} }
public UnityEditor.PackageManager.PackageInfo FindForAssetPath(string assetPath) public UnityEditor.PackageManager.PackageInfo FindForAssetPath(string assetPath)
{ {
return UnityEditor.PackageManager.PackageInfo.FindForAssetPath(assetPath); return UnityEditor.PackageManager.PackageInfo.FindForAssetPath(assetPath);
} }
public ResponseFileData ParseResponseFile(string responseFilePath, string projectDirectory, string[] systemReferenceDirectories) public ResponseFileData ParseResponseFile(string responseFilePath, string projectDirectory, string[] systemReferenceDirectories)
{ {
return CompilationPipeline.ParseResponseFile( return CompilationPipeline.ParseResponseFile(
responseFilePath, responseFilePath,
projectDirectory, projectDirectory,
systemReferenceDirectories systemReferenceDirectories
); );
} }
} }
public class ProjectGeneration : IGenerator public class ProjectGeneration : IGenerator
{ {
enum ScriptingLanguage enum ScriptingLanguage
{ {
None, None,
CSharp CSharp
} }
public static readonly string MSBuildNamespaceUri = "http://schemas.microsoft.com/developer/msbuild/2003"; public static readonly string MSBuildNamespaceUri = "http://schemas.microsoft.com/developer/msbuild/2003";
/// <summary> /// <summary>
/// Map source extensions to ScriptingLanguages /// Map source extensions to ScriptingLanguages
/// </summary> /// </summary>
static readonly Dictionary<string, ScriptingLanguage> k_BuiltinSupportedExtensions = static readonly Dictionary<string, ScriptingLanguage> k_BuiltinSupportedExtensions =
new Dictionary<string, ScriptingLanguage> new Dictionary<string, ScriptingLanguage>
{ {
{"cs", ScriptingLanguage.CSharp}, {"cs", ScriptingLanguage.CSharp},
{"uxml", ScriptingLanguage.None}, {"uxml", ScriptingLanguage.None},
{"uss", ScriptingLanguage.None}, {"uss", ScriptingLanguage.None},
{"shader", ScriptingLanguage.None}, {"shader", ScriptingLanguage.None},
{"compute", ScriptingLanguage.None}, {"compute", ScriptingLanguage.None},
{"cginc", ScriptingLanguage.None}, {"cginc", ScriptingLanguage.None},
{"hlsl", ScriptingLanguage.None}, {"hlsl", ScriptingLanguage.None},
{"glslinc", ScriptingLanguage.None}, {"glslinc", ScriptingLanguage.None},
{"template", ScriptingLanguage.None}, {"template", ScriptingLanguage.None},
{"raytrace", ScriptingLanguage.None} {"raytrace", ScriptingLanguage.None}
}; };
string m_SolutionProjectEntryTemplate = string.Join(Environment.NewLine, string m_SolutionProjectEntryTemplate = string.Join(Environment.NewLine,
@"Project(""{{{0}}}"") = ""{1}"", ""{2}"", ""{{{3}}}""", @"Project(""{{{0}}}"") = ""{1}"", ""{2}"", ""{{{3}}}""",
@"EndProject").Replace(" ", "\t"); @"EndProject").Replace(" ", "\t");
string m_SolutionProjectConfigurationTemplate = string.Join(Environment.NewLine, string m_SolutionProjectConfigurationTemplate = string.Join(Environment.NewLine,
@" {{{0}}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU", @" {{{0}}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU",
@" {{{0}}}.Debug|Any CPU.Build.0 = Debug|Any CPU", @" {{{0}}}.Debug|Any CPU.Build.0 = Debug|Any CPU",
@" {{{0}}}.Release|Any CPU.ActiveCfg = Release|Any CPU", @" {{{0}}}.Release|Any CPU.ActiveCfg = Release|Any CPU",
@" {{{0}}}.Release|Any CPU.Build.0 = Release|Any CPU").Replace(" ", "\t"); @" {{{0}}}.Release|Any CPU.Build.0 = Release|Any CPU").Replace(" ", "\t");
static readonly string[] k_ReimportSyncExtensions = {".dll", ".asmdef"}; static readonly string[] k_ReimportSyncExtensions = {".dll", ".asmdef"};
/// <summary> /// <summary>
/// Map ScriptingLanguages to project extensions /// Map ScriptingLanguages to project extensions
/// </summary> /// </summary>
/*static readonly Dictionary<ScriptingLanguage, string> k_ProjectExtensions = new Dictionary<ScriptingLanguage, string> /*static readonly Dictionary<ScriptingLanguage, string> k_ProjectExtensions = new Dictionary<ScriptingLanguage, string>
{ {
{ ScriptingLanguage.CSharp, ".csproj" }, { ScriptingLanguage.CSharp, ".csproj" },
{ ScriptingLanguage.None, ".csproj" }, { ScriptingLanguage.None, ".csproj" },
};*/ };*/
static readonly Regex k_ScriptReferenceExpression = new Regex( static readonly Regex k_ScriptReferenceExpression = new Regex(
@"^Library.ScriptAssemblies.(?<dllname>(?<project>.*)\.dll$)", @"^Library.ScriptAssemblies.(?<dllname>(?<project>.*)\.dll$)",
RegexOptions.Compiled | RegexOptions.IgnoreCase); RegexOptions.Compiled | RegexOptions.IgnoreCase);
string[] m_ProjectSupportedExtensions = new string[0]; string[] m_ProjectSupportedExtensions = new string[0];
bool m_ShouldGenerateAll; bool m_ShouldGenerateAll;
public string ProjectDirectory { get; } public string ProjectDirectory { get; }
public void GenerateAll(bool generateAll) public void GenerateAll(bool generateAll)
{ {
m_ShouldGenerateAll = generateAll; m_ShouldGenerateAll = generateAll;
} }
readonly string m_ProjectName; readonly string m_ProjectName;
readonly IAssemblyNameProvider m_AssemblyNameProvider; readonly IAssemblyNameProvider m_AssemblyNameProvider;
readonly IFileIO m_FileIOProvider; readonly IFileIO m_FileIOProvider;
readonly IGUIDGenerator m_GUIDGenerator; readonly IGUIDGenerator m_GUIDGenerator;
internal static bool isRiderProjectGeneration; // workaround to https://github.cds.internal.unity3d.com/unity/com.unity.ide.rider/issues/28 internal static bool isRiderProjectGeneration; // workaround to https://github.cds.internal.unity3d.com/unity/com.unity.ide.rider/issues/28
const string k_ToolsVersion = "4.0"; const string k_ToolsVersion = "4.0";
const string k_ProductVersion = "10.0.20506"; const string k_ProductVersion = "10.0.20506";
const string k_BaseDirectory = "."; const string k_BaseDirectory = ".";
const string k_TargetFrameworkVersion = "v4.7.1"; const string k_TargetFrameworkVersion = "v4.7.1";
const string k_TargetLanguageVersion = "latest"; const string k_TargetLanguageVersion = "latest";
static readonly Regex scriptReferenceExpression = new Regex( static readonly Regex scriptReferenceExpression = new Regex(
@"^Library.ScriptAssemblies.(?<dllname>(?<project>.*)\.dll$)", @"^Library.ScriptAssemblies.(?<dllname>(?<project>.*)\.dll$)",
RegexOptions.Compiled | RegexOptions.IgnoreCase); RegexOptions.Compiled | RegexOptions.IgnoreCase);
public ProjectGeneration() : this(Directory.GetParent(Application.dataPath).FullName) public ProjectGeneration() : this(Directory.GetParent(Application.dataPath).FullName)
{ {
} }
public ProjectGeneration(string tempDirectory) : this(tempDirectory, new AssemblyNameProvider(), new FileIOProvider(), new GUIDProvider()) public ProjectGeneration(string tempDirectory) : this(tempDirectory, new AssemblyNameProvider(), new FileIOProvider(), new GUIDProvider())
{ {
} }
public ProjectGeneration(string tempDirectory, IAssemblyNameProvider assemblyNameProvider, IFileIO fileIoProvider, IGUIDGenerator guidGenerator) public ProjectGeneration(string tempDirectory, IAssemblyNameProvider assemblyNameProvider, IFileIO fileIoProvider, IGUIDGenerator guidGenerator)
{ {
ProjectDirectory = tempDirectory.Replace('\\', '/'); ProjectDirectory = tempDirectory.Replace('\\', '/');
m_ProjectName = Path.GetFileName(ProjectDirectory); m_ProjectName = Path.GetFileName(ProjectDirectory);
m_AssemblyNameProvider = assemblyNameProvider; m_AssemblyNameProvider = assemblyNameProvider;
m_FileIOProvider = fileIoProvider; m_FileIOProvider = fileIoProvider;
m_GUIDGenerator = guidGenerator; m_GUIDGenerator = guidGenerator;
} }
/// <summary> /// <summary>
/// Syncs the scripting solution if any affected files are relevant. /// Syncs the scripting solution if any affected files are relevant.
/// </summary> /// </summary>
/// <returns> /// <returns>
/// Whether the solution was synced. /// Whether the solution was synced.
/// </returns> /// </returns>
/// <param name='affectedFiles'> /// <param name='affectedFiles'>
/// A set of files whose status has changed /// A set of files whose status has changed
/// </param> /// </param>
/// <param name="reimportedFiles"> /// <param name="reimportedFiles">
/// A set of files that got reimported /// A set of files that got reimported
/// </param> /// </param>
public bool SyncIfNeeded(IEnumerable<string> affectedFiles, IEnumerable<string> reimportedFiles) public bool SyncIfNeeded(IEnumerable<string> affectedFiles, IEnumerable<string> reimportedFiles)
{ {
SetupProjectSupportedExtensions(); SetupProjectSupportedExtensions();
if (HasFilesBeenModified(affectedFiles, reimportedFiles)) if (HasFilesBeenModified(affectedFiles, reimportedFiles))
{ {
Sync(); Sync();
return true; return true;
} }
return false; return false;
} }
bool HasFilesBeenModified(IEnumerable<string> affectedFiles, IEnumerable<string> reimportedFiles) bool HasFilesBeenModified(IEnumerable<string> affectedFiles, IEnumerable<string> reimportedFiles)
{ {
return affectedFiles.Any(ShouldFileBePartOfSolution) || reimportedFiles.Any(ShouldSyncOnReimportedAsset); return affectedFiles.Any(ShouldFileBePartOfSolution) || reimportedFiles.Any(ShouldSyncOnReimportedAsset);
} }
static bool ShouldSyncOnReimportedAsset(string asset) static bool ShouldSyncOnReimportedAsset(string asset)
{ {
return k_ReimportSyncExtensions.Contains(new FileInfo(asset).Extension); return k_ReimportSyncExtensions.Contains(new FileInfo(asset).Extension);
} }
public void Sync() public void Sync()
{ {
SetupProjectSupportedExtensions(); SetupProjectSupportedExtensions();
var types = GetAssetPostprocessorTypes(); var types = GetAssetPostprocessorTypes();
isRiderProjectGeneration = true; isRiderProjectGeneration = true;
bool externalCodeAlreadyGeneratedProjects = OnPreGeneratingCSProjectFiles(types); bool externalCodeAlreadyGeneratedProjects = OnPreGeneratingCSProjectFiles(types);
isRiderProjectGeneration = false; isRiderProjectGeneration = false;
if (!externalCodeAlreadyGeneratedProjects) if (!externalCodeAlreadyGeneratedProjects)
{ {
GenerateAndWriteSolutionAndProjects(types); GenerateAndWriteSolutionAndProjects(types);
} }
OnGeneratedCSProjectFiles(types); OnGeneratedCSProjectFiles(types);
} }
public bool HasSolutionBeenGenerated() public bool HasSolutionBeenGenerated()
{ {
return m_FileIOProvider.Exists(SolutionFile()); return m_FileIOProvider.Exists(SolutionFile());
} }
void SetupProjectSupportedExtensions() void SetupProjectSupportedExtensions()
{ {
m_ProjectSupportedExtensions = EditorSettings.projectGenerationUserExtensions; m_ProjectSupportedExtensions = EditorSettings.projectGenerationUserExtensions;
} }
bool ShouldFileBePartOfSolution(string file) bool ShouldFileBePartOfSolution(string file)
{ {
string extension = Path.GetExtension(file); string extension = Path.GetExtension(file);
// Exclude files coming from packages except if they are internalized. // Exclude files coming from packages except if they are internalized.
if (!m_ShouldGenerateAll && IsInternalizedPackagePath(file)) if (!m_ShouldGenerateAll && IsInternalizedPackagePath(file))
{ {
return false; return false;
} }
// Dll's are not scripts but still need to be included.. // Dll's are not scripts but still need to be included..
if (extension == ".dll") if (extension == ".dll")
return true; return true;
if (file.ToLower().EndsWith(".asmdef")) if (file.ToLower().EndsWith(".asmdef"))
return true; return true;
return IsSupportedExtension(extension); return IsSupportedExtension(extension);
} }
bool IsSupportedExtension(string extension) bool IsSupportedExtension(string extension)
{ {
extension = extension.TrimStart('.'); extension = extension.TrimStart('.');
if (k_BuiltinSupportedExtensions.ContainsKey(extension)) if (k_BuiltinSupportedExtensions.ContainsKey(extension))
return true; return true;
if (m_ProjectSupportedExtensions.Contains(extension)) if (m_ProjectSupportedExtensions.Contains(extension))
return true; return true;
return false; return false;
} }
static ScriptingLanguage ScriptingLanguageFor(Assembly island) static ScriptingLanguage ScriptingLanguageFor(Assembly island)
{ {
return ScriptingLanguageFor(GetExtensionOfSourceFiles(island.sourceFiles)); return ScriptingLanguageFor(GetExtensionOfSourceFiles(island.sourceFiles));
} }
static string GetExtensionOfSourceFiles(string[] files) static string GetExtensionOfSourceFiles(string[] files)
{ {
return files.Length > 0 ? GetExtensionOfSourceFile(files[0]) : "NA"; return files.Length > 0 ? GetExtensionOfSourceFile(files[0]) : "NA";
} }
static string GetExtensionOfSourceFile(string file) static string GetExtensionOfSourceFile(string file)
{ {
var ext = Path.GetExtension(file).ToLower(); var ext = Path.GetExtension(file).ToLower();
ext = ext.Substring(1); //strip dot ext = ext.Substring(1); //strip dot
return ext; return ext;
} }
static ScriptingLanguage ScriptingLanguageFor(string extension) static ScriptingLanguage ScriptingLanguageFor(string extension)
{ {
return k_BuiltinSupportedExtensions.TryGetValue(extension.TrimStart('.'), out var result) return k_BuiltinSupportedExtensions.TryGetValue(extension.TrimStart('.'), out var result)
? result ? result
: ScriptingLanguage.None; : ScriptingLanguage.None;
} }
public void GenerateAndWriteSolutionAndProjects(Type[] types) public void GenerateAndWriteSolutionAndProjects(Type[] types)
{ {
// Only synchronize islands that have associated source files and ones that we actually want in the project. // Only synchronize islands that have associated source files and ones that we actually want in the project.
// This also filters out DLLs coming from .asmdef files in packages. // This also filters out DLLs coming from .asmdef files in packages.
var assemblies = m_AssemblyNameProvider.GetAssemblies(ShouldFileBePartOfSolution); var assemblies = m_AssemblyNameProvider.GetAssemblies(ShouldFileBePartOfSolution);
var allAssetProjectParts = GenerateAllAssetProjectParts(); var allAssetProjectParts = GenerateAllAssetProjectParts();
var monoIslands = assemblies.ToList(); var monoIslands = assemblies.ToList();
SyncSolution(monoIslands, types); SyncSolution(monoIslands, types);
var allProjectIslands = RelevantIslandsForMode(monoIslands).ToList(); var allProjectIslands = RelevantIslandsForMode(monoIslands).ToList();
foreach (Assembly assembly in allProjectIslands) foreach (Assembly assembly in allProjectIslands)
{ {
var responseFileData = ParseResponseFileData(assembly); var responseFileData = ParseResponseFileData(assembly);
SyncProject(assembly, allAssetProjectParts, responseFileData, allProjectIslands, types); SyncProject(assembly, allAssetProjectParts, responseFileData, allProjectIslands, types);
} }
} }
IEnumerable<ResponseFileData> ParseResponseFileData(Assembly assembly) IEnumerable<ResponseFileData> ParseResponseFileData(Assembly assembly)
{ {
var systemReferenceDirectories = var systemReferenceDirectories =
CompilationPipeline.GetSystemAssemblyDirectories(assembly.compilerOptions.ApiCompatibilityLevel); CompilationPipeline.GetSystemAssemblyDirectories(assembly.compilerOptions.ApiCompatibilityLevel);
Dictionary<string, ResponseFileData> responseFilesData = assembly.compilerOptions.ResponseFiles.ToDictionary( Dictionary<string, ResponseFileData> responseFilesData = assembly.compilerOptions.ResponseFiles.ToDictionary(
x => x, x => m_AssemblyNameProvider.ParseResponseFile( x => x, x => m_AssemblyNameProvider.ParseResponseFile(
x, x,
ProjectDirectory, ProjectDirectory,
systemReferenceDirectories systemReferenceDirectories
)); ));
Dictionary<string, ResponseFileData> responseFilesWithErrors = responseFilesData.Where(x => x.Value.Errors.Any()) Dictionary<string, ResponseFileData> responseFilesWithErrors = responseFilesData.Where(x => x.Value.Errors.Any())
.ToDictionary(x => x.Key, x => x.Value); .ToDictionary(x => x.Key, x => x.Value);
if (responseFilesWithErrors.Any()) if (responseFilesWithErrors.Any())
{ {
foreach (var error in responseFilesWithErrors) foreach (var error in responseFilesWithErrors)
foreach (var valueError in error.Value.Errors) foreach (var valueError in error.Value.Errors)
{ {
Debug.LogError($"{error.Key} Parse Error : {valueError}"); Debug.LogError($"{error.Key} Parse Error : {valueError}");
} }
} }
return responseFilesData.Select(x => x.Value); return responseFilesData.Select(x => x.Value);
} }
Dictionary<string, string> GenerateAllAssetProjectParts() Dictionary<string, string> GenerateAllAssetProjectParts()
{ {
Dictionary<string, StringBuilder> stringBuilders = new Dictionary<string, StringBuilder>(); Dictionary<string, StringBuilder> stringBuilders = new Dictionary<string, StringBuilder>();
foreach (string asset in m_AssemblyNameProvider.GetAllAssetPaths()) foreach (string asset in m_AssemblyNameProvider.GetAllAssetPaths())
{ {
// Exclude files coming from packages except if they are internalized. // Exclude files coming from packages except if they are internalized.
if (!m_ShouldGenerateAll && IsInternalizedPackagePath(asset)) if (!m_ShouldGenerateAll && IsInternalizedPackagePath(asset))
{ {
continue; continue;
} }
string extension = Path.GetExtension(asset); string extension = Path.GetExtension(asset);
if (IsSupportedExtension(extension) && ScriptingLanguage.None == ScriptingLanguageFor(extension)) if (IsSupportedExtension(extension) && ScriptingLanguage.None == ScriptingLanguageFor(extension))
{ {
// Find assembly the asset belongs to by adding script extension and using compilation pipeline. // Find assembly the asset belongs to by adding script extension and using compilation pipeline.
var assemblyName = m_AssemblyNameProvider.GetAssemblyNameFromScriptPath(asset + ".cs"); var assemblyName = m_AssemblyNameProvider.GetAssemblyNameFromScriptPath(asset + ".cs");
if (string.IsNullOrEmpty(assemblyName)) if (string.IsNullOrEmpty(assemblyName))
{ {
continue; continue;
} }
assemblyName = FileSystemUtil.FileNameWithoutExtension(assemblyName); assemblyName = FileSystemUtil.FileNameWithoutExtension(assemblyName);
if (!stringBuilders.TryGetValue(assemblyName, out var projectBuilder)) if (!stringBuilders.TryGetValue(assemblyName, out var projectBuilder))
{ {
projectBuilder = new StringBuilder(); projectBuilder = new StringBuilder();
stringBuilders[assemblyName] = projectBuilder; stringBuilders[assemblyName] = projectBuilder;
} }
projectBuilder.Append(" <None Include=\"").Append(EscapedRelativePathFor(asset)).Append("\" />") projectBuilder.Append(" <None Include=\"").Append(EscapedRelativePathFor(asset)).Append("\" />")
.Append(Environment.NewLine); .Append(Environment.NewLine);
} }
} }
var result = new Dictionary<string, string>(); var result = new Dictionary<string, string>();
foreach (var entry in stringBuilders) foreach (var entry in stringBuilders)
result[entry.Key] = entry.Value.ToString(); result[entry.Key] = entry.Value.ToString();
return result; return result;
} }
bool IsInternalizedPackagePath(string file) bool IsInternalizedPackagePath(string file)
{ {
if (string.IsNullOrWhiteSpace(file)) if (string.IsNullOrWhiteSpace(file))
{ {
return false; return false;
} }
var packageInfo = m_AssemblyNameProvider.FindForAssetPath(file); var packageInfo = m_AssemblyNameProvider.FindForAssetPath(file);
if (packageInfo == null) if (packageInfo == null)
{ {
return false; return false;
} }
var packageSource = packageInfo.source; var packageSource = packageInfo.source;
return packageSource != PackageSource.Embedded && packageSource != PackageSource.Local; return packageSource != PackageSource.Embedded && packageSource != PackageSource.Local;
} }
void SyncProject( void SyncProject(
Assembly island, Assembly island,
Dictionary<string, string> allAssetsProjectParts, Dictionary<string, string> allAssetsProjectParts,
IEnumerable<ResponseFileData> responseFilesData, IEnumerable<ResponseFileData> responseFilesData,
List<Assembly> allProjectIslands, List<Assembly> allProjectIslands,
Type[] types) Type[] types)
{ {
SyncProjectFileIfNotChanged(ProjectFile(island), SyncProjectFileIfNotChanged(ProjectFile(island),
ProjectText(island, allAssetsProjectParts, responseFilesData.ToList(), allProjectIslands), types); ProjectText(island, allAssetsProjectParts, responseFilesData.ToList(), allProjectIslands), types);
} }
void SyncProjectFileIfNotChanged(string path, string newContents, Type[] types) void SyncProjectFileIfNotChanged(string path, string newContents, Type[] types)
{ {
if (Path.GetExtension(path) == ".csproj") if (Path.GetExtension(path) == ".csproj")
{ {
newContents = OnGeneratedCSProject(path, newContents, types); newContents = OnGeneratedCSProject(path, newContents, types);
} }
SyncFileIfNotChanged(path, newContents); SyncFileIfNotChanged(path, newContents);
} }
void SyncSolutionFileIfNotChanged(string path, string newContents, Type[] types) void SyncSolutionFileIfNotChanged(string path, string newContents, Type[] types)
{ {
newContents = OnGeneratedSlnSolution(path, newContents, types); newContents = OnGeneratedSlnSolution(path, newContents, types);
SyncFileIfNotChanged(path, newContents); SyncFileIfNotChanged(path, newContents);
} }
static List<Type> SafeGetTypes(System.Reflection.Assembly a) static List<Type> SafeGetTypes(System.Reflection.Assembly a)
{ {
List<Type> ret; List<Type> ret;
try try
{ {
ret = a.GetTypes().ToList(); ret = a.GetTypes().ToList();
} }
catch (System.Reflection.ReflectionTypeLoadException rtl) catch (System.Reflection.ReflectionTypeLoadException rtl)
{ {
ret = rtl.Types.ToList(); ret = rtl.Types.ToList();
} }
catch (Exception) catch (Exception)
{ {
return new List<Type>(); return new List<Type>();
} }
return ret.Where(r => r != null).ToList(); return ret.Where(r => r != null).ToList();
} }
static void OnGeneratedCSProjectFiles(Type[] types) static void OnGeneratedCSProjectFiles(Type[] types)
{ {
var args = new object[0]; var args = new object[0];
foreach (var type in types) foreach (var type in types)
{ {
var method = type.GetMethod("OnGeneratedCSProjectFiles", var method = type.GetMethod("OnGeneratedCSProjectFiles",
System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic |
System.Reflection.BindingFlags.Static); System.Reflection.BindingFlags.Static);
if (method == null) if (method == null)
{ {
continue; continue;
} }
method.Invoke(null, args); method.Invoke(null, args);
} }
} }
public static Type[] GetAssetPostprocessorTypes() public static Type[] GetAssetPostprocessorTypes()
{ {
return TypeCache.GetTypesDerivedFrom<AssetPostprocessor>().ToArray(); // doesn't find types from EditorPlugin, which is fine return TypeCache.GetTypesDerivedFrom<AssetPostprocessor>().ToArray(); // doesn't find types from EditorPlugin, which is fine
} }
static bool OnPreGeneratingCSProjectFiles(Type[] types) static bool OnPreGeneratingCSProjectFiles(Type[] types)
{ {
bool result = false; bool result = false;
foreach (var type in types) foreach (var type in types)
{ {
var args = new object[0]; var args = new object[0];
var method = type.GetMethod("OnPreGeneratingCSProjectFiles", var method = type.GetMethod("OnPreGeneratingCSProjectFiles",
System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic |
System.Reflection.BindingFlags.Static); System.Reflection.BindingFlags.Static);
if (method == null) if (method == null)
{ {
continue; continue;
} }
var returnValue = method.Invoke(null, args); var returnValue = method.Invoke(null, args);
if (method.ReturnType == typeof(bool)) if (method.ReturnType == typeof(bool))
{ {
result |= (bool) returnValue; result |= (bool) returnValue;
} }
} }
return result; return result;
} }
static string OnGeneratedCSProject(string path, string content, Type[] types) static string OnGeneratedCSProject(string path, string content, Type[] types)
{ {
foreach (var type in types) foreach (var type in types)
{ {
var args = new[] {path, content}; var args = new[] {path, content};
var method = type.GetMethod("OnGeneratedCSProject", var method = type.GetMethod("OnGeneratedCSProject",
System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic |
System.Reflection.BindingFlags.Static); System.Reflection.BindingFlags.Static);
if (method == null) if (method == null)
{ {
continue; continue;
} }
var returnValue = method.Invoke(null, args); var returnValue = method.Invoke(null, args);
if (method.ReturnType == typeof(string)) if (method.ReturnType == typeof(string))
{ {
content = (string) returnValue; content = (string) returnValue;
} }
} }
return content; return content;
} }
static string OnGeneratedSlnSolution(string path, string content, Type[] types) static string OnGeneratedSlnSolution(string path, string content, Type[] types)
{ {
foreach (var type in types) foreach (var type in types)
{ {
var args = new[] {path, content}; var args = new[] {path, content};
var method = type.GetMethod("OnGeneratedSlnSolution", var method = type.GetMethod("OnGeneratedSlnSolution",
System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic |
System.Reflection.BindingFlags.Static); System.Reflection.BindingFlags.Static);
if (method == null) if (method == null)
{ {
continue; continue;
} }
var returnValue = method.Invoke(null, args); var returnValue = method.Invoke(null, args);
if (method.ReturnType == typeof(string)) if (method.ReturnType == typeof(string))
{ {
content = (string) returnValue; content = (string) returnValue;
} }
} }
return content; return content;
} }
void SyncFileIfNotChanged(string filename, string newContents) void SyncFileIfNotChanged(string filename, string newContents)
{ {
try try
{ {
if (m_FileIOProvider.Exists(filename) && newContents == m_FileIOProvider.ReadAllText(filename)) if (m_FileIOProvider.Exists(filename) && newContents == m_FileIOProvider.ReadAllText(filename))
{ {
return; return;
} }
} }
catch (Exception exception) catch (Exception exception)
{ {
Debug.LogException(exception); Debug.LogException(exception);
} }
m_FileIOProvider.WriteAllText(filename, newContents); m_FileIOProvider.WriteAllText(filename, newContents);
} }
string ProjectText(Assembly assembly, string ProjectText(Assembly assembly,
Dictionary<string, string> allAssetsProjectParts, Dictionary<string, string> allAssetsProjectParts,
List<ResponseFileData> responseFilesData, List<ResponseFileData> responseFilesData,
List<Assembly> allProjectIslands) List<Assembly> allProjectIslands)
{ {
var projectBuilder = new StringBuilder(ProjectHeader(assembly, responseFilesData)); var projectBuilder = new StringBuilder(ProjectHeader(assembly, responseFilesData));
var references = new List<string>(); var references = new List<string>();
var projectReferences = new List<Match>(); var projectReferences = new List<Match>();
foreach (string file in assembly.sourceFiles) foreach (string file in assembly.sourceFiles)
{ {
if (!ShouldFileBePartOfSolution(file)) if (!ShouldFileBePartOfSolution(file))
continue; continue;
var extension = Path.GetExtension(file).ToLower(); var extension = Path.GetExtension(file).ToLower();
var fullFile = EscapedRelativePathFor(file); var fullFile = EscapedRelativePathFor(file);
if (".dll" != extension) if (".dll" != extension)
{ {
projectBuilder.Append(" <Compile Include=\"").Append(fullFile).Append("\" />").Append(Environment.NewLine); projectBuilder.Append(" <Compile Include=\"").Append(fullFile).Append("\" />").Append(Environment.NewLine);
} }
else else
{ {
references.Add(fullFile); references.Add(fullFile);
} }
} }
// Append additional non-script files that should be included in project generation. // Append additional non-script files that should be included in project generation.
if (allAssetsProjectParts.TryGetValue(assembly.name, out var additionalAssetsForProject)) if (allAssetsProjectParts.TryGetValue(assembly.name, out var additionalAssetsForProject))
projectBuilder.Append(additionalAssetsForProject); projectBuilder.Append(additionalAssetsForProject);
var islandRefs = references.Union(assembly.allReferences); var islandRefs = references.Union(assembly.allReferences);
foreach (string reference in islandRefs) foreach (string reference in islandRefs)
{ {
if (reference.EndsWith("/UnityEditor.dll", StringComparison.Ordinal) if (reference.EndsWith("/UnityEditor.dll", StringComparison.Ordinal)
|| reference.EndsWith("/UnityEngine.dll", StringComparison.Ordinal) || reference.EndsWith("/UnityEngine.dll", StringComparison.Ordinal)
|| reference.EndsWith("\\UnityEditor.dll", StringComparison.Ordinal) || reference.EndsWith("\\UnityEditor.dll", StringComparison.Ordinal)
|| reference.EndsWith("\\UnityEngine.dll", StringComparison.Ordinal)) || reference.EndsWith("\\UnityEngine.dll", StringComparison.Ordinal))
continue; continue;
var match = k_ScriptReferenceExpression.Match(reference); var match = k_ScriptReferenceExpression.Match(reference);
if (match.Success) if (match.Success)
{ {
// assume csharp language // assume csharp language
// Add a reference to a project except if it's a reference to a script assembly // Add a reference to a project except if it's a reference to a script assembly
// that we are not generating a project for. This will be the case for assemblies // that we are not generating a project for. This will be the case for assemblies
// coming from .assembly.json files in non-internalized packages. // coming from .assembly.json files in non-internalized packages.
var dllName = match.Groups["dllname"].Value; var dllName = match.Groups["dllname"].Value;
if (allProjectIslands.Any(i => Path.GetFileName(i.outputPath) == dllName)) if (allProjectIslands.Any(i => Path.GetFileName(i.outputPath) == dllName))
{ {
projectReferences.Add(match); projectReferences.Add(match);
continue; continue;
} }
} }
string fullReference = Path.IsPathRooted(reference) ? reference : Path.Combine(ProjectDirectory, reference); string fullReference = Path.IsPathRooted(reference) ? reference : Path.Combine(ProjectDirectory, reference);
AppendReference(fullReference, projectBuilder); AppendReference(fullReference, projectBuilder);
} }
var responseRefs = responseFilesData.SelectMany(x => x.FullPathReferences.Select(r => r)); var responseRefs = responseFilesData.SelectMany(x => x.FullPathReferences.Select(r => r));
foreach (var reference in responseRefs) foreach (var reference in responseRefs)
{ {
AppendReference(reference, projectBuilder); AppendReference(reference, projectBuilder);
} }
if (0 < projectReferences.Count) if (0 < projectReferences.Count)
{ {
projectBuilder.AppendLine(" </ItemGroup>"); projectBuilder.AppendLine(" </ItemGroup>");
projectBuilder.AppendLine(" <ItemGroup>"); projectBuilder.AppendLine(" <ItemGroup>");
foreach (Match reference in projectReferences) foreach (Match reference in projectReferences)
{ {
var referencedProject = reference.Groups["project"].Value; var referencedProject = reference.Groups["project"].Value;
projectBuilder.Append(" <ProjectReference Include=\"").Append(referencedProject) projectBuilder.Append(" <ProjectReference Include=\"").Append(referencedProject)
.Append(GetProjectExtension()).Append("\">").Append(Environment.NewLine); .Append(GetProjectExtension()).Append("\">").Append(Environment.NewLine);
projectBuilder projectBuilder
.Append(" <Project>{") .Append(" <Project>{")
.Append(m_GUIDGenerator.ProjectGuid(m_ProjectName, reference.Groups["project"].Value)) .Append(m_GUIDGenerator.ProjectGuid(m_ProjectName, reference.Groups["project"].Value))
.Append("}</Project>") .Append("}</Project>")
.Append(Environment.NewLine); .Append(Environment.NewLine);
projectBuilder.Append(" <Name>").Append(referencedProject).Append("</Name>").Append(Environment.NewLine); projectBuilder.Append(" <Name>").Append(referencedProject).Append("</Name>").Append(Environment.NewLine);
projectBuilder.AppendLine(" </ProjectReference>"); projectBuilder.AppendLine(" </ProjectReference>");
} }
} }
projectBuilder.Append(ProjectFooter()); projectBuilder.Append(ProjectFooter());
return projectBuilder.ToString(); return projectBuilder.ToString();
} }
static void AppendReference(string fullReference, StringBuilder projectBuilder) static void AppendReference(string fullReference, StringBuilder projectBuilder)
{ {
//replace \ with / and \\ with / //replace \ with / and \\ with /
var escapedFullPath = SecurityElement.Escape(fullReference); var escapedFullPath = SecurityElement.Escape(fullReference);
escapedFullPath = escapedFullPath.Replace("\\\\", "/").Replace("\\", "/"); escapedFullPath = escapedFullPath.Replace("\\\\", "/").Replace("\\", "/");
projectBuilder.Append(" <Reference Include=\"").Append(FileSystemUtil.FileNameWithoutExtension(escapedFullPath)) projectBuilder.Append(" <Reference Include=\"").Append(FileSystemUtil.FileNameWithoutExtension(escapedFullPath))
.Append("\">").Append(Environment.NewLine); .Append("\">").Append(Environment.NewLine);
projectBuilder.Append(" <HintPath>").Append(escapedFullPath).Append("</HintPath>").Append(Environment.NewLine); projectBuilder.Append(" <HintPath>").Append(escapedFullPath).Append("</HintPath>").Append(Environment.NewLine);
projectBuilder.Append(" </Reference>").Append(Environment.NewLine); projectBuilder.Append(" </Reference>").Append(Environment.NewLine);
} }
public string ProjectFile(Assembly assembly) public string ProjectFile(Assembly assembly)
{ {
return Path.Combine(ProjectDirectory, $"{assembly.name}.csproj"); return Path.Combine(ProjectDirectory, $"{assembly.name}.csproj");
} }
public string SolutionFile() public string SolutionFile()
{ {
return Path.Combine(ProjectDirectory, $"{m_ProjectName}.sln"); return Path.Combine(ProjectDirectory, $"{m_ProjectName}.sln");
} }
string ProjectHeader( string ProjectHeader(
Assembly assembly, Assembly assembly,
List<ResponseFileData> responseFilesData List<ResponseFileData> responseFilesData
) )
{ {
var otherResponseFilesData = GetOtherArgumentsFromResponseFilesData(responseFilesData); var otherResponseFilesData = GetOtherArgumentsFromResponseFilesData(responseFilesData);
var arguments = new object[] var arguments = new object[]
{ {
k_ToolsVersion, k_ProductVersion, m_GUIDGenerator.ProjectGuid(m_ProjectName, assembly.name), k_ToolsVersion, k_ProductVersion, m_GUIDGenerator.ProjectGuid(m_ProjectName, assembly.name),
InternalEditorUtility.GetEngineAssemblyPath(), InternalEditorUtility.GetEngineAssemblyPath(),
InternalEditorUtility.GetEditorAssemblyPath(), InternalEditorUtility.GetEditorAssemblyPath(),
string.Join(";", string.Join(";",
new[] {"DEBUG", "TRACE"}.Concat(EditorUserBuildSettings.activeScriptCompilationDefines).Concat(assembly.defines) new[] {"DEBUG", "TRACE"}.Concat(EditorUserBuildSettings.activeScriptCompilationDefines).Concat(assembly.defines)
.Concat(responseFilesData.SelectMany(x => x.Defines)).Distinct().ToArray()), .Concat(responseFilesData.SelectMany(x => x.Defines)).Distinct().ToArray()),
MSBuildNamespaceUri, MSBuildNamespaceUri,
assembly.name, assembly.name,
EditorSettings.projectGenerationRootNamespace, EditorSettings.projectGenerationRootNamespace,
k_TargetFrameworkVersion, k_TargetFrameworkVersion,
GenerateLangVersion(otherResponseFilesData["langversion"]), GenerateLangVersion(otherResponseFilesData["langversion"]),
k_BaseDirectory, k_BaseDirectory,
assembly.compilerOptions.AllowUnsafeCode | responseFilesData.Any(x => x.Unsafe), assembly.compilerOptions.AllowUnsafeCode | responseFilesData.Any(x => x.Unsafe),
GenerateNoWarn(otherResponseFilesData["nowarn"].Distinct().ToArray()), GenerateNoWarn(otherResponseFilesData["nowarn"].Distinct().ToArray()),
GenerateAnalyserItemGroup(otherResponseFilesData["analyzer"].Concat(otherResponseFilesData["a"]).SelectMany(x=>x.Split(';')).Distinct().ToArray()), GenerateAnalyserItemGroup(otherResponseFilesData["analyzer"].Concat(otherResponseFilesData["a"]).SelectMany(x=>x.Split(';')).Distinct().ToArray()),
GenerateAnalyserAdditionalFiles(otherResponseFilesData["additionalfile"].SelectMany(x=>x.Split(';')).Distinct().ToArray()), GenerateAnalyserAdditionalFiles(otherResponseFilesData["additionalfile"].SelectMany(x=>x.Split(';')).Distinct().ToArray()),
GenerateAnalyserRuleSet(otherResponseFilesData["ruleset"].Distinct().ToArray()), GenerateAnalyserRuleSet(otherResponseFilesData["ruleset"].Distinct().ToArray()),
GenerateWarningLevel(otherResponseFilesData["warn"].Concat(otherResponseFilesData["w"]).Distinct()), GenerateWarningLevel(otherResponseFilesData["warn"].Concat(otherResponseFilesData["w"]).Distinct()),
GenerateWarningAsError(otherResponseFilesData["warnaserror"]), GenerateWarningAsError(otherResponseFilesData["warnaserror"]),
GenerateDocumentationFile(otherResponseFilesData["doc"]) GenerateDocumentationFile(otherResponseFilesData["doc"])
}; };
try try
{ {
return string.Format(GetProjectHeaderTemplate(), arguments); return string.Format(GetProjectHeaderTemplate(), arguments);
} }
catch (Exception) catch (Exception)
{ {
throw new NotSupportedException( throw new NotSupportedException(
"Failed creating c# project because the c# project header did not have the correct amount of arguments, which is " + "Failed creating c# project because the c# project header did not have the correct amount of arguments, which is " +
arguments.Length); arguments.Length);
} }
} }
private string GenerateDocumentationFile(IEnumerable<string> paths) private string GenerateDocumentationFile(IEnumerable<string> paths)
{ {
if (!paths.Any()) if (!paths.Any())
return String.Empty; return String.Empty;
return $"{Environment.NewLine}{string.Join(Environment.NewLine, paths.Select(a => $" <DocumentationFile>{a}</DocumentationFile>"))}"; return $"{Environment.NewLine}{string.Join(Environment.NewLine, paths.Select(a => $" <DocumentationFile>{a}</DocumentationFile>"))}";
} }
private string GenerateWarningAsError(IEnumerable<string> enumerable) private string GenerateWarningAsError(IEnumerable<string> enumerable)
{ {
string returnValue = String.Empty; string returnValue = String.Empty;
bool allWarningsAsErrors = false; bool allWarningsAsErrors = false;
List<string> warningIds = new List<string>(); List<string> warningIds = new List<string>();
foreach (string s in enumerable) foreach (string s in enumerable)
{ {
if (s == "+") allWarningsAsErrors = true; if (s == "+") allWarningsAsErrors = true;
else if (s == "-") allWarningsAsErrors = false; else if (s == "-") allWarningsAsErrors = false;
else else
{ {
warningIds.Add(s); warningIds.Add(s);
} }
} }
returnValue += $@" <TreatWarningsAsErrors>{allWarningsAsErrors}</TreatWarningsAsErrors>"; returnValue += $@" <TreatWarningsAsErrors>{allWarningsAsErrors}</TreatWarningsAsErrors>";
if (warningIds.Any()) if (warningIds.Any())
{ {
returnValue += $"{Environment.NewLine} <WarningsAsErrors>{string.Join(";", warningIds)}</WarningsAsErrors>"; returnValue += $"{Environment.NewLine} <WarningsAsErrors>{string.Join(";", warningIds)}</WarningsAsErrors>";
} }
return $"{Environment.NewLine}{returnValue}"; return $"{Environment.NewLine}{returnValue}";
} }
private string GenerateWarningLevel(IEnumerable<string> warningLevel) private string GenerateWarningLevel(IEnumerable<string> warningLevel)
{ {
var level = warningLevel.FirstOrDefault(); var level = warningLevel.FirstOrDefault();
if (!string.IsNullOrWhiteSpace(level)) if (!string.IsNullOrWhiteSpace(level))
return level; return level;
return 4.ToString(); return 4.ToString();
} }
static string GetSolutionText() static string GetSolutionText()
{ {
return string.Join(Environment.NewLine, return string.Join(Environment.NewLine,
@"", @"",
@"Microsoft Visual Studio Solution File, Format Version {0}", @"Microsoft Visual Studio Solution File, Format Version {0}",
@"# Visual Studio {1}", @"# Visual Studio {1}",
@"{2}", @"{2}",
@"Global", @"Global",
@" GlobalSection(SolutionConfigurationPlatforms) = preSolution", @" GlobalSection(SolutionConfigurationPlatforms) = preSolution",
@" Debug|Any CPU = Debug|Any CPU", @" Debug|Any CPU = Debug|Any CPU",
@" Release|Any CPU = Release|Any CPU", @" Release|Any CPU = Release|Any CPU",
@" EndGlobalSection", @" EndGlobalSection",
@" GlobalSection(ProjectConfigurationPlatforms) = postSolution", @" GlobalSection(ProjectConfigurationPlatforms) = postSolution",
@"{3}", @"{3}",
@" EndGlobalSection", @" EndGlobalSection",
@" GlobalSection(SolutionProperties) = preSolution", @" GlobalSection(SolutionProperties) = preSolution",
@" HideSolutionNode = FALSE", @" HideSolutionNode = FALSE",
@" EndGlobalSection", @" EndGlobalSection",
@"EndGlobal", @"EndGlobal",
@"").Replace(" ", "\t"); @"").Replace(" ", "\t");
} }
static string GetProjectFooterTemplate() static string GetProjectFooterTemplate()
{ {
return string.Join(Environment.NewLine, return string.Join(Environment.NewLine,
@" </ItemGroup>", @" </ItemGroup>",
@" <Import Project=""$(MSBuildToolsPath)\Microsoft.CSharp.targets"" />", @" <Import Project=""$(MSBuildToolsPath)\Microsoft.CSharp.targets"" />",
@" <!-- To modify your build process, add your task inside one of the targets below and uncomment it. ", @" <!-- To modify your build process, add your task inside one of the targets below and uncomment it. ",
@" Other similar extension points exist, see Microsoft.Common.targets.", @" Other similar extension points exist, see Microsoft.Common.targets.",
@" <Target Name=""BeforeBuild"">", @" <Target Name=""BeforeBuild"">",
@" </Target>", @" </Target>",
@" <Target Name=""AfterBuild"">", @" <Target Name=""AfterBuild"">",
@" </Target>", @" </Target>",
@" -->", @" -->",
@"</Project>", @"</Project>",
@""); @"");
} }
static string GetProjectHeaderTemplate() static string GetProjectHeaderTemplate()
{ {
var header = new[] var header = new[]
{ {
@"<?xml version=""1.0"" encoding=""utf-8""?>", @"<?xml version=""1.0"" encoding=""utf-8""?>",
@"<Project ToolsVersion=""{0}"" DefaultTargets=""Build"" xmlns=""{6}"">", @"<Project ToolsVersion=""{0}"" DefaultTargets=""Build"" xmlns=""{6}"">",
@" <PropertyGroup>", @" <PropertyGroup>",
@" <LangVersion>{10}</LangVersion>", @" <LangVersion>{10}</LangVersion>",
@" <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package</_TargetFrameworkDirectories>", @" <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package</_TargetFrameworkDirectories>",
@" <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package</_FullFrameworkReferenceAssemblyPaths>", @" <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package</_FullFrameworkReferenceAssemblyPaths>",
@" <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>{16}", @" <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>{16}",
@" </PropertyGroup>", @" </PropertyGroup>",
@" <PropertyGroup>", @" <PropertyGroup>",
@" <Configuration Condition="" '$(Configuration)' == '' "">Debug</Configuration>", @" <Configuration Condition="" '$(Configuration)' == '' "">Debug</Configuration>",
@" <Platform Condition="" '$(Platform)' == '' "">AnyCPU</Platform>", @" <Platform Condition="" '$(Platform)' == '' "">AnyCPU</Platform>",
@" <ProductVersion>{1}</ProductVersion>", @" <ProductVersion>{1}</ProductVersion>",
@" <SchemaVersion>2.0</SchemaVersion>", @" <SchemaVersion>2.0</SchemaVersion>",
@" <RootNamespace>{8}</RootNamespace>", @" <RootNamespace>{8}</RootNamespace>",
@" <ProjectGuid>{{{2}}}</ProjectGuid>", @" <ProjectGuid>{{{2}}}</ProjectGuid>",
@" <OutputType>Library</OutputType>", @" <OutputType>Library</OutputType>",
@" <AppDesignerFolder>Properties</AppDesignerFolder>", @" <AppDesignerFolder>Properties</AppDesignerFolder>",
@" <AssemblyName>{7}</AssemblyName>", @" <AssemblyName>{7}</AssemblyName>",
@" <TargetFrameworkVersion>{9}</TargetFrameworkVersion>", @" <TargetFrameworkVersion>{9}</TargetFrameworkVersion>",
@" <FileAlignment>512</FileAlignment>", @" <FileAlignment>512</FileAlignment>",
@" <BaseDirectory>{11}</BaseDirectory>", @" <BaseDirectory>{11}</BaseDirectory>",
@" </PropertyGroup>", @" </PropertyGroup>",
@" <PropertyGroup Condition="" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "">", @" <PropertyGroup Condition="" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "">",
@" <DebugSymbols>true</DebugSymbols>", @" <DebugSymbols>true</DebugSymbols>",
@" <DebugType>full</DebugType>", @" <DebugType>full</DebugType>",
@" <Optimize>false</Optimize>", @" <Optimize>false</Optimize>",
@" <OutputPath>Temp\bin\Debug\</OutputPath>", @" <OutputPath>Temp\bin\Debug\</OutputPath>",
@" <DefineConstants>{5}</DefineConstants>", @" <DefineConstants>{5}</DefineConstants>",
@" <ErrorReport>prompt</ErrorReport>", @" <ErrorReport>prompt</ErrorReport>",
@" <WarningLevel>{17}</WarningLevel>", @" <WarningLevel>{17}</WarningLevel>",
@" <NoWarn>0169{13}</NoWarn>", @" <NoWarn>0169{13}</NoWarn>",
@" <AllowUnsafeBlocks>{12}</AllowUnsafeBlocks>{18}{19}", @" <AllowUnsafeBlocks>{12}</AllowUnsafeBlocks>{18}{19}",
@" </PropertyGroup>", @" </PropertyGroup>",
@" <PropertyGroup Condition="" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "">", @" <PropertyGroup Condition="" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "">",
@" <DebugType>pdbonly</DebugType>", @" <DebugType>pdbonly</DebugType>",
@" <Optimize>true</Optimize>", @" <Optimize>true</Optimize>",
@" <OutputPath>Temp\bin\Release\</OutputPath>", @" <OutputPath>Temp\bin\Release\</OutputPath>",
@" <ErrorReport>prompt</ErrorReport>", @" <ErrorReport>prompt</ErrorReport>",
@" <WarningLevel>{17}</WarningLevel>", @" <WarningLevel>{17}</WarningLevel>",
@" <NoWarn>0169{13}</NoWarn>", @" <NoWarn>0169{13}</NoWarn>",
@" <AllowUnsafeBlocks>{12}</AllowUnsafeBlocks>{18}{19}", @" <AllowUnsafeBlocks>{12}</AllowUnsafeBlocks>{18}{19}",
@" </PropertyGroup>" @" </PropertyGroup>"
}; };
var forceExplicitReferences = new[] var forceExplicitReferences = new[]
{ {
@" <PropertyGroup>", @" <PropertyGroup>",
@" <NoConfig>true</NoConfig>", @" <NoConfig>true</NoConfig>",
@" <NoStdLib>true</NoStdLib>", @" <NoStdLib>true</NoStdLib>",
@" <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>", @" <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>",
@" <ImplicitlyExpandNETStandardFacades>false</ImplicitlyExpandNETStandardFacades>", @" <ImplicitlyExpandNETStandardFacades>false</ImplicitlyExpandNETStandardFacades>",
@" <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>", @" <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>",
@" </PropertyGroup>" @" </PropertyGroup>"
}; };
var itemGroupStart = new[] var itemGroupStart = new[]
{ {
@" <ItemGroup>" @" <ItemGroup>"
}; };
var footer = new[] var footer = new[]
{ {
@" <Reference Include=""UnityEngine"">", @" <Reference Include=""UnityEngine"">",
@" <HintPath>{3}</HintPath>", @" <HintPath>{3}</HintPath>",
@" </Reference>", @" </Reference>",
@" <Reference Include=""UnityEditor"">", @" <Reference Include=""UnityEditor"">",
@" <HintPath>{4}</HintPath>", @" <HintPath>{4}</HintPath>",
@" </Reference>", @" </Reference>",
@" </ItemGroup>{14}{15}", @" </ItemGroup>{14}{15}",
@" <ItemGroup>", @" <ItemGroup>",
@"" @""
}; };
var pieces = header.Concat(forceExplicitReferences).Concat(itemGroupStart).Concat(footer).ToArray(); var pieces = header.Concat(forceExplicitReferences).Concat(itemGroupStart).Concat(footer).ToArray();
return string.Join(Environment.NewLine, pieces); return string.Join(Environment.NewLine, pieces);
} }
void SyncSolution(IEnumerable<Assembly> islands, Type[] types) void SyncSolution(IEnumerable<Assembly> islands, Type[] types)
{ {
SyncSolutionFileIfNotChanged(SolutionFile(), SolutionText(islands), types); SyncSolutionFileIfNotChanged(SolutionFile(), SolutionText(islands), types);
} }
string SolutionText(IEnumerable<Assembly> islands) string SolutionText(IEnumerable<Assembly> islands)
{ {
var fileversion = "11.00"; var fileversion = "11.00";
var vsversion = "2010"; var vsversion = "2010";
var relevantIslands = RelevantIslandsForMode(islands); var relevantIslands = RelevantIslandsForMode(islands);
string projectEntries = GetProjectEntries(relevantIslands); string projectEntries = GetProjectEntries(relevantIslands);
string projectConfigurations = string.Join(Environment.NewLine, string projectConfigurations = string.Join(Environment.NewLine,
relevantIslands.Select(i => GetProjectActiveConfigurations(m_GUIDGenerator.ProjectGuid(m_ProjectName, i.name))).ToArray()); relevantIslands.Select(i => GetProjectActiveConfigurations(m_GUIDGenerator.ProjectGuid(m_ProjectName, i.name))).ToArray());
return string.Format(GetSolutionText(), fileversion, vsversion, projectEntries, projectConfigurations); return string.Format(GetSolutionText(), fileversion, vsversion, projectEntries, projectConfigurations);
} }
private static string GenerateAnalyserItemGroup(string[] paths) private static string GenerateAnalyserItemGroup(string[] paths)
{ {
// <ItemGroup> // <ItemGroup>
// <Analyzer Include="..\packages\Comments_analyser.1.0.6626.21356\analyzers\dotnet\cs\Comments_analyser.dll" /> // <Analyzer Include="..\packages\Comments_analyser.1.0.6626.21356\analyzers\dotnet\cs\Comments_analyser.dll" />
// <Analyzer Include="..\packages\UnityEngineAnalyzer.1.0.0.0\analyzers\dotnet\cs\UnityEngineAnalyzer.dll" /> // <Analyzer Include="..\packages\UnityEngineAnalyzer.1.0.0.0\analyzers\dotnet\cs\UnityEngineAnalyzer.dll" />
// </ItemGroup> // </ItemGroup>
if (!paths.Any()) if (!paths.Any())
return string.Empty; return string.Empty;
var analyserBuilder = new StringBuilder(); var analyserBuilder = new StringBuilder();
analyserBuilder.AppendLine(" <ItemGroup>"); analyserBuilder.AppendLine(" <ItemGroup>");
foreach (var path in paths) foreach (var path in paths)
{ {
analyserBuilder.AppendLine($" <Analyzer Include=\"{path}\" />"); analyserBuilder.AppendLine($" <Analyzer Include=\"{path}\" />");
} }
analyserBuilder.AppendLine(" </ItemGroup>"); analyserBuilder.AppendLine(" </ItemGroup>");
return analyserBuilder.ToString(); return analyserBuilder.ToString();
} }
private static ILookup<string, string> GetOtherArgumentsFromResponseFilesData(List<ResponseFileData> responseFilesData) private static ILookup<string, string> GetOtherArgumentsFromResponseFilesData(List<ResponseFileData> responseFilesData)
{ {
var paths = responseFilesData.SelectMany(x => var paths = responseFilesData.SelectMany(x =>
{ {
return x.OtherArguments return x.OtherArguments
.Where(a => a.StartsWith("/") || a.StartsWith("-")) .Where(a => a.StartsWith("/") || a.StartsWith("-"))
.Select(b => .Select(b =>
{ {
var index = b.IndexOf(":", StringComparison.Ordinal); var index = b.IndexOf(":", StringComparison.Ordinal);
if (index > 0 && b.Length > index) if (index > 0 && b.Length > index)
{ {
var key = b.Substring(1, index - 1); var key = b.Substring(1, index - 1);
return new KeyValuePair<string, string>(key, b.Substring(index + 1)); return new KeyValuePair<string, string>(key, b.Substring(index + 1));
} }
const string warnaserror = "warnaserror"; const string warnaserror = "warnaserror";
if (b.Substring(1).StartsWith(warnaserror)) if (b.Substring(1).StartsWith(warnaserror))
{ {
return new KeyValuePair<string,string>(warnaserror, b.Substring(warnaserror.Length+ 1) ); return new KeyValuePair<string,string>(warnaserror, b.Substring(warnaserror.Length+ 1) );
} }
return default; return default;
}); });
}) })
.Distinct() .Distinct()
.ToLookup(o => o.Key, pair => pair.Value); .ToLookup(o => o.Key, pair => pair.Value);
return paths; return paths;
} }
private string GenerateLangVersion(IEnumerable<string> langVersionList) private string GenerateLangVersion(IEnumerable<string> langVersionList)
{ {
var langVersion = langVersionList.FirstOrDefault(); var langVersion = langVersionList.FirstOrDefault();
if (!string.IsNullOrWhiteSpace(langVersion)) if (!string.IsNullOrWhiteSpace(langVersion))
return langVersion; return langVersion;
return k_TargetLanguageVersion; return k_TargetLanguageVersion;
} }
private static string GenerateAnalyserRuleSet(string[] paths) private static string GenerateAnalyserRuleSet(string[] paths)
{ {
//<CodeAnalysisRuleSet>..\path\to\myrules.ruleset</CodeAnalysisRuleSet> //<CodeAnalysisRuleSet>..\path\to\myrules.ruleset</CodeAnalysisRuleSet>
if (!paths.Any()) if (!paths.Any())
return string.Empty; return string.Empty;
return $"{Environment.NewLine}{string.Join(Environment.NewLine, paths.Select(a => $" <CodeAnalysisRuleSet>{a}</CodeAnalysisRuleSet>"))}"; return $"{Environment.NewLine}{string.Join(Environment.NewLine, paths.Select(a => $" <CodeAnalysisRuleSet>{a}</CodeAnalysisRuleSet>"))}";
} }
private static string GenerateAnalyserAdditionalFiles(string[] paths) private static string GenerateAnalyserAdditionalFiles(string[] paths)
{ {
if (!paths.Any()) if (!paths.Any())
return string.Empty; return string.Empty;
var analyserBuilder = new StringBuilder(); var analyserBuilder = new StringBuilder();
analyserBuilder.AppendLine(" <ItemGroup>"); analyserBuilder.AppendLine(" <ItemGroup>");
foreach (var path in paths) foreach (var path in paths)
{ {
analyserBuilder.AppendLine($" <AdditionalFiles Include=\"{path}\" />"); analyserBuilder.AppendLine($" <AdditionalFiles Include=\"{path}\" />");
} }
analyserBuilder.AppendLine(" </ItemGroup>"); analyserBuilder.AppendLine(" </ItemGroup>");
return analyserBuilder.ToString(); return analyserBuilder.ToString();
} }
private static string GenerateNoWarn(string[] codes) private static string GenerateNoWarn(string[] codes)
{ {
if (!codes.Any()) if (!codes.Any())
return string.Empty; return string.Empty;
return $",{string.Join(",", codes)}"; return $",{string.Join(",", codes)}";
} }
static IEnumerable<Assembly> RelevantIslandsForMode(IEnumerable<Assembly> islands) static IEnumerable<Assembly> RelevantIslandsForMode(IEnumerable<Assembly> islands)
{ {
IEnumerable<Assembly> relevantIslands = islands.Where(i => ScriptingLanguage.CSharp == ScriptingLanguageFor(i)); IEnumerable<Assembly> relevantIslands = islands.Where(i => ScriptingLanguage.CSharp == ScriptingLanguageFor(i));
return relevantIslands; return relevantIslands;
} }
/// <summary> /// <summary>
/// Get a Project("{guid}") = "MyProject", "MyProject.unityproj", "{projectguid}" /// Get a Project("{guid}") = "MyProject", "MyProject.unityproj", "{projectguid}"
/// entry for each relevant language /// entry for each relevant language
/// </summary> /// </summary>
string GetProjectEntries(IEnumerable<Assembly> islands) string GetProjectEntries(IEnumerable<Assembly> islands)
{ {
var projectEntries = islands.Select(i => string.Format( var projectEntries = islands.Select(i => string.Format(
m_SolutionProjectEntryTemplate, m_SolutionProjectEntryTemplate,
m_GUIDGenerator.SolutionGuid(m_ProjectName, GetExtensionOfSourceFiles(i.sourceFiles)), m_GUIDGenerator.SolutionGuid(m_ProjectName, GetExtensionOfSourceFiles(i.sourceFiles)),
i.name, i.name,
Path.GetFileName(ProjectFile(i)), Path.GetFileName(ProjectFile(i)),
m_GUIDGenerator.ProjectGuid(m_ProjectName, i.name) m_GUIDGenerator.ProjectGuid(m_ProjectName, i.name)
)); ));
return string.Join(Environment.NewLine, projectEntries.ToArray()); return string.Join(Environment.NewLine, projectEntries.ToArray());
} }
/// <summary> /// <summary>
/// Generate the active configuration string for a given project guid /// Generate the active configuration string for a given project guid
/// </summary> /// </summary>
string GetProjectActiveConfigurations(string projectGuid) string GetProjectActiveConfigurations(string projectGuid)
{ {
return string.Format( return string.Format(
m_SolutionProjectConfigurationTemplate, m_SolutionProjectConfigurationTemplate,
projectGuid); projectGuid);
} }
string EscapedRelativePathFor(string file) string EscapedRelativePathFor(string file)
{ {
var projectDir = ProjectDirectory.Replace('/', '\\'); var projectDir = ProjectDirectory.Replace('/', '\\');
file = file.Replace('/', '\\'); file = file.Replace('/', '\\');
var path = SkipPathPrefix(file, projectDir); var path = SkipPathPrefix(file, projectDir);
var packageInfo = m_AssemblyNameProvider.FindForAssetPath(path.Replace('\\', '/')); var packageInfo = m_AssemblyNameProvider.FindForAssetPath(path.Replace('\\', '/'));
if (packageInfo != null) if (packageInfo != null)
{ {
// We have to normalize the path, because the PackageManagerRemapper assumes // We have to normalize the path, because the PackageManagerRemapper assumes
// dir seperators will be os specific. // dir seperators will be os specific.
var absolutePath = Path.GetFullPath(NormalizePath(path)).Replace('/', '\\'); var absolutePath = Path.GetFullPath(NormalizePath(path)).Replace('/', '\\');
path = SkipPathPrefix(absolutePath, projectDir); path = SkipPathPrefix(absolutePath, projectDir);
} }
return SecurityElement.Escape(path); return SecurityElement.Escape(path);
} }
static string SkipPathPrefix(string path, string prefix) static string SkipPathPrefix(string path, string prefix)
{ {
if (path.Replace("\\", "/").StartsWith($"{prefix}/")) if (path.Replace("\\", "/").StartsWith($"{prefix}/"))
return path.Substring(prefix.Length + 1); return path.Substring(prefix.Length + 1);
return path; return path;
} }
static string NormalizePath(string path) static string NormalizePath(string path)
{ {
if (Path.DirectorySeparatorChar == '\\') if (Path.DirectorySeparatorChar == '\\')
return path.Replace('/', Path.DirectorySeparatorChar); return path.Replace('/', Path.DirectorySeparatorChar);
return path.Replace('\\', Path.DirectorySeparatorChar); return path.Replace('\\', Path.DirectorySeparatorChar);
} }
static string ProjectFooter() static string ProjectFooter()
{ {
return GetProjectFooterTemplate(); return GetProjectFooterTemplate();
} }
static string GetProjectExtension() static string GetProjectExtension()
{ {
return ".csproj"; return ".csproj";
} }
} }
public static class SolutionGuidGenerator public static class SolutionGuidGenerator
{ {
public static string GuidForProject(string projectName) public static string GuidForProject(string projectName)
{ {
return ComputeGuidHashFor(projectName + "salt"); return ComputeGuidHashFor(projectName + "salt");
} }
public static string GuidForSolution(string projectName, string sourceFileExtension) public static string GuidForSolution(string projectName, string sourceFileExtension)
{ {
if (sourceFileExtension.ToLower() == "cs") if (sourceFileExtension.ToLower() == "cs")
// GUID for a C# class library: http://www.codeproject.com/Reference/720512/List-of-Visual-Studio-Project-Type-GUIDs // GUID for a C# class library: http://www.codeproject.com/Reference/720512/List-of-Visual-Studio-Project-Type-GUIDs
return "FAE04EC0-301F-11D3-BF4B-00C04F79EFBC"; return "FAE04EC0-301F-11D3-BF4B-00C04F79EFBC";
return ComputeGuidHashFor(projectName); return ComputeGuidHashFor(projectName);
} }
static string ComputeGuidHashFor(string input) static string ComputeGuidHashFor(string input)
{ {
var hash = MD5.Create().ComputeHash(Encoding.Default.GetBytes(input)); var hash = MD5.Create().ComputeHash(Encoding.Default.GetBytes(input));
return HashAsGuid(HashToString(hash)); return HashAsGuid(HashToString(hash));
} }
static string HashAsGuid(string hash) static string HashAsGuid(string hash)
{ {
var guid = hash.Substring(0, 8) + "-" + hash.Substring(8, 4) + "-" + hash.Substring(12, 4) + "-" + var guid = hash.Substring(0, 8) + "-" + hash.Substring(8, 4) + "-" + hash.Substring(12, 4) + "-" +
hash.Substring(16, 4) + "-" + hash.Substring(20, 12); hash.Substring(16, 4) + "-" + hash.Substring(20, 12);
return guid.ToUpper(); return guid.ToUpper();
} }
static string HashToString(byte[] bs) static string HashToString(byte[] bs)
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();
foreach (byte b in bs) foreach (byte b in bs)
sb.Append(b.ToString("x2")); sb.Append(b.ToString("x2"));
return sb.ToString(); return sb.ToString();
} }
} }
} }
fileFormatVersion: 2 fileFormatVersion: 2
guid: 7078f19173ceac84fb9e29b9f6175201 guid: 7078f19173ceac84fb9e29b9f6175201
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
using System; using System;
using System.IO; using System.IO;
using UnityEngine; using UnityEngine;
using Debug = UnityEngine.Debug; using Debug = UnityEngine.Debug;
namespace Packages.Rider.Editor namespace Packages.Rider.Editor
{ {
internal class RiderInitializer internal class RiderInitializer
{ {
public void Initialize(string editorPath) public void Initialize(string editorPath)
{ {
var assembly = EditorPluginInterop.EditorPluginAssembly; var assembly = EditorPluginInterop.EditorPluginAssembly;
if (EditorPluginInterop.EditorPluginIsLoadedFromAssets(assembly)) if (EditorPluginInterop.EditorPluginIsLoadedFromAssets(assembly))
{ {
Debug.LogError($"Please delete {assembly.Location}. Unity 2019.2+ loads it directly from Rider installation. To disable this, open Rider's settings, search and uncheck 'Automatically install and update Rider's Unity editor plugin'."); Debug.LogError($"Please delete {assembly.Location}. Unity 2019.2+ loads it directly from Rider installation. To disable this, open Rider's settings, search and uncheck 'Automatically install and update Rider's Unity editor plugin'.");
return; return;
} }
var dllName = "JetBrains.Rider.Unity.Editor.Plugin.Full.Repacked.dll"; var dllName = "JetBrains.Rider.Unity.Editor.Plugin.Full.Repacked.dll";
var relPath = "../../plugins/rider-unity/EditorPlugin"; var relPath = "../../plugins/rider-unity/EditorPlugin";
if (SystemInfo.operatingSystemFamily == OperatingSystemFamily.MacOSX) if (SystemInfo.operatingSystemFamily == OperatingSystemFamily.MacOSX)
relPath = "Contents/plugins/rider-unity/EditorPlugin"; relPath = "Contents/plugins/rider-unity/EditorPlugin";
var dllFile = new FileInfo(Path.Combine(Path.Combine(editorPath, relPath), dllName)); var dllFile = new FileInfo(Path.Combine(Path.Combine(editorPath, relPath), dllName));
if (dllFile.Exists) if (dllFile.Exists)
{ {
var bytes = File.ReadAllBytes(dllFile.FullName); var bytes = File.ReadAllBytes(dllFile.FullName);
assembly = AppDomain.CurrentDomain.Load(bytes); // doesn't lock assembly on disk assembly = AppDomain.CurrentDomain.Load(bytes); // doesn't lock assembly on disk
// assembly = AppDomain.CurrentDomain.Load(AssemblyName.GetAssemblyName(dllFile.FullName)); // use this for external source debug // assembly = AppDomain.CurrentDomain.Load(AssemblyName.GetAssemblyName(dllFile.FullName)); // use this for external source debug
EditorPluginInterop.InitEntryPoint(assembly); EditorPluginInterop.InitEntryPoint(assembly);
} }
else else
{ {
Debug.Log($"Unable to find Rider EditorPlugin {dllFile.FullName} for Unity "); Debug.Log($"Unable to find Rider EditorPlugin {dllFile.FullName} for Unity ");
} }
} }
} }
} }
fileFormatVersion: 2 fileFormatVersion: 2
guid: f5a0cc9645f0e2d4fb816156dcf3f4dd guid: f5a0cc9645f0e2d4fb816156dcf3f4dd
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Packages.Rider.Editor.Util; using Packages.Rider.Editor.Util;
using Unity.CodeEditor; using Unity.CodeEditor;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using Debug = UnityEngine.Debug; using Debug = UnityEngine.Debug;
namespace Packages.Rider.Editor namespace Packages.Rider.Editor
{ {
[InitializeOnLoad] [InitializeOnLoad]
public class RiderScriptEditor : IExternalCodeEditor public class RiderScriptEditor : IExternalCodeEditor
{ {
IDiscovery m_Discoverability; IDiscovery m_Discoverability;
IGenerator m_ProjectGeneration; IGenerator m_ProjectGeneration;
RiderInitializer m_Initiliazer = new RiderInitializer(); RiderInitializer m_Initiliazer = new RiderInitializer();
static RiderScriptEditor() static RiderScriptEditor()
{ {
try try
{ {
var projectGeneration = new ProjectGeneration(); var projectGeneration = new ProjectGeneration();
var editor = new RiderScriptEditor(new Discovery(), projectGeneration); var editor = new RiderScriptEditor(new Discovery(), projectGeneration);
CodeEditor.Register(editor); CodeEditor.Register(editor);
var path = GetEditorRealPath(CodeEditor.CurrentEditorInstallation); var path = GetEditorRealPath(CodeEditor.CurrentEditorInstallation);
if (IsRiderInstallation(path)) if (IsRiderInstallation(path))
{ {
if (!RiderScriptEditorData.instance.InitializedOnce) if (!RiderScriptEditorData.instance.InitializedOnce)
{ {
var installations = editor.Installations; var installations = editor.Installations;
// is toolbox and outdated - update // is toolbox and outdated - update
if (installations.Any() && RiderPathLocator.IsToolbox(path) && installations.All(a => a.Path != path)) if (installations.Any() && RiderPathLocator.IsToolbox(path) && installations.All(a => a.Path != path))
{ {
var toolboxInstallations = installations.Where(a => a.Name.Contains("(JetBrains Toolbox)")).ToArray(); var toolboxInstallations = installations.Where(a => a.Name.Contains("(JetBrains Toolbox)")).ToArray();
if (toolboxInstallations.Any()) if (toolboxInstallations.Any())
{ {
var newEditor = toolboxInstallations.Last().Path; var newEditor = toolboxInstallations.Last().Path;
CodeEditor.SetExternalScriptEditor(newEditor); CodeEditor.SetExternalScriptEditor(newEditor);
path = newEditor; path = newEditor;
} }
else else
{ {
var newEditor = installations.Last().Path; var newEditor = installations.Last().Path;
CodeEditor.SetExternalScriptEditor(newEditor); CodeEditor.SetExternalScriptEditor(newEditor);
path = newEditor; path = newEditor;
} }
} }
// exists, is non toolbox and outdated - notify // exists, is non toolbox and outdated - notify
if (installations.Any() && FileSystemUtil.EditorPathExists(path) && installations.All(a => a.Path != path)) if (installations.Any() && FileSystemUtil.EditorPathExists(path) && installations.All(a => a.Path != path))
{ {
var newEditorName = installations.Last().Name; var newEditorName = installations.Last().Name;
Debug.LogWarning($"Consider updating External Editor in Unity to Rider {newEditorName}."); Debug.LogWarning($"Consider updating External Editor in Unity to Rider {newEditorName}.");
} }
ShowWarningOnUnexpectedScriptEditor(path); ShowWarningOnUnexpectedScriptEditor(path);
RiderScriptEditorData.instance.InitializedOnce = true; RiderScriptEditorData.instance.InitializedOnce = true;
} }
if (!FileSystemUtil.EditorPathExists(path)) // previously used rider was removed if (!FileSystemUtil.EditorPathExists(path)) // previously used rider was removed
{ {
var installations = editor.Installations; var installations = editor.Installations;
if (installations.Any()) if (installations.Any())
{ {
var newEditor = installations.Last().Path; var newEditor = installations.Last().Path;
CodeEditor.SetExternalScriptEditor(newEditor); CodeEditor.SetExternalScriptEditor(newEditor);
path = newEditor; path = newEditor;
} }
} }
RiderScriptEditorData.instance.Init(); RiderScriptEditorData.instance.Init();
editor.CreateSolutionIfDoesntExist(); editor.CreateSolutionIfDoesntExist();
if (RiderScriptEditorData.instance.shouldLoadEditorPlugin) if (RiderScriptEditorData.instance.shouldLoadEditorPlugin)
{ {
editor.m_Initiliazer.Initialize(path); editor.m_Initiliazer.Initialize(path);
} }
InitProjectFilesWatcher(); InitProjectFilesWatcher();
} }
} }
catch (Exception e) catch (Exception e)
{ {
Debug.LogException(e); Debug.LogException(e);
} }
} }
private static void ShowWarningOnUnexpectedScriptEditor(string path) private static void ShowWarningOnUnexpectedScriptEditor(string path)
{ {
// Show warning, when Unity was started from Rider, but external editor is different https://github.com/JetBrains/resharper-unity/issues/1127 // Show warning, when Unity was started from Rider, but external editor is different https://github.com/JetBrains/resharper-unity/issues/1127
var args = Environment.GetCommandLineArgs(); var args = Environment.GetCommandLineArgs();
var commandlineParser = new CommandLineParser(args); var commandlineParser = new CommandLineParser(args);
if (commandlineParser.Options.ContainsKey("-riderPath")) if (commandlineParser.Options.ContainsKey("-riderPath"))
{ {
var originRiderPath = commandlineParser.Options["-riderPath"]; var originRiderPath = commandlineParser.Options["-riderPath"];
var originRealPath = GetEditorRealPath(originRiderPath); var originRealPath = GetEditorRealPath(originRiderPath);
var originVersion = RiderPathLocator.GetBuildNumber(originRealPath); var originVersion = RiderPathLocator.GetBuildNumber(originRealPath);
var version = RiderPathLocator.GetBuildNumber(path); var version = RiderPathLocator.GetBuildNumber(path);
if (originVersion != string.Empty && originVersion != version) if (originVersion != string.Empty && originVersion != version)
{ {
Debug.LogWarning("Unity was started by a version of Rider that is not the current default external editor. Advanced integration features cannot be enabled."); Debug.LogWarning("Unity was started by a version of Rider that is not the current default external editor. Advanced integration features cannot be enabled.");
Debug.Log($"Unity was started by Rider {originVersion}, but external editor is set to: {path}"); Debug.Log($"Unity was started by Rider {originVersion}, but external editor is set to: {path}");
} }
} }
} }
private static void InitProjectFilesWatcher() private static void InitProjectFilesWatcher()
{ {
var watcher = new FileSystemWatcher(); var watcher = new FileSystemWatcher();
watcher.Path = Directory.GetCurrentDirectory(); watcher.Path = Directory.GetCurrentDirectory();
watcher.NotifyFilter = NotifyFilters.LastWrite; //Watch for changes in LastWrite times watcher.NotifyFilter = NotifyFilters.LastWrite; //Watch for changes in LastWrite times
watcher.Filter = "*.*"; watcher.Filter = "*.*";
// Add event handlers. // Add event handlers.
watcher.Changed += OnChanged; watcher.Changed += OnChanged;
watcher.Created += OnChanged; watcher.Created += OnChanged;
watcher.EnableRaisingEvents = true; // Begin watching. watcher.EnableRaisingEvents = true; // Begin watching.
AppDomain.CurrentDomain.DomainUnload += (EventHandler) ((_, __) => AppDomain.CurrentDomain.DomainUnload += (EventHandler) ((_, __) =>
{ {
watcher.Dispose(); watcher.Dispose();
}); });
} }
private static void OnChanged(object sender, FileSystemEventArgs e) private static void OnChanged(object sender, FileSystemEventArgs e)
{ {
var extension = Path.GetExtension(e.FullPath); var extension = Path.GetExtension(e.FullPath);
if (extension == ".sln" || extension == ".csproj") if (extension == ".sln" || extension == ".csproj")
RiderScriptEditorData.instance.HasChanges = true; RiderScriptEditorData.instance.HasChanges = true;
} }
internal static string GetEditorRealPath(string path) internal static string GetEditorRealPath(string path)
{ {
if (string.IsNullOrEmpty(path)) if (string.IsNullOrEmpty(path))
{ {
return path; return path;
} }
if (!FileSystemUtil.EditorPathExists(path)) if (!FileSystemUtil.EditorPathExists(path))
return path; return path;
if (SystemInfo.operatingSystemFamily != OperatingSystemFamily.Windows) if (SystemInfo.operatingSystemFamily != OperatingSystemFamily.Windows)
{ {
var realPath = FileSystemUtil.GetFinalPathName(path); var realPath = FileSystemUtil.GetFinalPathName(path);
// case of snap installation // case of snap installation
if (SystemInfo.operatingSystemFamily == OperatingSystemFamily.Linux) if (SystemInfo.operatingSystemFamily == OperatingSystemFamily.Linux)
{ {
if (new FileInfo(path).Name.ToLowerInvariant() == "rider" && if (new FileInfo(path).Name.ToLowerInvariant() == "rider" &&
new FileInfo(realPath).Name.ToLowerInvariant() == "snap") new FileInfo(realPath).Name.ToLowerInvariant() == "snap")
{ {
var snapInstallPath = "/snap/rider/current/bin/rider.sh"; var snapInstallPath = "/snap/rider/current/bin/rider.sh";
if (new FileInfo(snapInstallPath).Exists) if (new FileInfo(snapInstallPath).Exists)
return snapInstallPath; return snapInstallPath;
} }
} }
// in case of symlink // in case of symlink
return realPath; return realPath;
} }
return path; return path;
} }
const string unity_generate_all = "unity_generate_all_csproj"; const string unity_generate_all = "unity_generate_all_csproj";
public RiderScriptEditor(IDiscovery discovery, IGenerator projectGeneration) public RiderScriptEditor(IDiscovery discovery, IGenerator projectGeneration)
{ {
m_Discoverability = discovery; m_Discoverability = discovery;
m_ProjectGeneration = projectGeneration; m_ProjectGeneration = projectGeneration;
} }
private static string[] defaultExtensions private static string[] defaultExtensions
{ {
get get
{ {
var customExtensions = new[] {"json", "asmdef", "log", "xaml"}; var customExtensions = new[] {"json", "asmdef", "log", "xaml"};
return EditorSettings.projectGenerationBuiltinExtensions.Concat(EditorSettings.projectGenerationUserExtensions) return EditorSettings.projectGenerationBuiltinExtensions.Concat(EditorSettings.projectGenerationUserExtensions)
.Concat(customExtensions).Distinct().ToArray(); .Concat(customExtensions).Distinct().ToArray();
} }
} }
private static string[] HandledExtensions private static string[] HandledExtensions
{ {
get get
{ {
return HandledExtensionsString.Split(new[] {';'}, StringSplitOptions.RemoveEmptyEntries).Select(s => s.TrimStart('.', '*')) return HandledExtensionsString.Split(new[] {';'}, StringSplitOptions.RemoveEmptyEntries).Select(s => s.TrimStart('.', '*'))
.ToArray(); .ToArray();
} }
} }
private static string HandledExtensionsString private static string HandledExtensionsString
{ {
get { return EditorPrefs.GetString("Rider_UserExtensions", string.Join(";", defaultExtensions));} get { return EditorPrefs.GetString("Rider_UserExtensions", string.Join(";", defaultExtensions));}
set { EditorPrefs.SetString("Rider_UserExtensions", value); } set { EditorPrefs.SetString("Rider_UserExtensions", value); }
} }
private static bool SupportsExtension(string path) private static bool SupportsExtension(string path)
{ {
var extension = Path.GetExtension(path); var extension = Path.GetExtension(path);
if (string.IsNullOrEmpty(extension)) if (string.IsNullOrEmpty(extension))
return false; return false;
return HandledExtensions.Contains(extension.TrimStart('.')); return HandledExtensions.Contains(extension.TrimStart('.'));
} }
public void OnGUI() public void OnGUI()
{ {
var prevGenerate = EditorPrefs.GetBool(unity_generate_all, false); var prevGenerate = EditorPrefs.GetBool(unity_generate_all, false);
var generateAll = EditorGUILayout.Toggle("Generate all .csproj files.", prevGenerate); var generateAll = EditorGUILayout.Toggle("Generate all .csproj files.", prevGenerate);
if (generateAll != prevGenerate) if (generateAll != prevGenerate)
{ {
EditorPrefs.SetBool(unity_generate_all, generateAll); EditorPrefs.SetBool(unity_generate_all, generateAll);
} }
m_ProjectGeneration.GenerateAll(generateAll); m_ProjectGeneration.GenerateAll(generateAll);
if (RiderScriptEditorData.instance.shouldLoadEditorPlugin) if (RiderScriptEditorData.instance.shouldLoadEditorPlugin)
{ {
HandledExtensionsString = EditorGUILayout.TextField(new GUIContent("Extensions handled: "), HandledExtensionsString); HandledExtensionsString = EditorGUILayout.TextField(new GUIContent("Extensions handled: "), HandledExtensionsString);
} }
} }
public void SyncIfNeeded(string[] addedFiles, string[] deletedFiles, string[] movedFiles, string[] movedFromFiles, public void SyncIfNeeded(string[] addedFiles, string[] deletedFiles, string[] movedFiles, string[] movedFromFiles,
string[] importedFiles) string[] importedFiles)
{ {
m_ProjectGeneration.SyncIfNeeded(addedFiles.Union(deletedFiles).Union(movedFiles).Union(movedFromFiles), m_ProjectGeneration.SyncIfNeeded(addedFiles.Union(deletedFiles).Union(movedFiles).Union(movedFromFiles),
importedFiles); importedFiles);
} }
public void SyncAll() public void SyncAll()
{ {
AssetDatabase.Refresh(); AssetDatabase.Refresh();
if (RiderScriptEditorData.instance.HasChanges) if (RiderScriptEditorData.instance.HasChanges)
{ {
m_ProjectGeneration.Sync(); m_ProjectGeneration.Sync();
RiderScriptEditorData.instance.HasChanges = false; RiderScriptEditorData.instance.HasChanges = false;
} }
} }
public void Initialize(string editorInstallationPath) // is called each time ExternalEditor is changed public void Initialize(string editorInstallationPath) // is called each time ExternalEditor is changed
{ {
RiderScriptEditorData.instance.Invalidate(editorInstallationPath); RiderScriptEditorData.instance.Invalidate(editorInstallationPath);
m_ProjectGeneration.Sync(); // regenerate csproj and sln for new editor m_ProjectGeneration.Sync(); // regenerate csproj and sln for new editor
} }
public bool OpenProject(string path, int line, int column) public bool OpenProject(string path, int line, int column)
{ {
if (path != "" && !SupportsExtension(path)) // Assets - Open C# Project passes empty path here if (path != "" && !SupportsExtension(path)) // Assets - Open C# Project passes empty path here
{ {
return false; return false;
} }
if (path == "" && SystemInfo.operatingSystemFamily == OperatingSystemFamily.MacOSX) if (path == "" && SystemInfo.operatingSystemFamily == OperatingSystemFamily.MacOSX)
{ {
// there is a bug in DllImplementation - use package implementation here instead https://github.cds.internal.unity3d.com/unity/com.unity.ide.rider/issues/21 // there is a bug in DllImplementation - use package implementation here instead https://github.cds.internal.unity3d.com/unity/com.unity.ide.rider/issues/21
return OpenOSXApp(path, line, column); return OpenOSXApp(path, line, column);
} }
if (!IsUnityScript(path)) if (!IsUnityScript(path))
{ {
var fastOpenResult = EditorPluginInterop.OpenFileDllImplementation(path, line, column); var fastOpenResult = EditorPluginInterop.OpenFileDllImplementation(path, line, column);
if (fastOpenResult) if (fastOpenResult)
return true; return true;
} }
if (SystemInfo.operatingSystemFamily == OperatingSystemFamily.MacOSX) if (SystemInfo.operatingSystemFamily == OperatingSystemFamily.MacOSX)
{ {
return OpenOSXApp(path, line, column); return OpenOSXApp(path, line, column);
} }
var solution = GetSolutionFile(path); // TODO: If solution file doesn't exist resync. var solution = GetSolutionFile(path); // TODO: If solution file doesn't exist resync.
solution = solution == "" ? "" : $"\"{solution}\""; solution = solution == "" ? "" : $"\"{solution}\"";
var process = new Process var process = new Process
{ {
StartInfo = new ProcessStartInfo StartInfo = new ProcessStartInfo
{ {
FileName = CodeEditor.CurrentEditorInstallation, FileName = CodeEditor.CurrentEditorInstallation,
Arguments = $"{solution} -l {line} \"{path}\"", Arguments = $"{solution} -l {line} \"{path}\"",
UseShellExecute = true, UseShellExecute = true,
} }
}; };
process.Start(); process.Start();
return true; return true;
} }
private bool OpenOSXApp(string path, int line, int column) private bool OpenOSXApp(string path, int line, int column)
{ {
var solution = GetSolutionFile(path); // TODO: If solution file doesn't exist resync. var solution = GetSolutionFile(path); // TODO: If solution file doesn't exist resync.
solution = solution == "" ? "" : $"\"{solution}\""; solution = solution == "" ? "" : $"\"{solution}\"";
var pathArguments = path == "" ? "" : $"-l {line} \"{path}\""; var pathArguments = path == "" ? "" : $"-l {line} \"{path}\"";
var process = new Process var process = new Process
{ {
StartInfo = new ProcessStartInfo StartInfo = new ProcessStartInfo
{ {
FileName = "open", FileName = "open",
Arguments = $"-n \"{CodeEditor.CurrentEditorInstallation}\" --args {solution} {pathArguments}", Arguments = $"-n \"{CodeEditor.CurrentEditorInstallation}\" --args {solution} {pathArguments}",
CreateNoWindow = true, CreateNoWindow = true,
UseShellExecute = true, UseShellExecute = true,
} }
}; };
process.Start(); process.Start();
return true; return true;
} }
private string GetSolutionFile(string path) private string GetSolutionFile(string path)
{ {
if (IsUnityScript(path)) if (IsUnityScript(path))
{ {
return Path.Combine(GetBaseUnityDeveloperFolder(), "Projects/CSharp/Unity.CSharpProjects.gen.sln"); return Path.Combine(GetBaseUnityDeveloperFolder(), "Projects/CSharp/Unity.CSharpProjects.gen.sln");
} }
var solutionFile = m_ProjectGeneration.SolutionFile(); var solutionFile = m_ProjectGeneration.SolutionFile();
if (File.Exists(solutionFile)) if (File.Exists(solutionFile))
{ {
return solutionFile; return solutionFile;
} }
return ""; return "";
} }
static bool IsUnityScript(string path) static bool IsUnityScript(string path)
{ {
if (UnityEditor.Unsupported.IsDeveloperBuild()) if (UnityEditor.Unsupported.IsDeveloperBuild())
{ {
var baseFolder = GetBaseUnityDeveloperFolder().Replace("\\", "/"); var baseFolder = GetBaseUnityDeveloperFolder().Replace("\\", "/");
var lowerPath = path.ToLowerInvariant().Replace("\\", "/"); var lowerPath = path.ToLowerInvariant().Replace("\\", "/");
if (lowerPath.Contains((baseFolder + "/Runtime").ToLowerInvariant()) if (lowerPath.Contains((baseFolder + "/Runtime").ToLowerInvariant())
|| lowerPath.Contains((baseFolder + "/Editor").ToLowerInvariant())) || lowerPath.Contains((baseFolder + "/Editor").ToLowerInvariant()))
{ {
return true; return true;
} }
} }
return false; return false;
} }
static string GetBaseUnityDeveloperFolder() static string GetBaseUnityDeveloperFolder()
{ {
return Directory.GetParent(EditorApplication.applicationPath).Parent.Parent.FullName; return Directory.GetParent(EditorApplication.applicationPath).Parent.Parent.FullName;
} }
public bool TryGetInstallationForPath(string editorPath, out CodeEditor.Installation installation) public bool TryGetInstallationForPath(string editorPath, out CodeEditor.Installation installation)
{ {
if (FileSystemUtil.EditorPathExists(editorPath) && IsRiderInstallation(editorPath)) if (FileSystemUtil.EditorPathExists(editorPath) && IsRiderInstallation(editorPath))
{ {
var info = new RiderPathLocator.RiderInfo(editorPath, false); var info = new RiderPathLocator.RiderInfo(editorPath, false);
installation = new CodeEditor.Installation installation = new CodeEditor.Installation
{ {
Name = info.Presentation, Name = info.Presentation,
Path = info.Path Path = info.Path
}; };
return true; return true;
} }
installation = default; installation = default;
return false; return false;
} }
public static bool IsRiderInstallation(string path) public static bool IsRiderInstallation(string path)
{ {
if (IsAssetImportWorkerProcess()) if (IsAssetImportWorkerProcess())
return false; return false;
if (string.IsNullOrEmpty(path)) if (string.IsNullOrEmpty(path))
{ {
return false; return false;
} }
var fileInfo = new FileInfo(path); var fileInfo = new FileInfo(path);
var filename = fileInfo.Name.ToLowerInvariant(); var filename = fileInfo.Name.ToLowerInvariant();
return filename.StartsWith("rider", StringComparison.Ordinal); return filename.StartsWith("rider", StringComparison.Ordinal);
} }
private static bool IsAssetImportWorkerProcess() private static bool IsAssetImportWorkerProcess()
{ {
#if UNITY_2019_3_OR_NEWER #if UNITY_2019_3_OR_NEWER
return UnityEditor.Experimental.AssetDatabaseExperimental.IsAssetImportWorkerProcess(); return UnityEditor.Experimental.AssetDatabaseExperimental.IsAssetImportWorkerProcess();
#else #else
return false; return false;
#endif #endif
} }
public static string CurrentEditor // works fast, doesn't validate if executable really exists public static string CurrentEditor // works fast, doesn't validate if executable really exists
=> EditorPrefs.GetString("kScriptsDefaultApp"); => EditorPrefs.GetString("kScriptsDefaultApp");
public CodeEditor.Installation[] Installations => m_Discoverability.PathCallback(); public CodeEditor.Installation[] Installations => m_Discoverability.PathCallback();
public void CreateSolutionIfDoesntExist() public void CreateSolutionIfDoesntExist()
{ {
if (!m_ProjectGeneration.HasSolutionBeenGenerated()) if (!m_ProjectGeneration.HasSolutionBeenGenerated())
{ {
m_ProjectGeneration.Sync(); m_ProjectGeneration.Sync();
} }
} }
} }
} }
\ No newline at end of file
fileFormatVersion: 2 fileFormatVersion: 2
guid: c4095d72f77fbb64ea39b8b3ca246622 guid: c4095d72f77fbb64ea39b8b3ca246622
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
using System; using System;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
namespace Packages.Rider.Editor namespace Packages.Rider.Editor
{ {
public class RiderScriptEditorData : ScriptableSingleton<RiderScriptEditorData> public class RiderScriptEditorData : ScriptableSingleton<RiderScriptEditorData>
{ {
[SerializeField] internal bool HasChanges = true; // sln/csproj files were changed [SerializeField] internal bool HasChanges = true; // sln/csproj files were changed
[SerializeField] internal bool shouldLoadEditorPlugin; [SerializeField] internal bool shouldLoadEditorPlugin;
[SerializeField] internal bool InitializedOnce; [SerializeField] internal bool InitializedOnce;
[SerializeField] internal string currentEditorVersion; [SerializeField] internal string currentEditorVersion;
public void Init() public void Init()
{ {
if (string.IsNullOrEmpty(currentEditorVersion)) if (string.IsNullOrEmpty(currentEditorVersion))
Invalidate(RiderScriptEditor.CurrentEditor); Invalidate(RiderScriptEditor.CurrentEditor);
} }
public void Invalidate(string editorInstallationPath) public void Invalidate(string editorInstallationPath)
{ {
currentEditorVersion = RiderPathLocator.GetBuildNumber(editorInstallationPath); currentEditorVersion = RiderPathLocator.GetBuildNumber(editorInstallationPath);
if (!Version.TryParse(currentEditorVersion, out var version)) if (!Version.TryParse(currentEditorVersion, out var version))
shouldLoadEditorPlugin = false; shouldLoadEditorPlugin = false;
shouldLoadEditorPlugin = version >= new Version("191.7141.156"); shouldLoadEditorPlugin = version >= new Version("191.7141.156");
} }
} }
} }
\ No newline at end of file
fileFormatVersion: 2 fileFormatVersion: 2
guid: f079e3afd077fb94fa2bda74d6409499 guid: f079e3afd077fb94fa2bda74d6409499
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
fileFormatVersion: 2 fileFormatVersion: 2
guid: a52391bc44c477f40a547ed4ef3b9560 guid: a52391bc44c477f40a547ed4ef3b9560
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using JetBrains.Annotations; using JetBrains.Annotations;
using UnityEditor; using UnityEditor;
namespace Packages.Rider.Editor.UnitTesting namespace Packages.Rider.Editor.UnitTesting
{ {
public class CallbackData : ScriptableSingleton<CallbackData> public class CallbackData : ScriptableSingleton<CallbackData>
{ {
public bool isRider; public bool isRider;
[UsedImplicitly] public static event EventHandler Changed = (sender, args) => { }; [UsedImplicitly] public static event EventHandler Changed = (sender, args) => { };
internal void RaiseChangedEvent() internal void RaiseChangedEvent()
{ {
Changed(null, EventArgs.Empty); Changed(null, EventArgs.Empty);
} }
public List<TestEvent> events = new List<TestEvent>(); public List<TestEvent> events = new List<TestEvent>();
[UsedImplicitly] [UsedImplicitly]
public void Clear() public void Clear()
{ {
events.Clear(); events.Clear();
} }
} }
} }
\ No newline at end of file
fileFormatVersion: 2 fileFormatVersion: 2
guid: 010246a07de7cb34185a2a7b1c1fad59 guid: 010246a07de7cb34185a2a7b1c1fad59
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
#if TEST_FRAMEWORK #if TEST_FRAMEWORK
using UnityEditor; using UnityEditor;
using UnityEditor.TestTools.TestRunner.Api; using UnityEditor.TestTools.TestRunner.Api;
using UnityEngine; using UnityEngine;
namespace Packages.Rider.Editor.UnitTesting namespace Packages.Rider.Editor.UnitTesting
{ {
[InitializeOnLoad] [InitializeOnLoad]
internal static class CallbackInitializer internal static class CallbackInitializer
{ {
static CallbackInitializer() static CallbackInitializer()
{ {
if (CallbackData.instance.isRider) if (CallbackData.instance.isRider)
ScriptableObject.CreateInstance<TestRunnerApi>().RegisterCallbacks(ScriptableObject.CreateInstance<TestsCallback>(), 0); ScriptableObject.CreateInstance<TestRunnerApi>().RegisterCallbacks(ScriptableObject.CreateInstance<TestsCallback>(), 0);
} }
} }
} }
#endif #endif
\ No newline at end of file
fileFormatVersion: 2 fileFormatVersion: 2
guid: aa1c6b1a353ab464782fc1e7c051eb02 guid: aa1c6b1a353ab464782fc1e7c051eb02
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
using JetBrains.Annotations; using JetBrains.Annotations;
using UnityEngine; using UnityEngine;
#if TEST_FRAMEWORK #if TEST_FRAMEWORK
using UnityEditor; using UnityEditor;
using UnityEditor.TestTools.TestRunner.Api; using UnityEditor.TestTools.TestRunner.Api;
#endif #endif
namespace Packages.Rider.Editor.UnitTesting namespace Packages.Rider.Editor.UnitTesting
{ {
public static class RiderTestRunner public static class RiderTestRunner
{ {
#if TEST_FRAMEWORK #if TEST_FRAMEWORK
private static readonly TestsCallback Callback = ScriptableObject.CreateInstance<TestsCallback>(); private static readonly TestsCallback Callback = ScriptableObject.CreateInstance<TestsCallback>();
#endif #endif
[UsedImplicitly] [UsedImplicitly]
public static void RunTests(int testMode, string[] assemblyNames, string[] testNames, string[] categoryNames, string[] groupNames, int? buildTarget) public static void RunTests(int testMode, string[] assemblyNames, string[] testNames, string[] categoryNames, string[] groupNames, int? buildTarget)
{ {
#if !TEST_FRAMEWORK #if !TEST_FRAMEWORK
Debug.LogError("Update Test Framework package to v.1.1.1+ to run tests from Rider."); Debug.LogError("Update Test Framework package to v.1.1.1+ to run tests from Rider.");
#else #else
CallbackData.instance.isRider = true; CallbackData.instance.isRider = true;
var api = ScriptableObject.CreateInstance<TestRunnerApi>(); var api = ScriptableObject.CreateInstance<TestRunnerApi>();
var settings = new ExecutionSettings(); var settings = new ExecutionSettings();
var filter = new Filter var filter = new Filter
{ {
assemblyNames = assemblyNames, assemblyNames = assemblyNames,
testNames = testNames, testNames = testNames,
categoryNames = categoryNames, categoryNames = categoryNames,
groupNames = groupNames, groupNames = groupNames,
targetPlatform = (BuildTarget?) buildTarget targetPlatform = (BuildTarget?) buildTarget
}; };
if (testMode > 0) // for future use - test-framework would allow running both Edit and Play test at once if (testMode > 0) // for future use - test-framework would allow running both Edit and Play test at once
filter.testMode = (TestMode) testMode; filter.testMode = (TestMode) testMode;
settings.filters = new []{ settings.filters = new []{
filter filter
}; };
api.Execute(settings); api.Execute(settings);
api.UnregisterCallbacks(Callback); // avoid multiple registrations api.UnregisterCallbacks(Callback); // avoid multiple registrations
api.RegisterCallbacks(Callback); // This can be used to receive information about when the test suite and individual tests starts and stops. Provide this with a scriptable object implementing ICallbacks api.RegisterCallbacks(Callback); // This can be used to receive information about when the test suite and individual tests starts and stops. Provide this with a scriptable object implementing ICallbacks
#endif #endif
} }
} }
} }
\ No newline at end of file
fileFormatVersion: 2 fileFormatVersion: 2
guid: 5c3b27069cb3ddf42ba1260eeefcdd1c guid: 5c3b27069cb3ddf42ba1260eeefcdd1c
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
using System; using System;
using NUnit.Framework.Interfaces; using NUnit.Framework.Interfaces;
namespace Packages.Rider.Editor.UnitTesting namespace Packages.Rider.Editor.UnitTesting
{ {
[Serializable] [Serializable]
public enum EventType { TestStarted, TestFinished, RunFinished } public enum EventType { TestStarted, TestFinished, RunFinished }
[Serializable] [Serializable]
public class TestEvent public class TestEvent
{ {
public EventType type; public EventType type;
public string id; public string id;
public string assemblyName; public string assemblyName;
public string output; public string output;
public TestStatus testStatus; public TestStatus testStatus;
public double duration; public double duration;
public string parentId; public string parentId;
public TestEvent(EventType type, string id, string assemblyName, string output, double duration, TestStatus testStatus, string parentID) public TestEvent(EventType type, string id, string assemblyName, string output, double duration, TestStatus testStatus, string parentID)
{ {
this.type = type; this.type = type;
this.id = id; this.id = id;
this.assemblyName = assemblyName; this.assemblyName = assemblyName;
this.output = output; this.output = output;
this.testStatus = testStatus; this.testStatus = testStatus;
this.duration = duration; this.duration = duration;
parentId = parentID; parentId = parentID;
} }
} }
} }
\ No newline at end of file
fileFormatVersion: 2 fileFormatVersion: 2
guid: f9413c47b3a14a64e8810ce76d1a6032 guid: f9413c47b3a14a64e8810ce76d1a6032
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
#if TEST_FRAMEWORK #if TEST_FRAMEWORK
using System; using System;
using System.Text; using System.Text;
using UnityEditor.TestTools.TestRunner.Api; using UnityEditor.TestTools.TestRunner.Api;
using UnityEngine; using UnityEngine;
namespace Packages.Rider.Editor.UnitTesting namespace Packages.Rider.Editor.UnitTesting
{ {
public class TestsCallback : ScriptableObject, ICallbacks public class TestsCallback : ScriptableObject, ICallbacks
{ {
public void RunFinished(ITestResultAdaptor result) public void RunFinished(ITestResultAdaptor result)
{ {
CallbackData.instance.isRider = false; CallbackData.instance.isRider = false;
CallbackData.instance.events.Add( CallbackData.instance.events.Add(
new TestEvent(EventType.RunFinished, "", "","", 0, ParseTestStatus(result.TestStatus), "")); new TestEvent(EventType.RunFinished, "", "","", 0, ParseTestStatus(result.TestStatus), ""));
CallbackData.instance.RaiseChangedEvent(); CallbackData.instance.RaiseChangedEvent();
} }
public void TestStarted(ITestAdaptor result) public void TestStarted(ITestAdaptor result)
{ {
if (result.Method == null) return; if (result.Method == null) return;
CallbackData.instance.events.Add( CallbackData.instance.events.Add(
new TestEvent(EventType.TestStarted, GetUniqueName(result), result.Method.TypeInfo.Assembly.GetName().Name, "", 0, ParseTestStatus(TestStatus.Passed), result.ParentFullName)); new TestEvent(EventType.TestStarted, GetUniqueName(result), result.Method.TypeInfo.Assembly.GetName().Name, "", 0, ParseTestStatus(TestStatus.Passed), result.ParentFullName));
CallbackData.instance.RaiseChangedEvent(); CallbackData.instance.RaiseChangedEvent();
} }
public void TestFinished(ITestResultAdaptor result) public void TestFinished(ITestResultAdaptor result)
{ {
if (result.Test.Method == null) return; if (result.Test.Method == null) return;
CallbackData.instance.events.Add( CallbackData.instance.events.Add(
new TestEvent(EventType.TestFinished, GetUniqueName(result.Test), result.Test.Method.TypeInfo.Assembly.GetName().Name, ExtractOutput(result), result.Duration, ParseTestStatus(result.TestStatus), result.Test.ParentFullName)); new TestEvent(EventType.TestFinished, GetUniqueName(result.Test), result.Test.Method.TypeInfo.Assembly.GetName().Name, ExtractOutput(result), result.Duration, ParseTestStatus(result.TestStatus), result.Test.ParentFullName));
CallbackData.instance.RaiseChangedEvent(); CallbackData.instance.RaiseChangedEvent();
} }
// todo: reimplement JetBrains.Rider.Unity.Editor.AfterUnity56.UnitTesting.TestEventsSender.GetUniqueName // todo: reimplement JetBrains.Rider.Unity.Editor.AfterUnity56.UnitTesting.TestEventsSender.GetUniqueName
private static string GetUniqueName(ITestAdaptor test) private static string GetUniqueName(ITestAdaptor test)
{ {
string str = test.FullName; string str = test.FullName;
return str; return str;
} }
public void RunStarted(ITestAdaptor testsToRun) public void RunStarted(ITestAdaptor testsToRun)
{ {
} }
private static NUnit.Framework.Interfaces.TestStatus ParseTestStatus(TestStatus testStatus) private static NUnit.Framework.Interfaces.TestStatus ParseTestStatus(TestStatus testStatus)
{ {
return (NUnit.Framework.Interfaces.TestStatus)Enum.Parse(typeof(NUnit.Framework.Interfaces.TestStatus), testStatus.ToString()); return (NUnit.Framework.Interfaces.TestStatus)Enum.Parse(typeof(NUnit.Framework.Interfaces.TestStatus), testStatus.ToString());
} }
private static string ExtractOutput(ITestResultAdaptor testResult) private static string ExtractOutput(ITestResultAdaptor testResult)
{ {
var stringBuilder = new StringBuilder(); var stringBuilder = new StringBuilder();
if (testResult.Message != null) if (testResult.Message != null)
{ {
stringBuilder.AppendLine("Message: "); stringBuilder.AppendLine("Message: ");
stringBuilder.AppendLine(testResult.Message); stringBuilder.AppendLine(testResult.Message);
} }
if (!string.IsNullOrEmpty(testResult.Output)) if (!string.IsNullOrEmpty(testResult.Output))
{ {
stringBuilder.AppendLine("Output: "); stringBuilder.AppendLine("Output: ");
stringBuilder.AppendLine(testResult.Output); stringBuilder.AppendLine(testResult.Output);
} }
if (!string.IsNullOrEmpty(testResult.StackTrace)) if (!string.IsNullOrEmpty(testResult.StackTrace))
{ {
stringBuilder.AppendLine("Stacktrace: "); stringBuilder.AppendLine("Stacktrace: ");
stringBuilder.AppendLine(testResult.StackTrace); stringBuilder.AppendLine(testResult.StackTrace);
} }
var result = stringBuilder.ToString(); var result = stringBuilder.ToString();
if (result.Length > 0) if (result.Length > 0)
return result; return result;
return testResult.Output ?? string.Empty; return testResult.Output ?? string.Empty;
} }
} }
} }
#endif #endif
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment