Update project files for configuration changes. (#14281)

Corvax-Frontier · Mar 6, 2023 · c5b3f62 · c5b3f62
1 parent 9b080c0
commit c5b3f62
Show file tree

Hide file tree

Showing 18 changed files with 187 additions and 60 deletions.
diff --git a/BuildChecker/BuildChecker.csproj b/BuildChecker/BuildChecker.csproj
@@ -32,6 +32,12 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Tools|AnyCPU' ">
+    <OutputPath>bin\Tools\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugOpt|AnyCPU' ">
+    <OutputPath>bin\DebugOpt\</OutputPath>
+  </PropertyGroup>
   <Target Name="Build">
     <Exec Command="$(Python) git_helper.py" CustomErrorRegularExpression="^Error" />
   </Target>

diff --git a/Content.Benchmarks/Content.Benchmarks.csproj b/Content.Benchmarks/Content.Benchmarks.csproj
@@ -25,5 +25,4 @@
     <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
     <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
   </ItemGroup>
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
 </Project>
diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
@@ -10,8 +9,9 @@
     <OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
     <WarningsAsErrors>nullable</WarningsAsErrors>
     <Nullable>enable</Nullable>
+    <Configurations>Debug;Release;Tools;DebugOpt</Configurations>
+    <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
-  <Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
   <ItemGroup>
     <PackageReference Include="Nett" Version="0.15.0" />
     <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
@@ -34,6 +34,7 @@
       <DependentUpon>StrippingWindow.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
+
+  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
 </Project>
diff --git a/Content.IntegrationTests/Content.IntegrationTests.csproj b/Content.IntegrationTests/Content.IntegrationTests.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
@@ -8,7 +7,6 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <LangVersion>11</LangVersion>
   </PropertyGroup>
-  <Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
@@ -25,5 +23,5 @@
     <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
     <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
   </ItemGroup>
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
+  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>
diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs
@@ -218,10 +218,7 @@ private static void SetupCVars(PoolSettings poolSettings, RobustIntegrationTest.
             options.CVarOverrides[CCVars.GameDummyTicker.Name] = "true";
         }
 
-        if (poolSettings.InLobby)
-        {
-            options.CVarOverrides[CCVars.GameLobbyEnabled.Name] = "true";
-        }
+        options.CVarOverrides[CCVars.GameLobbyEnabled.Name] = poolSettings.InLobby.ToString();
 
         if (poolSettings.DisableInterpolate)
         {
@@ -233,6 +230,8 @@ private static void SetupCVars(PoolSettings poolSettings, RobustIntegrationTest.
             options.CVarOverrides[CCVars.GameMap.Name] = poolSettings.Map;
         }
 
+        options.CVarOverrides[CCVars.ConfigPresetDevelopment.Name] = "false";
+
         // This breaks some tests.
         // TODO: Figure out which tests this breaks.
         options.CVarOverrides[CVars.NetBufferSize.Name] = "0";
@@ -647,12 +646,12 @@ public sealed class PoolSettings
     /// <summary>
     /// If the returned pair must not be reused
     /// </summary>
-    public bool MustNotBeReused => Destructive || NoLoadContent || DisableInterpolate || DummyTicker;
+    public bool MustNotBeReused => Destructive || NoLoadContent || DisableInterpolate || DummyTicker || NoToolsExtraPrototypes;
 
     /// <summary>
     /// If the given pair must be brand new
     /// </summary>
-    public bool MustBeNew => Fresh || NoLoadContent || DisableInterpolate || DummyTicker;
+    public bool MustBeNew => Fresh || NoLoadContent || DisableInterpolate || DummyTicker || NoToolsExtraPrototypes;
 
     /// <summary>
     /// If the given pair must not be connected
@@ -744,6 +743,14 @@ public bool CanFastRecycle(PoolSettings nextSettings)
         if (ExtraPrototypes != nextSettings.ExtraPrototypes) return false;
         return true;
     }
+
+    // Prototype hot reload is not available outside TOOLS builds,
+    // so we can't pool test instances that use ExtraPrototypes without TOOLS.
+#if TOOLS
+    private bool NoToolsExtraPrototypes => false;
+#else
+    private bool NoToolsExtraPrototypes => !string.IsNullOrEmpty(ExtraPrototypes);
+#endif
 }
 
 /// <summary>

diff --git a/Content.MapRenderer/Content.MapRenderer.csproj b/Content.MapRenderer/Content.MapRenderer.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets"/>
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <OutputPath>..\bin\Content.MapRenderer\</OutputPath>
@@ -10,13 +8,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj"/>
-    <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj"/>
+    <ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
+    <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.13.3"/>
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3"/>
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
   </ItemGroup>
 
+  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>
diff --git a/Content.Packaging/Content.Packaging.csproj b/Content.Packaging/Content.Packaging.csproj
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets"/>
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\RobustToolbox\Robust.Packaging\Robust.Packaging.csproj"/>
+    <ProjectReference Include="..\RobustToolbox\Robust.Packaging\Robust.Packaging.csproj" />
   </ItemGroup>
 
+  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>
diff --git a/Content.Server.Database/Content.Server.Database.csproj b/Content.Server.Database/Content.Server.Database.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
@@ -9,14 +8,8 @@
     <OutputPath>..\bin\Content.Server.Database\</OutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <NoWarn>RA0003</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <NoWarn>RA0003</NoWarn>
-  </PropertyGroup>
-  <Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.5">
@@ -31,5 +24,5 @@
     <ProjectReference Include="..\Content.Shared.Database\Content.Shared.Database.csproj" />
   </ItemGroup>
 
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
+  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
@@ -14,7 +13,6 @@
     <Nullable>enable</Nullable>
     <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
-  <Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
   </ItemGroup>
@@ -27,6 +25,6 @@
     <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
   </ItemGroup>
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
 
+  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
@@ -199,7 +199,7 @@ private static void LoadConfigPresets(IConfigurationManager cfg, IResourceManage
 
         private static void LoadBuildConfigPresets(IConfigurationManager cfg, IResourceManager res, ISawmill sawmill)
         {
-#if !FULL_RELEASE
+#if TOOLS
             Load(CCVars.ConfigPresetDevelopment, "development");
 #endif
 #if DEBUG

diff --git a/Content.Shared.Database/Content.Shared.Database.csproj b/Content.Shared.Database/Content.Shared.Database.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets"/>
-
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>
diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj
@@ -1,17 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
     <LangVersion>11</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Configurations>Release;Debug</Configurations>
-    <Platforms>AnyCPU</Platforms>
     <WarningsAsErrors>nullable</WarningsAsErrors>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-  <Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
   </ItemGroup>
@@ -30,6 +26,6 @@
   <ItemGroup>
     <EmbeddedResource Include="Text\Names\*.txt" />
   </ItemGroup>
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
 
+  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>
diff --git a/Content.Tests/Content.Tests.csproj b/Content.Tests/Content.Tests.csproj
@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
     <LangVersion>11</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Tests\</OutputPath>
-    <Configurations>Debug;Release</Configurations>
-    <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
-  <Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit.ConsoleRunner" Version="3.15.0" />
@@ -27,6 +23,6 @@
     <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
     <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
   </ItemGroup>
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
 
+  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>
diff --git a/Content.Tools/Content.Tools.csproj b/Content.Tools/Content.Tools.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>$(TargetFramework)</TargetFramework>
@@ -13,4 +12,5 @@
       <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
     </ItemGroup>
 
+  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>
diff --git a/Content.YAMLLinter/Content.YAMLLinter.csproj b/Content.YAMLLinter/Content.YAMLLinter.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>$(TargetFramework)</TargetFramework>
@@ -22,4 +21,6 @@
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.13.3" />
   </ItemGroup>
+
+  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>
diff --git a/Content.YAMLLinter/Program.cs b/Content.YAMLLinter/Program.cs
@@ -11,19 +11,14 @@
 
 namespace Content.YAMLLinter
 {
-    internal class Program
+    internal static class Program
     {
-        private static int Main(string[] args)
-        {
-            return new Program().Run();
-        }
-
-        private int Run()
+        private static async Task<int> Main(string[] args)
         {
             var stopwatch = new Stopwatch();
             stopwatch.Start();
 
-            var errors = RunValidation().Result;
+            var errors = await RunValidation();
 
             if (errors.Count == 0)
             {
@@ -43,7 +38,7 @@ private int Run()
             return -1;
         }
 
-        private async Task<Dictionary<string, HashSet<ErrorNode>>> ValidateClient()
+        private static async Task<Dictionary<string, HashSet<ErrorNode>>> ValidateClient()
         {
             await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{DummyTicker = true, Disconnected = true});
             var client = pairTracker.Pair.Client;
@@ -61,7 +56,7 @@ await client.WaitPost(() =>
             return clientErrors;
         }
 
-        private async Task<Dictionary<string, HashSet<ErrorNode>>> ValidateServer()
+        private static async Task<Dictionary<string, HashSet<ErrorNode>>> ValidateServer()
         {
             await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{DummyTicker = true, Disconnected = true});
             var server = pairTracker.Pair.Server;
@@ -79,7 +74,7 @@ await server.WaitPost(() =>
             return serverErrors;
         }
 
-        public async Task<Dictionary<string, HashSet<ErrorNode>>> RunValidation()
+        public static async Task<Dictionary<string, HashSet<ErrorNode>>> RunValidation()
         {
             var allErrors = new Dictionary<string, HashSet<ErrorNode>>();
 

diff --git a/Pow3r/Pow3r.csproj b/Pow3r/Pow3r.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>$(TargetFramework)</TargetFramework>
@@ -18,4 +17,5 @@
       <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
     </ItemGroup>
 
+  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>