Skip to content

Commit ab9a279

Browse files
committed
Merge branch 'release/2026.1.0' into develop
2 parents 1951dcb + eb307a2 commit ab9a279

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
os: [ubuntu-latest, windows-latest, macos-latest]
23-
dotnet-version: ['8.0.x', '9.0.x']
23+
dotnet-version: ['8.0.x', '10.0.x']
2424

2525
steps:
2626
- name: Checkout code
@@ -43,7 +43,7 @@ jobs:
4343
run: dotnet test --configuration Release --no-build --verbosity normal --collect:"XPlat Code Coverage" --results-directory ./coverage
4444

4545
- name: Upload coverage to Codecov
46-
if: matrix.os == 'ubuntu-latest' && matrix.dotnet-version == '9.0.x'
46+
if: matrix.os == 'ubuntu-latest' && matrix.dotnet-version == '10.0.x'
4747
uses: codecov/codecov-action@v4
4848
with:
4949
files: ./coverage/**/coverage.cobertura.xml
@@ -65,7 +65,7 @@ jobs:
6565
- name: Setup .NET SDK
6666
uses: actions/setup-dotnet@v4
6767
with:
68-
dotnet-version: '9.0.x'
68+
dotnet-version: '10.0.x'
6969

7070
- name: Extract version from tag
7171
id: version
@@ -88,7 +88,7 @@ jobs:
8888
run: dotnet build --configuration Release --no-restore -p:Version=${{ steps.version.outputs.VERSION }}
8989

9090
- name: Pack with version
91-
run: dotnet pack src/lowlandtech.tinytools/LowlandTech.TinyTools.csproj --configuration Release --no-build --output ./artifacts -p:PackageVersion=${{ steps.version.outputs.VERSION }}
91+
run: dotnet pack src/lib/LowlandTech.TinyTools.csproj --configuration Release --no-build --output ./artifacts -p:PackageVersion=${{ steps.version.outputs.VERSION }}
9292

9393
- name: Upload artifacts
9494
uses: actions/upload-artifact@v4

.github/workflows/tags.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
with:
3232
dotnet-version: |
3333
8.0.x
34-
9.0.x
34+
10.0.x
3535
3636
- name: Install ImageMagick
3737
run: |
@@ -65,7 +65,7 @@ jobs:
6565
run: dotnet test --configuration Release --no-build --verbosity normal
6666

6767
- name: Pack NuGet package
68-
run: dotnet pack src/lowlandtech.tinytools/LowlandTech.TinyTools.csproj --configuration Release --no-build --output ./artifacts /p:PackageVersion=${{ steps.get_version.outputs.VERSION }}
68+
run: dotnet pack src/lib/LowlandTech.TinyTools.csproj --configuration Release --no-build --output ./artifacts /p:PackageVersion=${{ steps.get_version.outputs.VERSION }}
6969

7070
- name: Create GitHub Release
7171
uses: softprops/action-gh-release@v2

0 commit comments

Comments
 (0)