Fix remaining regressions.

vddCore · May 22, 2024 · 32a07b0 · 32a07b0
1 parent e5a86f8
commit 32a07b0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build-frontend-with-runtime.yml b/.github/workflows/build-frontend-with-runtime.yml
@@ -38,7 +38,7 @@ jobs:
 
     - name: Run language tests
       working-directory: VirtualMachine/Tests/EVIL.Ceres.LanguageTests/bin/${{ matrix.configuration }}/net7.0
-      run: ./Ceres.LanguageTests tests --fail-on-compiler-errors --fail-on-test-errors
+      run: ./LanguageTestRunner tests --fail-on-compiler-errors --fail-on-test-errors
 
     - name: Publish to directory
       run: dotnet publish FrontEnd/EVIL.evil/EVIL.evil.csproj -c $Configuration -r $RuntimeIdentifier --no-self-contained -p:PublishSingleFile=true

diff --git a/.github/workflows/build-nuget-packages.yml b/.github/workflows/build-nuget-packages.yml
@@ -37,7 +37,7 @@ jobs:
 
     - name: Run language tests
       working-directory: VirtualMachine/Tests/EVIL.Ceres.LanguageTests/bin/${{ matrix.configuration }}/net7.0
-      run: ./Ceres.LanguageTests tests --fail-on-compiler-errors --fail-on-test-errors
+      run: ./LanguageTestRunner tests --fail-on-compiler-errors --fail-on-test-errors
 
     - name: Create NuGet packages
       run: dotnet pack -o evil-nuget-latest

diff --git a/EVIL.sln b/EVIL.sln
@@ -100,11 +100,9 @@ Global
 		{3932F10C-210E-402A-99CC-C5F4132E46C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3932F10C-210E-402A-99CC-C5F4132E46C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3932F10C-210E-402A-99CC-C5F4132E46C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3932F10C-210E-402A-99CC-C5F4132E46C9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{021189CD-8631-4452-BC45-57566A76BC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{021189CD-8631-4452-BC45-57566A76BC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{021189CD-8631-4452-BC45-57566A76BC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{021189CD-8631-4452-BC45-57566A76BC3A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/VirtualMachine/EVIL.Ceres.Runtime/EVIL.Ceres.Runtime.csproj b/VirtualMachine/EVIL.Ceres.Runtime/EVIL.Ceres.Runtime.csproj
@@ -2,16 +2,16 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
-    
+
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
     <Version>0.17.2</Version>
-    
+
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EVIL.Ceres\EVIL.Ceres.csproj" />
+    <ProjectReference Include="..\EVIL.Ceres\EVIL.Ceres.csproj"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VirtualMachine/EVIL.Ceres.Runtime/EvilRuntime.cs b/VirtualMachine/EVIL.Ceres.Runtime/EvilRuntime.cs
@@ -30,7 +30,7 @@ public void RegisterBuiltInFunctions()
             var scriptNames = Assembly
                 .GetExecutingAssembly()
                 .GetManifestResourceNames()
-                .Where(x => x.StartsWith("EVIL.EVIL.Ceres.Runtime.ScriptBuiltins"));
+                .Where(x => x.StartsWith("EVIL.Ceres.Runtime.ScriptBuiltins"));
 
             foreach (var scriptName in scriptNames)
             {

diff --git a/VirtualMachine/Tests/EVIL.Ceres.LanguageTests/EVIL.Ceres.LanguageTests.csproj b/VirtualMachine/Tests/EVIL.Ceres.LanguageTests/EVIL.Ceres.LanguageTests.csproj
@@ -5,6 +5,8 @@
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
 
+    <AssemblyName>LanguageTestRunner</AssemblyName>
+
     <IsPackable>false</IsPackable>
   </PropertyGroup>