Merge branch 'dev'

Mutagen-Modding · Nov 21, 2024 · 37be700 · 37be700
2 parents f01cca1 + 37cd3a7
commit 37be700
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 47 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -27,7 +27,7 @@ jobs:
       run: dotnet publish "Synthesis.Bethesda.GUI/Synthesis.Bethesda.GUI.csproj" --configuration Release -p:PublishSingleFile=true -p:EnableCompressionInSingleFile=true
     - name: Archive Release
       run: |
-        powershell Compress-Archive Synthesis.Bethesda.GUI/bin/Release/net9.0/win-x64/publish/* Synthesis.zip
+        powershell Compress-Archive Synthesis.Bethesda.GUI/bin/Release/net8.0/win-x64/publish/* Synthesis.zip
     - name: Publish Synthesis GUI to Github
       uses: svenstaro/upload-release-action@v2
       with:

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,7 @@
     <ImplicitUsings>true</ImplicitUsings>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Platforms>x64</Platforms>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>
   </PropertyGroup>

diff --git a/Synthesis.Bethesda.Execution/Patchers/Git/Services/ModifyProject/SwapToProperNetVersion.cs b/Synthesis.Bethesda.Execution/Patchers/Git/Services/ModifyProject/SwapToProperNetVersion.cs
@@ -14,7 +14,7 @@ public class SwapToProperNetVersion : ISwapToProperNetVersion
 {
     private readonly ILogger _logger;
     private readonly Version Net8Version = new Version(0, 45);
-    private readonly Version Net9Version = new Version(0, 49);
+    // private readonly Version Net9Version = new Version(0, 49);
     private readonly CultureInfo Culture = new CultureInfo("en");
 
     private readonly SortedList<Version, byte> _netMapping;
@@ -25,7 +25,7 @@ public SwapToProperNetVersion(ILogger logger)
         _netMapping = new SortedList<Version, byte>()
         {
             { Net8Version, 8 },
-            { Net9Version, 9 }
+            // { Net9Version, 9 }
         };
     }
 

diff --git a/Synthesis.Bethesda.GUI/Synthesis.Bethesda.GUI.csproj b/Synthesis.Bethesda.GUI/Synthesis.Bethesda.GUI.csproj
@@ -79,46 +79,4 @@
     <SplashScreen Include="Resources\Splashscreen.png" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Page Update="Views\Config\Solution\SolutionSourceConfigView.xaml">
-      <DefaultPackFolder>content</DefaultPackFolder>
-      <BuildAction>Page</BuildAction>
-    </Page>
-    <Page Update="Views\Config\Solution\SolutionStoreConfigView.xaml">
-      <DefaultPackFolder>content</DefaultPackFolder>
-      <BuildAction>Page</BuildAction>
-    </Page>
-    <Page Update="Views\Config\Solution\SolutionUserSettingsConfigView.xaml">
-      <DefaultPackFolder>content</DefaultPackFolder>
-      <BuildAction>Page</BuildAction>
-    </Page>
-    <Page Update="Views\Config\Solution\SolutionTargetGamesConfigView.xaml">
-      <DefaultPackFolder>content</DefaultPackFolder>
-      <BuildAction>Page</BuildAction>
-    </Page>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Views\Config\Solution\SolutionSourceConfigView.xaml.cs">
-      <CodeLanguage>cs</CodeLanguage>
-      <DefaultPackFolder>content</DefaultPackFolder>
-      <BuildAction>Compile</BuildAction>
-    </Compile>
-    <Compile Update="Views\Config\Solution\SolutionStoreConfigView.xaml.cs">
-      <CodeLanguage>cs</CodeLanguage>
-      <DefaultPackFolder>content</DefaultPackFolder>
-      <BuildAction>Compile</BuildAction>
-    </Compile>
-    <Compile Update="Views\Config\Solution\SolutionUserSettingsConfigView.xaml.cs">
-      <CodeLanguage>cs</CodeLanguage>
-      <DefaultPackFolder>content</DefaultPackFolder>
-      <BuildAction>Compile</BuildAction>
-    </Compile>
-    <Compile Update="Views\Config\Solution\SolutionTargetGamesConfigView.xaml.cs">
-      <CodeLanguage>cs</CodeLanguage>
-      <DefaultPackFolder>content</DefaultPackFolder>
-      <BuildAction>Compile</BuildAction>
-    </Compile>
-  </ItemGroup>
-
 </Project>
diff --git a/...Tests/Execution/Patchers/Git/ModifyProject/ModifyRunnerProjectsTests.Typical.verified.txt b/...Tests/Execution/Patchers/Git/ModifyProject/ModifyRunnerProjectsTests.Typical.verified.txt
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Mutagen.Bethesda" Version="0.49" />