Skip to content

Commit

Permalink
Merge pull request #10 from bigbang1112-cz/dev
Browse files Browse the repository at this point in the history
Update GbxToolAPI and to .NET 8
  • Loading branch information
BigBang1112 committed Aug 15, 2024
2 parents 289e9e8 + 9f23663 commit 8a07e1e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/publish-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -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"
Expand Down Expand Up @@ -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

Expand All @@ -112,9 +112,10 @@ jobs:
- uses: actions/checkout@v3

- 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: |
Expand Down
6 changes: 3 additions & 3 deletions ClipCheckpoint/ClipCheckpoint.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AssemblyTitle>Clip Checkpoint</AssemblyTitle>
<Authors>Petr 'BigBang1112' Pivoňka</Authors>
<Copyright>Copyright © Petr 'BigBang1112' Pivoňka</Copyright>
<Version>1.3.2</Version>
<Version>1.3.3</Version>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -14,15 +14,15 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsTrimmable>true</IsTrimmable>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GbxToolAPI" Version="1.0.8" />
<PackageReference Include="GbxToolAPI" Version="1.0.9" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ClipCheckpointCLI/ClipCheckpointCLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down

0 comments on commit 8a07e1e

Please sign in to comment.