Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pin workload version for .NET6 by using global.json #303

Merged
merged 9 commits into from
Nov 27, 2023
Merged

Pin workload version for .NET6 by using global.json #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f00996e
Pin workload version to older version for .NET6
frederikprijck Nov 27, 2023
884d905
Add global.json file
frederikprijck Nov 27, 2023
8efc2a3
Revert changes
frederikprijck Nov 27, 2023
4fbf967
Revert changes
frederikprijck Nov 27, 2023
64155d3
Remove dotnet version from actions/setup-dotnet
frederikprijck Nov 27, 2023
72ea571
Install Java
frederikprijck Nov 27, 2023
0bee4d4
Use Java 11 for Xamarin instead of 17
frederikprijck Nov 27, 2023
afbaf88
Also install Java on publish
frederikprijck Nov 27, 2023
1cc9bf2
Merge branch 'master' into chore/pin-workload
frederikprijck Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install Java
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.x

- name: Install .NET Android and iOS workload
run: dotnet workload install android ios
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,14 @@ jobs:
fetch-depth: 0
ref: ${{ github.event.inputs.branch }}

- name: Install Java
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.x

- name: Install .NET Android and iOS workload
run: dotnet workload install android ios
Expand Down
6 changes: 6 additions & 0 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "6.0.417",
"rollForward": "latestFeature"
}
}
Loading