Merge branch 'master' into VS2022

geekswagg · Jan 27, 2022 · c7faf93 · c7faf93
2 parents 0c7dedc + fd799bc
commit c7faf93
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 49 deletions.
diff --git a/Build.sln b/Build.sln
@@ -97,7 +97,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.HyperVServer",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DapperExtensions.StrongName", "Resources\Dependencies\DapperExtensions.StrongName\DapperExtensions.StrongName.csproj", "{28F18214-DFF8-4A30-BA24-4F32C20CA910}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU.Debug.Symbols.Net48", "..\IL2CPU\source\IL2CPU.Debug.Symbols\IL2CPU.Debug.Symbols.Net48.csproj", "{4559510D-C2C6-4405-8EB0-703E0D65C93E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU.Debug.Symbols.Net48", "..\IL2CPU\source\IL2CPU.Debug.Symbols.Net48\IL2CPU.Debug.Symbols.Net48.csproj", "{440CE2D4-024F-45D3-A95C-9077CC0A51E3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -430,16 +430,16 @@ Global
 		{28F18214-DFF8-4A30-BA24-4F32C20CA910}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{28F18214-DFF8-4A30-BA24-4F32C20CA910}.TEST|Any CPU.ActiveCfg = Release|Any CPU
 		{28F18214-DFF8-4A30-BA24-4F32C20CA910}.TEST|Any CPU.Build.0 = Release|Any CPU
-		{4559510D-C2C6-4405-8EB0-703E0D65C93E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4559510D-C2C6-4405-8EB0-703E0D65C93E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4559510D-C2C6-4405-8EB0-703E0D65C93E}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
-		{4559510D-C2C6-4405-8EB0-703E0D65C93E}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
-		{4559510D-C2C6-4405-8EB0-703E0D65C93E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4559510D-C2C6-4405-8EB0-703E0D65C93E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4559510D-C2C6-4405-8EB0-703E0D65C93E}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
-		{4559510D-C2C6-4405-8EB0-703E0D65C93E}.Release-CI|Any CPU.Build.0 = Release|Any CPU
-		{4559510D-C2C6-4405-8EB0-703E0D65C93E}.TEST|Any CPU.ActiveCfg = TEST|Any CPU
-		{4559510D-C2C6-4405-8EB0-703E0D65C93E}.TEST|Any CPU.Build.0 = TEST|Any CPU
+		{440CE2D4-024F-45D3-A95C-9077CC0A51E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{440CE2D4-024F-45D3-A95C-9077CC0A51E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{440CE2D4-024F-45D3-A95C-9077CC0A51E3}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{440CE2D4-024F-45D3-A95C-9077CC0A51E3}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
+		{440CE2D4-024F-45D3-A95C-9077CC0A51E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{440CE2D4-024F-45D3-A95C-9077CC0A51E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{440CE2D4-024F-45D3-A95C-9077CC0A51E3}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{440CE2D4-024F-45D3-A95C-9077CC0A51E3}.Release-CI|Any CPU.Build.0 = Release|Any CPU
+		{440CE2D4-024F-45D3-A95C-9077CC0A51E3}.TEST|Any CPU.ActiveCfg = TEST|Any CPU
+		{440CE2D4-024F-45D3-A95C-9077CC0A51E3}.TEST|Any CPU.Build.0 = TEST|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -482,7 +482,7 @@ Global
 		{0BA0EC69-F124-44C1-823D-C97FE3AEC59E} = {D95021E1-A2C9-4829-819E-ED433AF13162}
 		{9413B5A0-1120-43AD-8784-8A3726C1898C} = {FF5BAFDE-AE9D-438D-935A-86B33EE0A758}
 		{28F18214-DFF8-4A30-BA24-4F32C20CA910} = {FF5BAFDE-AE9D-438D-935A-86B33EE0A758}
-		{4559510D-C2C6-4405-8EB0-703E0D65C93E} = {FF5BAFDE-AE9D-438D-935A-86B33EE0A758}
+		{440CE2D4-024F-45D3-A95C-9077CC0A51E3} = {FF5BAFDE-AE9D-438D-935A-86B33EE0A758}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E5429BF0-2CEE-45B0-BC73-2188A409E1D3}

diff --git a/Build/Targets/InternalPackages.targets b/Build/Targets/InternalPackages.targets
@@ -11,7 +11,7 @@
     <ItemGroup>
         <IL2CPUPackage Include="IL2CPU.API" ProjectPath="source\IL2CPU.API\IL2CPU.API.csproj" />
         <IL2CPUPackage Include="IL2CPU.Debug.Symbols" ProjectPath="source\IL2CPU.Debug.Symbols\IL2CPU.Debug.Symbols.csproj" />
-		<IL2CPUPackage Include="IL2CPU.Debug.Symbols.Net48" ProjectPath="source\IL2CPU.Debug.Symbols\IL2CPU.Debug.Symbols.Net48.csproj" />
+		<IL2CPUPackage Include="IL2CPU.Debug.Symbols.Net48" ProjectPath="source\IL2CPU.Debug.Symbols.Net48\IL2CPU.Debug.Symbols.Net48.csproj" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/source/Cosmos.Build.Builder/BuildTasks/BuildTask.cs b/source/Cosmos.Build.Builder/BuildTasks/BuildTask.cs
@@ -23,8 +23,7 @@ public BuildTask(
             IMSBuildService msBuildService,
             string projectFilePath,
             string outputPath,
-            string vsixOutputPath,
-            bool vsixBuild = false) // vsixBuild triggers if the vsix value is set, causing IL2CPU.Debug.Symbols to target net48
+            string vsixOutputPath) // vsixBuild triggers if the vsix value is set, causing IL2CPU.Debug.Symbols to target net48
             : base(msBuildService)
         {
             ProjectFilePath = projectFilePath;
@@ -34,11 +33,6 @@ public BuildTask(
                 ["OutputPath"] = outputPath,
                 ["VsixOutputPath"] = vsixOutputPath
             };
-
-            if (vsixBuild)
-            {
-                _properties["Net48"] = "True";
-            }
         }
     }
 }
diff --git a/source/Cosmos.Build.Builder/BuildTasks/PackTask.cs b/source/Cosmos.Build.Builder/BuildTasks/PackTask.cs
@@ -23,8 +23,7 @@ public PackTask(
             IMSBuildService msBuildService,
             string projectFilePath,
             string packageOutputPath,
-            string packageVersionLocalBuildSuffix,
-            bool vsixBuild = false)
+            string packageVersionLocalBuildSuffix)
             : base(msBuildService)
         {
             ProjectFilePath = projectFilePath;
@@ -34,11 +33,6 @@ public PackTask(
                 ["PackageOutputPath"] = packageOutputPath,
                 ["PackageVersionLocalBuildSuffix"] = packageVersionLocalBuildSuffix
             };
-
-            if (vsixBuild)
-            {
-                _properties["Net48"] = "True";
-            }
         }
     }
 }
diff --git a/source/Cosmos.Build.Builder/BuildTasks/RestoreTask.cs b/source/Cosmos.Build.Builder/BuildTasks/RestoreTask.cs
@@ -20,19 +20,10 @@ internal class RestoreTask : MSBuildTargetBuildTaskBase
 
         public RestoreTask(
             IMSBuildService msBuildService,
-            string projectFilePath,
-            bool vsixBuild = false)
+            string projectFilePath)
             : base(msBuildService)
         {
             ProjectFilePath = projectFilePath;
-
-            if (vsixBuild)
-            {
-                _properties = new Dictionary<string, string>
-                {
-                    ["Net48"] = "True"
-                };
-            }
         }
     }
 }
diff --git a/source/Cosmos.Build.Builder/CosmosBuildDefinition.cs b/source/Cosmos.Build.Builder/CosmosBuildDefinition.cs
@@ -86,11 +86,11 @@ void CleanPackage(string aPackage)
 
             // Restore Build.sln
 
-            yield return new RestoreTask(_msBuildService, buildSlnPath, true);
+            yield return new RestoreTask(_msBuildService, buildSlnPath);
 
             // Build Build.sln
 
-            yield return new BuildTask(_msBuildService, buildSlnPath, vsipDir, vsipDir, true);
+            yield return new BuildTask(_msBuildService, buildSlnPath, vsipDir, vsipDir);
 
             // Publish IL2CPU
 
@@ -107,7 +107,7 @@ void CleanPackage(string aPackage)
                 "Cosmos.Build.Tasks",
             };
 
-            foreach (var task in PackProject(cosmosPackageProjects, new List<string>(), true))
+            foreach (var task in PackProject(cosmosPackageProjects, new List<string>()))
             {
                 yield return task;
             }
@@ -135,7 +135,7 @@ void CleanPackage(string aPackage)
                 "IL2CPU.API"
             };
 
-            foreach (var task in PackProject(cosmosPackageProjects, il2cpuPackageProjects, false))
+            foreach (var task in PackProject(cosmosPackageProjects, il2cpuPackageProjects))
             {
                 yield return task;
             }
@@ -169,7 +169,7 @@ void CleanPackage(string aPackage)
                 }
             }
 
-            IEnumerable<IBuildTask> PackProject(List<string> cosmosProjects, List<string> il2cpuProjects, bool targetNet48)
+            IEnumerable<IBuildTask> PackProject(List<string> cosmosProjects, List<string> il2cpuProjects)
             {
                 var packageProjectPaths = cosmosProjects.Select(p => Path.Combine(cosmosSourceDir, p));
                 packageProjectPaths = packageProjectPaths.Concat(il2cpuProjects.Select(p => Path.Combine(il2cpuSourceDir, p)));
@@ -182,10 +182,10 @@ IEnumerable<IBuildTask> PackProject(List<string> cosmosProjects, List<string> il
                 {
                     if (restore)
                     {
-                        yield return new RestoreTask(_msBuildService, projectPath, targetNet48);
+                        yield return new RestoreTask(_msBuildService, projectPath);
                         restore = false;
                     }
-                    yield return new PackTask(_msBuildService, projectPath, packagesDir, packageVersionLocalBuildSuffix, targetNet48);
+                    yield return new PackTask(_msBuildService, projectPath, packagesDir, packageVersionLocalBuildSuffix);
                 }
             }
         }

diff --git a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj
@@ -28,6 +28,7 @@
         <PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.0.6" />
         <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
         <PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" />
+        <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
     </ItemGroup>
 
     <ItemGroup>
@@ -58,9 +59,4 @@
         </ItemGroup>
 
     </Target>
-
-    <ItemGroup>
-        <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
-    </ItemGroup>
-
 </Project>