Skip to content

Commit e864020

Browse files
authored
Merge pull request #371 from andy840119/upgrade-package-to-latest
Upgrade osu-framework and related packages to latest.
2 parents 23fc4fc + 49ecd1e commit e864020

File tree

8 files changed

+20
-17
lines changed

8 files changed

+20
-17
lines changed

.config/dotnet-tools.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "4.0.0",
6+
"version": "0.35.0",
77
"commands": [
88
"dotnet-cake"
99
]
1010
},
1111
"jetbrains.resharper.globaltools": {
12-
"version": "2024.1.2",
12+
"version": "2023.3.3",
1313
"commands": [
1414
"jb"
1515
]
1616
},
1717
"nvika": {
18-
"version": "3.0.1",
18+
"version": "4.0.0",
1919
"commands": [
2020
"nvika"
2121
]

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ jobs:
7575
dotnet-version: "8.0.x"
7676

7777
- name: Setup Go
78-
uses: actions/setup-go@v3
78+
uses: actions/setup-go@v5
79+
with:
80+
go-version: 1.21.9
7981

8082
- name: Install httpbin
8183
run: go install github.com/mccutchen/go-httpbin/v2/cmd/go-httpbin@latest
@@ -94,7 +96,7 @@ jobs:
9496
# Attempt to upload results even if test fails.
9597
# https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#always
9698
- name: Upload Test Results
97-
uses: actions/upload-artifact@v3
99+
uses: actions/upload-artifact@v4
98100
if: ${{ always() }}
99101
with:
100102
name: osu-framework-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.os.configuration}}
@@ -131,17 +133,15 @@ jobs:
131133
timeout-minutes: 60
132134
steps:
133135
- name: Checkout
134-
uses: actions/checkout@v3
136+
uses: actions/checkout@v4
135137

136138
- name: Install .NET 8.0.x
137-
uses: actions/setup-dotnet@v3
139+
uses: actions/setup-dotnet@v4
138140
with:
139141
dotnet-version: "8.0.x"
140142

141143
- name: Restore .NET workloads
142-
# `dotnet workload restore` is bugged in .NET 7.0.101+ when restoring iOS projects,
143-
# see https://github.com/xamarin/xamarin-macios/issues/16400.
144-
run: dotnet workload install ios
144+
run: dotnet workload install ios --from-rollback-file workloads.json
145145

146146
- name: Compile
147147
run: dotnet build -c Debug osu-framework-microphone.iOS.slnf

.github/workflows/deploy-pack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
run: dotnet pack -c Release osu.Framework.Microphone /p:Version=${{needs.check-if-tag.outputs.version}} /p:GenerateDocumentationFile=true -o ${{steps.artifactsPath.outputs.nuget_artifacts}}
6464

6565
- name: Upload Artifacts
66-
uses: actions/upload-artifact@v2
66+
uses: actions/upload-artifact@v4
6767
with:
6868
name: osu-framework
6969
path: ${{steps.artifactsPath.outputs.nuget_artifacts}}\*.nupkg

osu.Framework.Microphone.Android/osu.Framework.Microphone.Android.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
<ProjectReference Include="..\osu.Framework.Microphone\osu.Framework.Microphone.csproj" />
1919
</ItemGroup>
2020
<ItemGroup>
21-
<PackageReference Include="ppy.osu.Framework.Android" Version="2024.1112.0" />
21+
<PackageReference Include="ppy.osu.Framework.Android" Version="2025.604.1" />
2222
</ItemGroup>
2323
</Project>

osu.Framework.Microphone.Tests/osu.Framework.Microphone.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<ProjectReference Include="..\osu.Framework.Microphone\osu.Framework.Microphone.csproj" />
1313
</ItemGroup>
1414
<ItemGroup Label="Package References">
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
16-
<PackageReference Include="NUnit" Version="4.2.2" />
17-
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
16+
<PackageReference Include="NUnit" Version="4.3.2" />
17+
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
1818
</ItemGroup>
1919
</Project>

osu.Framework.Microphone.iOS/osu.Framework.Microphone.iOS.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
<ProjectReference Include="..\osu.Framework.Microphone\osu.Framework.Microphone.csproj" />
1919
</ItemGroup>
2020
<ItemGroup>
21-
<PackageReference Include="ppy.osu.Framework.iOS" Version="2024.1112.0" />
21+
<PackageReference Include="ppy.osu.Framework.iOS" Version="2025.604.1" />
2222
</ItemGroup>
2323
</Project>

osu.Framework.Microphone/osu.Framework.Microphone.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
</PropertyGroup>
2424
<ItemGroup Label="Package References">
2525
<PackageReference Include="NWaves" Version="0.9.6" />
26-
<PackageReference Include="ppy.osu.Framework" Version="2024.1112.0" />
26+
<PackageReference Include="ppy.osu.Framework" Version="2025.604.1" />
2727
</ItemGroup>
2828
</Project>

workloads.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"microsoft.net.sdk.ios": "17.2.8053/8.0.100"
3+
}

0 commit comments

Comments
 (0)