Skip to content

Commit

Permalink
Merge pull request #5 from Cysharp/guitarrapc-patch-1
Browse files Browse the repository at this point in the history
Drop .NET 5 support, and add .NET 6 support instead.
  • Loading branch information
mayuki authored Dec 15, 2023
2 parents a6fe537 + 06a7476 commit d069b7d
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 16 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,14 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
with:
dotnet-version: "5.0.x"

# Build
- run: dotnet restore
- run: dotnet build -c Release

# Run Unit tests
- run: dotnet test -c Release --no-build --logger trx --results-directory $GITHUB_WORKSPACE/artifacts

# Packaging
- name: dotnet pack
run: dotnet pack -c Release --no-build --version-suffix "$(versionSuffix)" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg --output $GITHUB_WORKSPACE/artifacts

# Upload & Publish
- uses: actions/upload-artifact@master
with:
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,24 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
with:
dotnet-version: "5.0.x"

- name: "Set VersionSuffix for Preview"
if: "contains(github.ref, 'refs/tags') && contains(github.ref, 'preview')"
run: |
echo "VERSION_SUFFIX=preview.`date '+%Y%m%d-%H%M%S'`+${GITHUB_SHA:0:6}" >> $GITHUB_ENV
- name: "Get git tag"
if: "contains(github.ref, 'refs/tags')"
run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV

# Build
- run: dotnet restore
- run: dotnet build -c Release

# Packaging
- name: dotnet pack
run: dotnet pack -c Release --no-build --version-suffix "$(versionSuffix)" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg --output $GITHUB_WORKSPACE/artifacts

# Upload & Publish
- uses: actions/upload-artifact@master
with:
name: Packages
path: artifacts

- name: "Push to NuGet.org"
run: |
dotnet nuget push "$GITHUB_WORKSPACE/artifacts/*.nupkg" --skip-duplicate -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json
2 changes: 1 addition & 1 deletion samples/GettingStarted.Basic/GettingStarted.Basic.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Kokuban/Kokuban.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion tests/Kokuban.Tests/Kokuban.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Nullable>disable</Nullable>
<IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly>
Expand Down

0 comments on commit d069b7d

Please sign in to comment.