Merge pull request #6 from bigbang1112-cz/dev

Update GBX.NET, .NET 8, and actions
bigbang1112-cz · Aug 15, 2024 · 5dbcaa4 · 5dbcaa4
2 parents 1e704d2 + 219bf9d
commit 5dbcaa4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -17,13 +17,13 @@ jobs:
     name: Build on ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Add GitHub NuGet source
       run: dotnet nuget add source --username USERNAME --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/bigbang1112-cz/index.json"
     - name: Restore dependencies

diff --git a/.github/workflows/publish-cli.yml b/.github/workflows/publish-cli.yml
@@ -21,7 +21,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -43,14 +43,14 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Add GitHub NuGet source
         run: dotnet nuget add source --username USERNAME --password ${{ env.GH_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/bigbang1112-cz/index.json"
@@ -93,9 +93,9 @@ jobs:
         run: gh release upload ${{ github.ref_name }} ${{ env.PROJECT_NAME }}${{ env.ZIP_SUFFIX }}
 
       - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.ARTIFACT_NAME }}
+          name: ${{ env.ARTIFACT_NAME }}-${{ matrix.os.runtime }}
           path: ${{ env.PROJECT_NAME }}${{ env.ZIP_SUFFIX }}.hash.txt
           if-no-files-found: error
 
@@ -109,12 +109,13 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Download a Build Artifact
-        uses: actions/download-artifact@v2.1.1
+        uses: actions/download-artifact@v4
         with:
-          name: ${{ env.ARTIFACT_NAME }}
+          pattern: ${{ env.ARTIFACT_NAME }}-*
+          merge-multiple: true
 
       - name: Read hash files
         run: |

diff --git a/GhostToClip/GhostToClip.csproj b/GhostToClip/GhostToClip.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<Version>1.0.4</Version>
+		<Version>1.0.5</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="GbxToolAPI" Version="1.0.7" />
+	  <PackageReference Include="GbxToolAPI" Version="1.0.9" />
 	</ItemGroup>
 
 </Project>
diff --git a/GhostToClip/GhostToClipTool.cs b/GhostToClip/GhostToClipTool.cs
@@ -15,7 +15,7 @@ public class GhostToClipTool : ITool, IHasOutput<NodeFile<CGameCtnMediaClip>>, I
 
     public GhostToClipTool(CGameCtnGhost ghost)
     {
-        ghosts = new[] { ghost };
+        ghosts = [ghost];
     }
 
     public GhostToClipTool(IEnumerable<CGameCtnGhost> ghosts)

diff --git a/GhostToClipCLI/GhostToClipCLI.csproj b/GhostToClipCLI/GhostToClipCLI.csproj
@@ -2,10 +2,10 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<Version>1.0.4</Version>
+		<Version>1.0.5</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -16,7 +16,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="GbxToolAPI.CLI" Version="1.0.11" />
+	  <PackageReference Include="GbxToolAPI.CLI" Version="1.0.12" />
 	</ItemGroup>
 
 	<ItemGroup>