Skip to content

Commit b82cba0

Browse files
committed
GHA: simplify workload installation
1 parent 35d791b commit b82cba0

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

.github/workflows/dotnet.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ jobs:
2828
java-version: '11'
2929
- name: Install .NET MAUI
3030
shell: pwsh
31-
run: |
32-
& dotnet nuget locals all --clear
33-
& dotnet workload install maui --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json
34-
& dotnet workload install android ios maccatalyst tvos macos maui wasm-tools maui-maccatalyst --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json
31+
run: dotnet workload install maui
3532
- name: Build library (with nuget package)
3633
run: dotnet build ./Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj -c Release -t:restore,build,pack -p:PackageOutputPath=./nuget -p:Version=$(git describe) -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=false
3734
- name: Build sample
@@ -57,10 +54,7 @@ jobs:
5754
with:
5855
xcode-version: '26.2'
5956
- name: Install .NET MAUI
60-
run: |
61-
dotnet nuget locals all --clear
62-
dotnet workload install maui --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json
63-
dotnet workload install android ios maccatalyst tvos macos maui wasm-tools maui-maccatalyst --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json
57+
run: dotnet workload install maui
6458
- name: Install Android tools
6559
run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platforms;android-34" "build-tools;34.0.0" "platform-tools"
6660
- name: Build library (with nuget package)
@@ -79,7 +73,7 @@ jobs:
7973
with:
8074
dotnet-version: 10.0.x
8175
- name: Install workloads
82-
run: dotnet workload install android wasm-tools maui-android
76+
run: dotnet workload install maui-android
8377
- name: Install Android tools
8478
run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools"
8579
- name: Build library (with nuget package)

0 commit comments

Comments
 (0)