Remove additional nunit args for now. Update Microsoft.CodeAnalysis.C…

…Sharp. (#804)
nwn-dotnet · Feb 1, 2025 · 2c00af0 · 2c00af0
1 parent aed9559
commit 2c00af0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/NWN.Anvil.TestRunner/NWN.Anvil.TestRunner.csproj b/NWN.Anvil.TestRunner/NWN.Anvil.TestRunner.csproj
@@ -55,12 +55,6 @@
     <DefineConstants>TRACE;TASK_PARALLEL_LIBRARY_API</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\NWN.Anvil\NWN.Anvil.csproj">
       <Private>false</Private>

diff --git a/NWN.Anvil.TestRunner/src/main/TestRunnerService.cs b/NWN.Anvil.TestRunner/src/main/TestRunnerService.cs
@@ -26,8 +26,6 @@ internal sealed class TestRunnerService
     private readonly Queue<Assembly> testAssemblyQueue = new Queue<Assembly>();
     private readonly string outputDir;
 
-    private readonly string additionalArgs = Environment.GetEnvironmentVariable("ANVIL_NUNIT_ARGS");
-
     private Thread testWorkerThread;
 
     public TestRunnerService(MainThreadSynchronizationContext mainThreadSynchronizationContext, PluginStorageService pluginStorageService)
@@ -81,9 +79,7 @@ private async Task Shutdown()
     private string[] GetRunnerArguments(Assembly assembly)
     {
       string outputPath = Path.Combine(outputDir, assembly.GetName().Name!);
-
-      string args = $"--mainthread --work={outputPath} {additionalArgs}";
-      return string.IsNullOrEmpty(args) ? [] : CommandLineParser.SplitCommandLineIntoArguments(args, false).ToArray();
+      return ["--mainthread", $"--work={outputPath}"];
     }
   }
 }
diff --git a/NWN.Anvil.Tests/NWN.Anvil.Tests.csproj b/NWN.Anvil.Tests/NWN.Anvil.Tests.csproj
@@ -42,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
     <PackageReference Include="NWN.Core" Version="8193.37.0" PrivateAssets="compile" />
     <PackageReference Include="NWN.Native" Version="8193.37.1" PrivateAssets="compile" />
   </ItemGroup>