Merge pull request #172 from unity/version-2.0.20

sailro · GitHub Enterprise · commit 1ae1f9f47fbc · 2023-06-27T10:54:51.000+02:00
2.0.20
diff --git a/Packages/com.unity.ide.visualstudio.tests/package.json b/Packages/com.unity.ide.visualstudio.tests/package.json
@@ -3,7 +3,7 @@
   "name": "com.unity.ide.visualstudio.tests",
   "displayName": "Visual Studio Editor",
   "description": "Code editor integration for supporting Visual Studio as code editor for unity. Adds support for generating csproj files for intellisense purposes, auto discovery of installations, etc.",
-  "version": "2.0.18",
+  "version": "2.0.19",
   "unity": "2019.4",
   "unityRelease": "25f1",
   "dependencies": {
diff --git a/Packages/com.unity.ide.visualstudio/CHANGELOG.md b/Packages/com.unity.ide.visualstudio/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Code Editor Package for Visual Studio
 
+## [2.0.19] - 2023-06-14
+
+Integration:
+
+- Add support for Visual Studio Code.
+ 
+Project generation:
+
+- Add support for Sdk Style poject generation.
+- Fix an issue related to missing properties with 2021.3.
+
+
 ## [2.0.18] - 2023-03-17
 
 Integration:
diff --git a/Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/AssemblyNameProvider.cs b/Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/AssemblyNameProvider.cs
@@ -40,7 +40,13 @@ public class AssemblyNameProvider : IAssemblyNameProvider
 
 		public string ProjectGenerationRootNamespace => EditorSettings.projectGenerationRootNamespace;
 
-		public virtual ProjectGenerationFlag ProjectGenerationFlag
+		public ProjectGenerationFlag ProjectGenerationFlag
+		{
+			get { return ProjectGenerationFlagImpl; }
+			private set { ProjectGenerationFlagImpl = value;}
+		}
+
+		internal virtual ProjectGenerationFlag ProjectGenerationFlagImpl
 		{
 			get => m_ProjectGenerationFlag;
 			private set
diff --git a/Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/LegacyStyleProjectGeneration.cs b/Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/LegacyStyleProjectGeneration.cs
@@ -30,7 +30,7 @@ internal override void GetProjectHeader(ProjectProperties properties, out String
 
 			//Header
 			headerBuilder.Append(@"<?xml version=""1.0"" encoding=""utf-8""?>").Append(k_WindowsNewline);
-			headerBuilder.Append(@"<Project ToolsVersion=""4.0"" DefaultTargets=""Build"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">").Append(k_WindowsNewline);
+			headerBuilder.Append($@"<Project ToolsVersion=""4.0"" DefaultTargets=""Build"" xmlns=""{MSBuildNamespaceUri}"">").Append(k_WindowsNewline);
 			headerBuilder.Append(@"  <!-- Generated file, do not modify, your changes will be overwritten (use AssetPostprocessor.OnGeneratedCSProject) -->").Append(k_WindowsNewline);
 			headerBuilder.Append(@"  <PropertyGroup>").Append(k_WindowsNewline);
 			headerBuilder.Append(@"    <LangVersion>").Append(properties.LangVersion).Append(@"</LangVersion>").Append(k_WindowsNewline);
@@ -68,7 +68,7 @@ internal override void GetProjectHeader(ProjectProperties properties, out String
 			GetProjectHeaderAnalyzers(properties, headerBuilder);
 		}
 
-		protected override void AppendProjectReference(Assembly assembly, Assembly reference, StringBuilder projectBuilder)
+		internal override void AppendProjectReference(Assembly assembly, Assembly reference, StringBuilder projectBuilder)
 		{
 			// If the current assembly is a Player project, we want to project-reference the corresponding Player project
 			var referenceName = m_AssemblyNameProvider.GetAssemblyName(assembly.outputPath, reference.name);
@@ -79,7 +79,7 @@ protected override void AppendProjectReference(Assembly assembly, Assembly refer
 			projectBuilder.Append("    </ProjectReference>").Append(k_WindowsNewline);
 		}
 
-		protected override void GetProjectFooter(StringBuilder footerBuilder)
+		internal override void GetProjectFooter(StringBuilder footerBuilder)
 		{
 			footerBuilder.Append(string.Join(k_WindowsNewline,
 				@"  <Import Project=""$(MSBuildToolsPath)\Microsoft.CSharp.targets"" />",
diff --git a/Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/ProjectGeneration.cs b/Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/ProjectGeneration.cs
@@ -37,13 +37,16 @@ public interface IGenerator
 		IAssemblyNameProvider AssemblyNameProvider { get; }
 	}
 
-	public abstract class ProjectGeneration : IGenerator
+	public class ProjectGeneration : IGenerator
 	{
+		// do not remove because of the Validation API, used in LegacyStyleProjectGeneration
+		public static readonly string MSBuildNamespaceUri = "http://schemas.microsoft.com/developer/msbuild/2003";
+
 		public IAssemblyNameProvider AssemblyNameProvider => m_AssemblyNameProvider;
 		public string ProjectDirectory { get; }
 
 		// Use this to have the same newline ending on all platforms for consistency.
-		protected const string k_WindowsNewline = "\r\n";
+		internal const string k_WindowsNewline = "\r\n";
 
 		const string m_SolutionProjectEntryTemplate = @"Project(""{{{0}}}"") = ""{1}"", ""{2}"", ""{{{3}}}""{4}EndProject";
 
@@ -59,7 +62,7 @@ public abstract class ProjectGeneration : IGenerator
 		HashSet<string> m_BuiltinSupportedExtensions = new HashSet<string>();
 
 		readonly string m_ProjectName;
-		protected readonly IAssemblyNameProvider m_AssemblyNameProvider;
+		internal readonly IAssemblyNameProvider m_AssemblyNameProvider;
 		readonly IFileIO m_FileIOProvider;
 		readonly IGUIDGenerator m_GUIDGenerator;
 		bool m_ShouldGenerateAll;
@@ -358,13 +361,13 @@ private Dictionary<string, string> GenerateAllAssetProjectParts()
 			return result;
 		}
 
-		protected enum IncludeAssetTag
+		internal enum IncludeAssetTag
 		{
 			Compile,
 			None
 		}
 
-		protected virtual void IncludeAsset(StringBuilder builder, IncludeAssetTag tag, string asset)
+		internal virtual void IncludeAsset(StringBuilder builder, IncludeAssetTag tag, string asset)
 		{
 			var filename = EscapedRelativePathFor(asset, out var packageInfo);
 
@@ -574,7 +577,9 @@ private static string XmlEscape(string s)
 			return SecurityElement.Escape(s);
 		}
 
-		protected abstract void AppendProjectReference(Assembly assembly, Assembly reference, StringBuilder projectBuilder);
+		internal virtual void AppendProjectReference(Assembly assembly, Assembly reference, StringBuilder projectBuilder)
+		{
+		}
 
 		private void AppendReference(string fullReference, StringBuilder projectBuilder)
 		{
@@ -751,7 +756,10 @@ private static ProjectType ProjectTypeOf(string fileName)
 			return ProjectType.Game;
 		}
 
-		internal abstract void GetProjectHeader(ProjectProperties properties, out StringBuilder headerBuilder);
+		internal virtual void GetProjectHeader(ProjectProperties properties, out StringBuilder headerBuilder)
+		{
+			headerBuilder = default;
+		}
 
 		internal static void GetProjectHeaderConfigurations(ProjectProperties properties, StringBuilder headerBuilder)
 		{
@@ -832,7 +840,9 @@ internal static void GetProjectHeaderVstuFlavoring(ProjectProperties properties,
 			headerBuilder.Append(@"  </PropertyGroup>").Append(k_WindowsNewline);
 		}
 
-		protected abstract void GetProjectFooter(StringBuilder footerBuilder);
+		internal virtual void GetProjectFooter(StringBuilder footerBuilder)
+		{
+		}
 
 		private static string GetSolutionText()
 		{
@@ -978,7 +988,7 @@ private string GetProjectActiveConfigurations(string projectGuid)
 				projectGuid);
 		}
 
-		protected string EscapedRelativePathFor(string file, out UnityEditor.PackageManager.PackageInfo packageInfo)
+		internal string EscapedRelativePathFor(string file, out UnityEditor.PackageManager.PackageInfo packageInfo)
 		{
 			var projectDir = ProjectDirectory.NormalizePathSeparators();
 			file = file.NormalizePathSeparators();
@@ -996,24 +1006,24 @@ protected string EscapedRelativePathFor(string file, out UnityEditor.PackageMana
 			return XmlFilename(path);
 		}
 
-		protected static string SkipPathPrefix(string path, string prefix)
+		internal static string SkipPathPrefix(string path, string prefix)
 		{
 			if (path.StartsWith($"{prefix}{Path.DirectorySeparatorChar}") && (path.Length > prefix.Length))
 				return path.Substring(prefix.Length + 1);
 			return path;
 		}
 
-		protected static string GetProjectExtension()
+		internal static string GetProjectExtension()
 		{
 			return ".csproj";
 		}
 
-		protected string ProjectGuid(string assemblyName)
+		internal string ProjectGuid(string assemblyName)
 		{
 			return m_GUIDGenerator.ProjectGuid(m_ProjectName, assemblyName);
 		}
 
-		protected string ProjectGuid(Assembly assembly)
+		internal string ProjectGuid(Assembly assembly)
 		{
 			return ProjectGuid(m_AssemblyNameProvider.GetAssemblyName(assembly.outputPath, assembly.name));
 		}
diff --git a/Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/SdkStyleProjectGeneration.cs b/Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/SdkStyleProjectGeneration.cs
@@ -16,7 +16,7 @@ internal class SdkStyleProjectGeneration : ProjectGeneration
 		internal class SdkStyleAssemblyNameProvider : AssemblyNameProvider
 		{
 			// disable PlayerGeneration with SdkStyle projects
-			public override ProjectGenerationFlag ProjectGenerationFlag => base.ProjectGenerationFlag & ~ProjectGenerationFlag.PlayerAssemblies;
+			internal override ProjectGenerationFlag ProjectGenerationFlagImpl => base.ProjectGenerationFlagImpl & ~ProjectGenerationFlag.PlayerAssemblies;
 		}
 
 		public SdkStyleProjectGeneration() : base(
@@ -67,14 +67,14 @@ internal override void GetProjectHeader(ProjectProperties properties, out String
 			GetProjectHeaderAnalyzers(properties, headerBuilder);
 		}
 
-		protected override void AppendProjectReference(Assembly assembly, Assembly reference, StringBuilder projectBuilder)
+		internal override void AppendProjectReference(Assembly assembly, Assembly reference, StringBuilder projectBuilder)
 		{
 			// If the current assembly is a Player project, we want to project-reference the corresponding Player project
 			var referenceName = m_AssemblyNameProvider.GetAssemblyName(assembly.outputPath, reference.name);
 			projectBuilder.Append(@"    <ProjectReference Include=""").Append(referenceName).Append(GetProjectExtension()).Append(@""" />").Append(k_WindowsNewline);
 		}
 
-		protected override void GetProjectFooter(StringBuilder footerBuilder)
+		internal override void GetProjectFooter(StringBuilder footerBuilder)
 		{
 			footerBuilder.Append("</Project>").Append(k_WindowsNewline);
 		}
diff --git a/Packages/com.unity.ide.visualstudio/package.json b/Packages/com.unity.ide.visualstudio/package.json
@@ -2,13 +2,13 @@
   "name": "com.unity.ide.visualstudio",
   "displayName": "Visual Studio Editor",
   "description": "Code editor integration for supporting Visual Studio as code editor for unity. Adds support for generating csproj files for intellisense purposes, auto discovery of installations, etc.",
-  "version": "2.0.18",
+  "version": "2.0.19",
   "unity": "2019.4",
   "unityRelease": "25f1",
   "dependencies": {
     "com.unity.test-framework": "1.1.9"
   },
   "relatedPackages": {
-    "com.unity.ide.visualstudio.tests": "2.0.18"
+    "com.unity.ide.visualstudio.tests": "2.0.19"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ internal override void GetProjectHeader(ProjectProperties properties, out String`
`30`	`30`
`31`	`31`	`//Header`
`32`	`32`	`headerBuilder.Append(@"<?xml version=""1.0"" encoding=""utf-8""?>").Append(k_WindowsNewline);`
`33`		`- headerBuilder.Append(@"<Project ToolsVersion=""4.0"" DefaultTargets=""Build"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">").Append(k_WindowsNewline);`
	`33`	`+ headerBuilder.Append($@"<Project ToolsVersion=""4.0"" DefaultTargets=""Build"" xmlns=""{MSBuildNamespaceUri}"">").Append(k_WindowsNewline);`
`34`	`34`	`headerBuilder.Append(@" <!-- Generated file, do not modify, your changes will be overwritten (use AssetPostprocessor.OnGeneratedCSProject) -->").Append(k_WindowsNewline);`
`35`	`35`	`headerBuilder.Append(@" <PropertyGroup>").Append(k_WindowsNewline);`
`36`	`36`	`headerBuilder.Append(@" <LangVersion>").Append(properties.LangVersion).Append(@"</LangVersion>").Append(k_WindowsNewline);`
`@@ -68,7 +68,7 @@ internal override void GetProjectHeader(ProjectProperties properties, out String`
`68`	`68`	`GetProjectHeaderAnalyzers(properties, headerBuilder);`
`69`	`69`	`}`
`70`	`70`
`71`		`- protected override void AppendProjectReference(Assembly assembly, Assembly reference, StringBuilder projectBuilder)`
	`71`	`+ internal override void AppendProjectReference(Assembly assembly, Assembly reference, StringBuilder projectBuilder)`
`72`	`72`	`{`
`73`	`73`	`// If the current assembly is a Player project, we want to project-reference the corresponding Player project`
`74`	`74`	`var referenceName = m_AssemblyNameProvider.GetAssemblyName(assembly.outputPath, reference.name);`
`@@ -79,7 +79,7 @@ protected override void AppendProjectReference(Assembly assembly, Assembly refer`
`79`	`79`	`projectBuilder.Append(" </ProjectReference>").Append(k_WindowsNewline);`
`80`	`80`	`}`
`81`	`81`
`82`		`- protected override void GetProjectFooter(StringBuilder footerBuilder)`
	`82`	`+ internal override void GetProjectFooter(StringBuilder footerBuilder)`
`83`	`83`	`{`
`84`	`84`	`footerBuilder.Append(string.Join(k_WindowsNewline,`
`85`	`85`	`@" <Import Project=""$(MSBuildToolsPath)\Microsoft.CSharp.targets"" />",`
Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,16 @@ public interface IGenerator`
`37`	`37`	`IAssemblyNameProvider AssemblyNameProvider { get; }`
`38`	`38`	`}`
`39`	`39`
`40`		`- public abstract class ProjectGeneration : IGenerator`
	`40`	`+ public class ProjectGeneration : IGenerator`
`41`	`41`	`{`
	`42`	`+ // do not remove because of the Validation API, used in LegacyStyleProjectGeneration`
	`43`	`+ public static readonly string MSBuildNamespaceUri = "http://schemas.microsoft.com/developer/msbuild/2003";`
	`44`	`+`
`42`	`45`	`public IAssemblyNameProvider AssemblyNameProvider => m_AssemblyNameProvider;`
`43`	`46`	`public string ProjectDirectory { get; }`
`44`	`47`
`45`	`48`	`// Use this to have the same newline ending on all platforms for consistency.`
`46`		`- protected const string k_WindowsNewline = "\r\n";`
	`49`	`+ internal const string k_WindowsNewline = "\r\n";`
`47`	`50`
`48`	`51`	`const string m_SolutionProjectEntryTemplate = @"Project(""{{{0}}}"") = ""{1}"", ""{2}"", ""{{{3}}}""{4}EndProject";`
`49`	`52`
`@@ -59,7 +62,7 @@ public abstract class ProjectGeneration : IGenerator`
`59`	`62`	`HashSet<string> m_BuiltinSupportedExtensions = new HashSet<string>();`
`60`	`63`
`61`	`64`	`readonly string m_ProjectName;`
`62`		`- protected readonly IAssemblyNameProvider m_AssemblyNameProvider;`
	`65`	`+ internal readonly IAssemblyNameProvider m_AssemblyNameProvider;`
`63`	`66`	`readonly IFileIO m_FileIOProvider;`
`64`	`67`	`readonly IGUIDGenerator m_GUIDGenerator;`
`65`	`68`	`bool m_ShouldGenerateAll;`
`@@ -358,13 +361,13 @@ private Dictionary<string, string> GenerateAllAssetProjectParts()`
`358`	`361`	`return result;`
`359`	`362`	`}`
`360`	`363`
`361`		`- protected enum IncludeAssetTag`
	`364`	`+ internal enum IncludeAssetTag`
`362`	`365`	`{`
`363`	`366`	`Compile,`
`364`	`367`	`None`
`365`	`368`	`}`
`366`	`369`
`367`		`- protected virtual void IncludeAsset(StringBuilder builder, IncludeAssetTag tag, string asset)`
	`370`	`+ internal virtual void IncludeAsset(StringBuilder builder, IncludeAssetTag tag, string asset)`
`368`	`371`	`{`
`369`	`372`	`var filename = EscapedRelativePathFor(asset, out var packageInfo);`
`370`	`373`
`@@ -574,7 +577,9 @@ private static string XmlEscape(string s)`
`574`	`577`	`return SecurityElement.Escape(s);`
`575`	`578`	`}`
`576`	`579`
`577`		`- protected abstract void AppendProjectReference(Assembly assembly, Assembly reference, StringBuilder projectBuilder);`
	`580`	`+ internal virtual void AppendProjectReference(Assembly assembly, Assembly reference, StringBuilder projectBuilder)`
	`581`	`+ {`
	`582`	`+ }`
`578`	`583`
`579`	`584`	`private void AppendReference(string fullReference, StringBuilder projectBuilder)`
`580`	`585`	`{`
`@@ -751,7 +756,10 @@ private static ProjectType ProjectTypeOf(string fileName)`
`751`	`756`	`return ProjectType.Game;`
`752`	`757`	`}`
`753`	`758`
`754`		`- internal abstract void GetProjectHeader(ProjectProperties properties, out StringBuilder headerBuilder);`
	`759`	`+ internal virtual void GetProjectHeader(ProjectProperties properties, out StringBuilder headerBuilder)`
	`760`	`+ {`
	`761`	`+ headerBuilder = default;`
	`762`	`+ }`
`755`	`763`
`756`	`764`	`internal static void GetProjectHeaderConfigurations(ProjectProperties properties, StringBuilder headerBuilder)`
`757`	`765`	`{`
`@@ -832,7 +840,9 @@ internal static void GetProjectHeaderVstuFlavoring(ProjectProperties properties,`
`832`	`840`	`headerBuilder.Append(@" </PropertyGroup>").Append(k_WindowsNewline);`
`833`	`841`	`}`
`834`	`842`
`835`		`- protected abstract void GetProjectFooter(StringBuilder footerBuilder);`
	`843`	`+ internal virtual void GetProjectFooter(StringBuilder footerBuilder)`
	`844`	`+ {`
	`845`	`+ }`
`836`	`846`
`837`	`847`	`private static string GetSolutionText()`
`838`	`848`	`{`
`@@ -978,7 +988,7 @@ private string GetProjectActiveConfigurations(string projectGuid)`
`978`	`988`	`projectGuid);`
`979`	`989`	`}`
`980`	`990`
`981`		`- protected string EscapedRelativePathFor(string file, out UnityEditor.PackageManager.PackageInfo packageInfo)`
	`991`	`+ internal string EscapedRelativePathFor(string file, out UnityEditor.PackageManager.PackageInfo packageInfo)`
`982`	`992`	`{`
`983`	`993`	`var projectDir = ProjectDirectory.NormalizePathSeparators();`
`984`	`994`	`file = file.NormalizePathSeparators();`
`@@ -996,24 +1006,24 @@ protected string EscapedRelativePathFor(string file, out UnityEditor.PackageMana`
`996`	`1006`	`return XmlFilename(path);`
`997`	`1007`	`}`
`998`	`1008`
`999`		`- protected static string SkipPathPrefix(string path, string prefix)`
	`1009`	`+ internal static string SkipPathPrefix(string path, string prefix)`
`1000`	`1010`	`{`
`1001`	`1011`	`if (path.StartsWith($"{prefix}{Path.DirectorySeparatorChar}") && (path.Length > prefix.Length))`
`1002`	`1012`	`return path.Substring(prefix.Length + 1);`
`1003`	`1013`	`return path;`
`1004`	`1014`	`}`
`1005`	`1015`
`1006`		`- protected static string GetProjectExtension()`
	`1016`	`+ internal static string GetProjectExtension()`
`1007`	`1017`	`{`
`1008`	`1018`	`return ".csproj";`
`1009`	`1019`	`}`
`1010`	`1020`
`1011`		`- protected string ProjectGuid(string assemblyName)`
	`1021`	`+ internal string ProjectGuid(string assemblyName)`
`1012`	`1022`	`{`
`1013`	`1023`	`return m_GUIDGenerator.ProjectGuid(m_ProjectName, assemblyName);`
`1014`	`1024`	`}`
`1015`	`1025`
`1016`		`- protected string ProjectGuid(Assembly assembly)`
	`1026`	`+ internal string ProjectGuid(Assembly assembly)`
`1017`	`1027`	`{`
`1018`	`1028`	`return ProjectGuid(m_AssemblyNameProvider.GetAssemblyName(assembly.outputPath, assembly.name));`
`1019`	`1029`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ internal class SdkStyleProjectGeneration : ProjectGeneration`
`16`	`16`	`internal class SdkStyleAssemblyNameProvider : AssemblyNameProvider`
`17`	`17`	`{`
`18`	`18`	`// disable PlayerGeneration with SdkStyle projects`
`19`		`- public override ProjectGenerationFlag ProjectGenerationFlag => base.ProjectGenerationFlag & ~ProjectGenerationFlag.PlayerAssemblies;`
	`19`	`+ internal override ProjectGenerationFlag ProjectGenerationFlagImpl => base.ProjectGenerationFlagImpl & ~ProjectGenerationFlag.PlayerAssemblies;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public SdkStyleProjectGeneration() : base(`
`@@ -67,14 +67,14 @@ internal override void GetProjectHeader(ProjectProperties properties, out String`
`67`	`67`	`GetProjectHeaderAnalyzers(properties, headerBuilder);`
`68`	`68`	`}`
`69`	`69`
`70`		`- protected override void AppendProjectReference(Assembly assembly, Assembly reference, StringBuilder projectBuilder)`
	`70`	`+ internal override void AppendProjectReference(Assembly assembly, Assembly reference, StringBuilder projectBuilder)`
`71`	`71`	`{`
`72`	`72`	`// If the current assembly is a Player project, we want to project-reference the corresponding Player project`
`73`	`73`	`var referenceName = m_AssemblyNameProvider.GetAssemblyName(assembly.outputPath, reference.name);`
`74`	`74`	`projectBuilder.Append(@" <ProjectReference Include=""").Append(referenceName).Append(GetProjectExtension()).Append(@""" />").Append(k_WindowsNewline);`
`75`	`75`	`}`
`76`	`76`
`77`		`- protected override void GetProjectFooter(StringBuilder footerBuilder)`
	`77`	`+ internal override void GetProjectFooter(StringBuilder footerBuilder)`
`78`	`78`	`{`
`79`	`79`	`footerBuilder.Append("</Project>").Append(k_WindowsNewline);`
`80`	`80`	`}`