Changed some netframework projects to use .net sdk style csprojs (#744)

#CHANGE netframework projects now use sdk style projects, except for the debugging projects in the tool solution #CHANGE members of some resource files are now internal #CHANGE added samplerunner project to easily run samples
AdamsLair · May 5, 2020 · 1138d79 · 1138d79
1 parent 2ac59ab
commit 1138d79
Show file tree

Hide file tree

Showing 89 changed files with 1,221 additions and 3,405 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,3 +56,4 @@ Build/NUnit/nunit.engine.api.dll
 Build/NUnit/nunit-project-loader.dll
 Build/NUnit/Mono.Cecil.dll
 Build/NUnit/nunit3-console.exe
+Samples/**/Content/Plugins
diff --git a/Build/NightlyBuild/NightlyBuilder.exe b/Build/NightlyBuild/NightlyBuilder.exe
diff --git a/Build/NightlyBuild/NightlyBuilder.exe.config b/Build/NightlyBuild/NightlyBuilder.exe.config
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
   <!-- The following runtime tag is required because MSBuild moved from .Net to Visual Studio as of VS2013 -->
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="2.0.0.0-4.0.0.0" newVersion="12.0.0.0"/>
+        <assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="2.0.0.0-4.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="2.0.0.0-4.0.0.0" newVersion="12.0.0.0"/>
+        <assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="2.0.0.0-4.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="2.0.0.0-4.0.0.0" newVersion="12.0.0.0"/>
+        <assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="2.0.0.0-4.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
diff --git a/Build/NightlyBuild/NightlyBuilder.pdb b/Build/NightlyBuild/NightlyBuilder.pdb
diff --git a/Build/NuGetPackageSpecs/AudioHandling.Sample.nuspec b/Build/NuGetPackageSpecs/AudioHandling.Sample.nuspec
@@ -25,8 +25,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Samples\AudioHandling\bin\Release\netstandard2.0\AudioHandling.Sample.core.dll" target="lib\netstandard2.0" />
-    <file src="..\..\Samples\AudioHandling\bin\Release\netstandard2.0\AudioHandling.Sample.core.xml" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\AudioHandling\Content\Plugins\netstandard2.0\AudioHandling.Sample.core.dll" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\AudioHandling\Content\Plugins\netstandard2.0\AudioHandling.Sample.core.xml" target="lib\netstandard2.0" />
     <file src="..\..\Samples\AudioHandling\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/BasicMenu.Sample.nuspec b/Build/NuGetPackageSpecs/BasicMenu.Sample.nuspec
@@ -25,8 +25,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Samples\BasicMenu\bin\Release\netstandard2.0\BasicMenu.Sample.core.dll" target="lib\netstandard2.0" />
-    <file src="..\..\Samples\BasicMenu\bin\Release\netstandard2.0\BasicMenu.Sample.core.xml" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\BasicMenu\Content\Plugins\netstandard2.0\BasicMenu.Sample.core.dll" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\BasicMenu\Content\Plugins\netstandard2.0\BasicMenu.Sample.core.xml" target="lib\netstandard2.0" />
     <file src="..\..\Samples\BasicMenu\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/Benchmarks.Sample.nuspec b/Build/NuGetPackageSpecs/Benchmarks.Sample.nuspec
@@ -25,8 +25,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Samples\Benchmarks\bin\Release\netstandard2.0\Benchmarks.Sample.core.dll" target="lib\netstandard2.0" />
-    <file src="..\..\Samples\Benchmarks\bin\Release\netstandard2.0\Benchmarks.Sample.core.xml" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\Benchmarks\Content\Plugins\netstandard2.0\Benchmarks.Sample.core.dll" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\Benchmarks\Content\Plugins\netstandard2.0\Benchmarks.Sample.core.xml" target="lib\netstandard2.0" />
     <file src="..\..\Samples\Benchmarks\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/CameraController.Sample.nuspec b/Build/NuGetPackageSpecs/CameraController.Sample.nuspec
@@ -25,8 +25,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Samples\CameraController\bin\Release\netstandard2.0\CameraController.Sample.core.dll" target="lib\netstandard2.0" />
-    <file src="..\..\Samples\CameraController\bin\Release\netstandard2.0\CameraController.Sample.core.xml" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\CameraController\Content\Plugins\netstandard2.0\CameraController.Sample.core.dll" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\CameraController\Content\Plugins\netstandard2.0\CameraController.Sample.core.xml" target="lib\netstandard2.0" />
     <file src="..\..\Samples\CameraController\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/CustomRenderingSetup.Sample.nuspec b/Build/NuGetPackageSpecs/CustomRenderingSetup.Sample.nuspec
@@ -25,8 +25,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Samples\CustomRenderingSetup\bin\Release\netstandard2.0\CustomRenderingSetup.Sample.core.dll" target="lib\netstandard2.0" />
-    <file src="..\..\Samples\CustomRenderingSetup\bin\Release\netstandard2.0\CustomRenderingSetup.Sample.core.xml" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\CustomRenderingSetup\Content\Plugins\netstandard2.0\CustomRenderingSetup.Sample.core.dll" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\CustomRenderingSetup\Content\Plugins\netstandard2.0\CustomRenderingSetup.Sample.core.xml" target="lib\netstandard2.0" />
     <file src="..\..\Samples\CustomRenderingSetup\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/DefaultOpenTKBackend.Core.nuspec b/Build/NuGetPackageSpecs/DefaultOpenTKBackend.Core.nuspec
@@ -23,8 +23,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\Output\Plugins\DefaultOpenTKBackend.core.dll" target="lib\net472" />
-    <file src="..\Output\Plugins\DefaultOpenTKBackend.core.pdb" target="lib\net472" />
+    <file src="..\Output\Plugins\DefaultOpenTK.Core.dll" target="lib\net472" />
+    <file src="..\Output\Plugins\DefaultOpenTK.Core.pdb" target="lib\net472" />
     <file src="..\Output\OpenALSoft32.dll" target="lib\net472" />
     <file src="..\Output\OpenALSoft64.dll" target="lib\net472" />
   </files>

diff --git a/Build/NuGetPackageSpecs/DefaultOpenTKBackend.Editor.nuspec b/Build/NuGetPackageSpecs/DefaultOpenTKBackend.Editor.nuspec
@@ -25,7 +25,7 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\Output\Plugins\DefaultOpenTKBackend.editor.dll" target="lib\net472" />
-    <file src="..\Output\Plugins\DefaultOpenTKBackend.editor.pdb" target="lib\net472" />
+    <file src="..\Output\Plugins\DefaultOpenTK.Editor.dll" target="lib\net472" />
+    <file src="..\Output\Plugins\DefaultOpenTK.Editor.pdb" target="lib\net472" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/DotNetFrameworkBackend.Core.nuspec b/Build/NuGetPackageSpecs/DotNetFrameworkBackend.Core.nuspec
@@ -21,7 +21,7 @@
     <releaseNotes>Patch Version Update</releaseNotes>
   </metadata>
   <files>
-    <file src="..\Output\Plugins\DotNetFrameworkBackend.core.dll" target="lib\net472" />
-    <file src="..\Output\Plugins\DotNetFrameworkBackend.core.pdb" target="lib\net472" />
+    <file src="..\Output\Plugins\DotNetFramework.Core.dll" target="lib\net472" />
+    <file src="..\Output\Plugins\DotNetFramework.Core.pdb" target="lib\net472" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/DualStickSpaceShooter.Sample.nuspec b/Build/NuGetPackageSpecs/DualStickSpaceShooter.Sample.nuspec
@@ -25,8 +25,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Samples\DualStickSpaceShooter\bin\Release\netstandard2.0\DualStickSpaceShooter.Sample.core.dll" target="lib\netstandard2.0" />
-    <file src="..\..\Samples\DualStickSpaceShooter\bin\Release\netstandard2.0\DualStickSpaceShooter.Sample.core.xml" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\DualStickSpaceShooter\Content\Plugins\netstandard2.0\DualStickSpaceShooter.Sample.core.dll" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\DualStickSpaceShooter\Content\Plugins\netstandard2.0\DualStickSpaceShooter.Sample.core.xml" target="lib\netstandard2.0" />
     <file src="..\..\Samples\DualStickSpaceShooter\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/DynamicLighting.Sample.nuspec b/Build/NuGetPackageSpecs/DynamicLighting.Sample.nuspec
@@ -26,8 +26,8 @@
   </metadata>
   <files>
     <file src="..\..\Samples\DynamicLighting\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
-    <file src="..\..\Samples\DynamicLighting\Core\bin\Release\netstandard2.0\DynamicLighting.Sample.core.dll" target="lib\net472" />
-    <file src="..\..\Samples\DynamicLighting\Core\bin\Release\netstandard2.0\DynamicLighting.Sample.core.xml" target="lib\net472" />
-    <file src="..\..\Samples\DynamicLighting\Content\Plugins\DynamicLighting.Sample.editor.dll" target="lib\net472" />
+    <file src="..\..\Samples\DynamicLighting\Core\Content\Plugins\netstandard2.0\DynamicLighting.Sample.core.dll" target="lib\net472" />
+    <file src="..\..\Samples\DynamicLighting\Core\Content\Plugins\netstandard2.0\DynamicLighting.Sample.core.xml" target="lib\net472" />
+    <file src="..\..\Samples\DynamicLighting\Editor\Content\Plugins\net472\DynamicLighting.Sample.editor.dll" target="lib\net472" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/FlapOrDie.Sample.nuspec b/Build/NuGetPackageSpecs/FlapOrDie.Sample.nuspec
@@ -25,8 +25,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Samples\FlapOrDie\bin\Release\netstandard2.0\FlapOrDie.Sample.core.dll" target="lib\netstandard2.0" />
-    <file src="..\..\Samples\FlapOrDie\bin\Release\netstandard2.0\FlapOrDie.Sample.core.xml" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\FlapOrDie\Content\Plugins\netstandard2.0\FlapOrDie.Sample.core.dll" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\FlapOrDie\Content\Plugins\netstandard2.0\FlapOrDie.Sample.core.xml" target="lib\netstandard2.0" />
     <file src="..\..\Samples\FlapOrDie\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/InputHandling.Sample.nuspec b/Build/NuGetPackageSpecs/InputHandling.Sample.nuspec
@@ -25,8 +25,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Samples\InputHandling\bin\Release\netstandard2.0\InputHandling.Sample.core.dll" target="lib\netstandard2.0" />
-    <file src="..\..\Samples\InputHandling\bin\Release\netstandard2.0\InputHandling.Sample.core.xml" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\InputHandling\Content\Plugins\netstandard2.0\InputHandling.Sample.core.dll" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\InputHandling\Content\Plugins\netstandard2.0\InputHandling.Sample.core.xml" target="lib\netstandard2.0" />
     <file src="..\..\Samples\InputHandling\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/ParticleSystem.Sample.nuspec b/Build/NuGetPackageSpecs/ParticleSystem.Sample.nuspec
@@ -25,8 +25,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Samples\ParticleSystem\bin\Release\netstandard2.0\ParticleSystem.Sample.core.dll" target="lib\netstandard2.0" />
-    <file src="..\..\Samples\ParticleSystem\bin\Release\netstandard2.0\ParticleSystem.Sample.core.xml" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\ParticleSystem\Content\Plugins\netstandard2.0\ParticleSystem.Sample.core.dll" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\ParticleSystem\Content\Plugins\netstandard2.0\ParticleSystem.Sample.core.xml" target="lib\netstandard2.0" />
     <file src="..\..\Samples\ParticleSystem\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/Physics.Sample.nuspec b/Build/NuGetPackageSpecs/Physics.Sample.nuspec
@@ -25,8 +25,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Samples\Physics\bin\Release\netstandard2.0\Physics.Sample.core.dll" target="lib\netstandard2.0" />
-    <file src="..\..\Samples\Physics\bin\Release\netstandard2.0\Physics.Sample.core.xml" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\Physics\Content\Plugins\netstandard2.0\Physics.Sample.core.dll" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\Physics\Content\Plugins\netstandard2.0\Physics.Sample.core.xml" target="lib\netstandard2.0" />
     <file src="..\..\Samples\Physics\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/SmoothAnimation.Sample.nuspec b/Build/NuGetPackageSpecs/SmoothAnimation.Sample.nuspec
@@ -25,8 +25,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Samples\SmoothAnimation\bin\Release\netstandard2.0\SmoothAnimation.Sample.core.dll" target="lib\netstandard2.0" />
-    <file src="..\..\Samples\SmoothAnimation\bin\Release\netstandard2.0\SmoothAnimation.Sample.core.xml" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\SmoothAnimation\Content\Plugins\netstandard2.0\SmoothAnimation.Sample.core.dll" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\SmoothAnimation\Content\Plugins\netstandard2.0\SmoothAnimation.Sample.core.xml" target="lib\netstandard2.0" />
     <file src="..\..\Samples\SmoothAnimation\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/Steering.Sample.nuspec b/Build/NuGetPackageSpecs/Steering.Sample.nuspec
@@ -24,8 +24,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Samples\Steering\bin\Release\netstandard2.0\Steering.Sample.core.dll" target="lib\netstandard2.0" />
-    <file src="..\..\Samples\Steering\bin\Release\netstandard2.0\Steering.Sample.core.xml" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\Steering\Content\Plugins\netstandard2.0\Steering.Sample.core.dll" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\Steering\Content\Plugins\netstandard2.0\Steering.Sample.core.xml" target="lib\netstandard2.0" />
     <file src="..\..\Samples\Steering\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
   </files>
 </package>
diff --git a/Build/NuGetPackageSpecs/Tilemaps.Sample.nuspec b/Build/NuGetPackageSpecs/Tilemaps.Sample.nuspec
@@ -27,8 +27,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Samples\Tilemaps\bin\Release\netstandard2.0\Tilemaps.Sample.core.dll" target="lib\netstandard2.0" />
-    <file src="..\..\Samples\Tilemaps\bin\Release\netstandard2.0\Tilemaps.Sample.core.xml" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\Tilemaps\Content\Plugins\netstandard2.0\Tilemaps.Sample.core.dll" target="lib\netstandard2.0" />
+    <file src="..\..\Samples\Tilemaps\Content\Plugins\netstandard2.0\Tilemaps.Sample.core.xml" target="lib\netstandard2.0" />
     <file src="..\..\Samples\Tilemaps\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
   </files>
 </package>
diff --git a/Build/Scripts/bin/VersionUpdater.exe b/Build/Scripts/bin/VersionUpdater.exe
diff --git a/Build/Scripts/bin/VersionUpdater.exe.config b/Build/Scripts/bin/VersionUpdater.exe.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
-    </startup>
-</configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+  </startup>
+</configuration>
diff --git a/Build/Scripts/bin/VersionUpdater.pdb b/Build/Scripts/bin/VersionUpdater.pdb