Merge branch 'main' into dev

Mutagen-Modding · Dec 22, 2024 · e3dec14 · e3dec14
2 parents 4ddc5b1 + 7cdd412
commit e3dec14
Show file tree

Hide file tree

Showing 20 changed files with 72 additions and 41 deletions.
diff --git a/.github/workflows/ci-publish.yml b/.github/workflows/ci-publish.yml
@@ -66,6 +66,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Install GitVersion
+      uses: gittools/actions/gitversion/[email protected]
+      with:
+        versionSpec: '6.0.5'
+    - name: Determine Version
+      id: version_step # step id used as reference for output values
+      uses: gittools/actions/gitversion/[email protected]
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
@@ -97,6 +106,13 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 9.0.*
+    - name: Install GitVersion
+      uses: gittools/actions/gitversion/[email protected]
+      with:
+        versionSpec: '6.0.5'
+    - name: Determine Version
+      id: version_step # step id used as reference for output values
+      uses: gittools/actions/gitversion/[email protected]
     - name: Install dependencies
       run: |
         dotnet clean Spriggit.sln -c Release && dotnet nuget locals all --clear
@@ -123,15 +139,15 @@ jobs:
     - name: Archive GUI
       if: ${{ success() && !github.event.release.prerelease && github.event_name == 'release' }}
       run: |
-        powershell Compress-Archive Spriggit.UI/bin/Release/net8.0-windows/win-x64/publish/* Spriggit.zip
+        powershell Compress-Archive Spriggit.UI/bin/Release/net9.0/win-x64/publish/* Spriggit.zip
     - name: Archive Linux CLI
       if: ${{ success() && !github.event.release.prerelease && github.event_name == 'release' }}
       run: |
-        powershell Compress-Archive Spriggit.CLI/bin/Release/net8.0/linux-x64/publish/* SpriggitLinuxCLI.zip
+        powershell Compress-Archive Spriggit.CLI/bin/Release/net9.0/linux-x64/publish/* SpriggitLinuxCLI.zip
     - name: Archive CLI
       if: ${{ success() && !github.event.release.prerelease && github.event_name == 'release' }}
       run: |
-        powershell Compress-Archive Spriggit.CLI/bin/Release/net8.0/win-x64/publish/* SpriggitCLI.zip
+        powershell Compress-Archive Spriggit.CLI/bin/Release/net9.0/win-x64/publish/* SpriggitCLI.zip
     - name: Publish GUI to Github
       if: ${{ success() && !github.event.release.prerelease && github.event_name == 'release' }}
       uses: svenstaro/upload-release-action@v2
@@ -154,7 +170,7 @@ jobs:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         tag: ${{ github.event.release.tag_name }}
     - name: Publish to Nuget.org
-      run: dotnet nuget push **/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --no-symbols
+      run: dotnet nuget push **/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
 
   update-nightly:
     needs: [build-test-push, activity-short-circuit]

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,15 +3,23 @@
     <PropertyGroup>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
         <GitVersion>false</GitVersion>
-        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>nullable</WarningsAsErrors>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <ImplicitUsings>true</ImplicitUsings>
         <LangVersion>preview</LangVersion>
-        <PackageOutputPath>./nupkg</PackageOutputPath>
+        <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
+        <PackageProjectUrl>https://github.com/Mutagen-Modding/Spriggit</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/Mutagen-Modding/Spriggit</RepositoryUrl>
+        <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
+        <Copyright>2024</Copyright>
+        <Company>Mutagen</Company>
+        <Product>Mutagen</Product>
+        <PackageReleaseNotes>Bethesda Modding</PackageReleaseNotes>
+        <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+        <Authors>Noggog</Authors>
     </PropertyGroup>
-    
+
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
         <PackageReference Include="GitVersion.MsBuild">

diff --git a/Spriggit.CLI.Lib/Spriggit.CLI.Lib.csproj b/Spriggit.CLI.Lib/Spriggit.CLI.Lib.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+    </PropertyGroup>
+
     <ItemGroup>
         <PackageReference Include="Noggog.CSharpExt" />
         <PackageReference Include="CommandLineParser" />

diff --git a/Spriggit.CLI/Spriggit.CLI.csproj b/Spriggit.CLI/Spriggit.CLI.csproj
@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
+        <TargetFramework>net9.0</TargetFramework>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Spriggit.Core/Spriggit.Core.csproj b/Spriggit.Core/Spriggit.Core.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+    </PropertyGroup>
+
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" />
         <PackageReference Include="Noggog.CSharpExt" />

diff --git a/Spriggit.Engine/Spriggit.Engine.csproj b/Spriggit.Engine/Spriggit.Engine.csproj
@@ -1,16 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <ProjectReference Include="..\Spriggit.Core\Spriggit.Core.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="McMaster.NETCore.Plugins" />
-      <PackageReference Include="Mutagen.Bethesda" />
-    <PackageReference Include="Noggog.GitRepository" />
-    <PackageReference Include="Noggog.SourceGenerators" />
-    <PackageReference Include="Noggog.Testing" />
-    <PackageReference Include="NuGet.Build.Tasks" />
-    <PackageReference Include="NuGet.PackageManagement" />
-    <PackageReference Include="NuGet.Protocol" />
-    <PackageReference Include="Serilog" />
-  </ItemGroup>
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+    </PropertyGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Spriggit.Core\Spriggit.Core.csproj"/>
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="McMaster.NETCore.Plugins"/>
+        <PackageReference Include="Mutagen.Bethesda"/>
+        <PackageReference Include="Noggog.GitRepository"/>
+        <PackageReference Include="Noggog.SourceGenerators"/>
+        <PackageReference Include="Noggog.Testing"/>
+        <PackageReference Include="NuGet.Build.Tasks"/>
+        <PackageReference Include="NuGet.PackageManagement"/>
+        <PackageReference Include="NuGet.Protocol"/>
+        <PackageReference Include="Serilog"/>
+    </ItemGroup>
 </Project>
diff --git a/Spriggit.Linux.sln b/Spriggit.Linux.sln
@@ -1,7 +1,5 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spriggit", "Spriggit\Spriggit.csproj", "{DBCEE39B-7930-4609-B7DE-1B7BDEE7F2C4}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{71CA298B-EBEB-449D-BF15-8BEA26AA674C}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -44,10 +42,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DBCEE39B-7930-4609-B7DE-1B7BDEE7F2C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBCEE39B-7930-4609-B7DE-1B7BDEE7F2C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBCEE39B-7930-4609-B7DE-1B7BDEE7F2C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DBCEE39B-7930-4609-B7DE-1B7BDEE7F2C4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{632DE160-804B-4AFB-8470-B3F70A339320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{632DE160-804B-4AFB-8470-B3F70A339320}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{632DE160-804B-4AFB-8470-B3F70A339320}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/Spriggit.Tests.Windows/Spriggit.Tests.Windows.csproj b/Spriggit.Tests.Windows/Spriggit.Tests.Windows.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
         <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
     </PropertyGroup>
 

diff --git a/Spriggit.Tests/Spriggit.Tests.csproj b/Spriggit.Tests/Spriggit.Tests.csproj
@@ -1,5 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+    </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk"/>
         <PackageReference Include="Mutagen.Bethesda.Starfield"/>

diff --git a/Spriggit.UI/Spriggit.UI.csproj b/Spriggit.UI/Spriggit.UI.csproj
@@ -2,10 +2,12 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
+        <TargetFramework>net9.0</TargetFramework>
         <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
         <Nullable>enable</Nullable>
         <UseWPF>true</UseWPF>
 		<AssemblyName>Spriggit</AssemblyName>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Spriggit.sln b/Spriggit.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34024.191
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spriggit", "Spriggit\Spriggit.csproj", "{DBCEE39B-7930-4609-B7DE-1B7BDEE7F2C4}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{71CA298B-EBEB-449D-BF15-8BEA26AA674C}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -55,10 +53,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DBCEE39B-7930-4609-B7DE-1B7BDEE7F2C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBCEE39B-7930-4609-B7DE-1B7BDEE7F2C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBCEE39B-7930-4609-B7DE-1B7BDEE7F2C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DBCEE39B-7930-4609-B7DE-1B7BDEE7F2C4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{632DE160-804B-4AFB-8470-B3F70A339320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{632DE160-804B-4AFB-8470-B3F70A339320}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{632DE160-804B-4AFB-8470-B3F70A339320}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/Spriggit/Spriggit.csproj b/Spriggit/Spriggit.csproj
diff --git a/Translation Packages/Spriggit.Json.Fallout4/Spriggit.Json.Fallout4.csproj b/Translation Packages/Spriggit.Json.Fallout4/Spriggit.Json.Fallout4.csproj
@@ -3,6 +3,7 @@
 	<PropertyGroup>
         <OutputType>exe</OutputType>
         <PackAsTool>true</PackAsTool>
+        <TargetFramework>net9.0</TargetFramework>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<IsPackable>true</IsPackable>
         <DebugType>portable</DebugType>

diff --git a/Translation Packages/Spriggit.Json.Oblivion/Spriggit.Json.Oblivion.csproj b/Translation Packages/Spriggit.Json.Oblivion/Spriggit.Json.Oblivion.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <OutputType>exe</OutputType>
         <PackAsTool>true</PackAsTool>
+        <TargetFramework>net9.0</TargetFramework>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <IsPackable>true</IsPackable>
         <DebugType>portable</DebugType>

diff --git a/Translation Packages/Spriggit.Json.Skyrim/Spriggit.Json.Skyrim.csproj b/Translation Packages/Spriggit.Json.Skyrim/Spriggit.Json.Skyrim.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <OutputType>exe</OutputType>
         <PackAsTool>true</PackAsTool>
+        <TargetFramework>net9.0</TargetFramework>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <IsPackable>true</IsPackable>
         <DebugType>portable</DebugType>

diff --git a/Translation Packages/Spriggit.Json.Starfield/Spriggit.Json.Starfield.csproj b/Translation Packages/Spriggit.Json.Starfield/Spriggit.Json.Starfield.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <OutputType>exe</OutputType>
         <PackAsTool>true</PackAsTool>
+        <TargetFramework>net9.0</TargetFramework>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <IsPackable>true</IsPackable>
         <DebugType>portable</DebugType>

diff --git a/Translation Packages/Spriggit.Yaml.Fallout4/Spriggit.Yaml.Fallout4.csproj b/Translation Packages/Spriggit.Yaml.Fallout4/Spriggit.Yaml.Fallout4.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <OutputType>exe</OutputType>
         <PackAsTool>true</PackAsTool>
+        <TargetFramework>net9.0</TargetFramework>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <IsPackable>true</IsPackable>
         <DebugType>portable</DebugType>

diff --git a/Translation Packages/Spriggit.Yaml.Oblivion/Spriggit.Yaml.Oblivion.csproj b/Translation Packages/Spriggit.Yaml.Oblivion/Spriggit.Yaml.Oblivion.csproj
@@ -3,6 +3,7 @@
 	<PropertyGroup>
         <OutputType>exe</OutputType>
         <PackAsTool>true</PackAsTool>
+        <TargetFramework>net9.0</TargetFramework>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<IsPackable>true</IsPackable>
         <DebugType>portable</DebugType>

diff --git a/Translation Packages/Spriggit.Yaml.Skyrim/Spriggit.Yaml.Skyrim.csproj b/Translation Packages/Spriggit.Yaml.Skyrim/Spriggit.Yaml.Skyrim.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <OutputType>exe</OutputType>
         <PackAsTool>true</PackAsTool>
+        <TargetFramework>net9.0</TargetFramework>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <IsPackable>true</IsPackable>
         <DebugType>portable</DebugType>

diff --git a/Translation Packages/Spriggit.Yaml.Starfield/Spriggit.Yaml.Starfield.csproj b/Translation Packages/Spriggit.Yaml.Starfield/Spriggit.Yaml.Starfield.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <OutputType>exe</OutputType>
         <PackAsTool>true</PackAsTool>
+        <TargetFramework>net9.0</TargetFramework>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <IsPackable>true</IsPackable>
         <DebugType>portable</DebugType>