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.

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

[PM-13356] Fix iOS build by pinning dotnet and MAUI version #3410

Merged
merged 22 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d72d1b0
Pinning MauiVersion hardcoded to 8.0.7 to avoid using the MauiVersion…
fedemkr Oct 8, 2024
e175d47
Pinned dotnet version to 8.0.303 which was the latest one of the late…
fedemkr Oct 8, 2024
2ad9881
Added global json to pin .NET version to use and added diagnostic log…
fedemkr Oct 8, 2024
bca269e
Set TargetPlatformVersion in Directory Build props
vvolkgang Oct 9, 2024
b457cf9
test moving global.json
vvolkgang Oct 9, 2024
0683533
Check out the repo first so global.json is available
vvolkgang Oct 9, 2024
d8cb741
Remove workloadVersion from global.json
vvolkgang Oct 9, 2024
7a81606
pin maui install version
vvolkgang Oct 9, 2024
03838a9
Try workload restore
vvolkgang Oct 9, 2024
9746f8d
Adding workload restore
vvolkgang Oct 9, 2024
383b2e9
Use ios workload instead
vvolkgang Oct 9, 2024
c5bdf72
Set specific MAUI workload to install to 8.0.402
fedemkr Oct 9, 2024
a55d542
Fix MAUI workload install to 8.0.300
fedemkr Oct 9, 2024
e32d8ce
Add step to remove dotnet
vvolkgang Oct 9, 2024
ae122fa
Update sdk / maui to 8.0.402
vvolkgang Oct 9, 2024
961a95d
Bumped xcode to 15.4
vvolkgang Oct 9, 2024
2c6b022
Revert build.yml comments
vvolkgang Oct 9, 2024
6b0382f
Revert csproj and build.props
vvolkgang Oct 9, 2024
b1f9884
Remove diag flag
vvolkgang Oct 9, 2024
6e7f561
Android / F-droid: Install pinned version of maui workload instead of…
vvolkgang Oct 9, 2024
d0a3336
Android / F-Droid: checkout repo earlier in the build process so glob…
vvolkgang Oct 9, 2024
b2ffb47
Update .github/workflows/build.yml
Eeebru Oct 10, 2024
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
50 changes: 30 additions & 20 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ env:
main_app_folder_path: src/App
main_app_project_path: src/App/App.csproj
target-net-version: net8.0
dotnet-version: '8.0.402'
maui-workload-version: '8.0.402'

jobs:
cloc:
Expand Down Expand Up @@ -72,6 +74,11 @@ jobs:
android_folder_path: src\App\Platforms\Android
android_folder_path_bash: src/App/Platforms/Android
steps:
- name: Checkout repo
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0

- name: Setup NuGet
uses: nuget/setup-nuget@a21f25cd3998bf370fde17e3f1b4c12c175172f9 # v2.0.0
with:
Expand All @@ -80,7 +87,11 @@ jobs:
- name: Set up .NET
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
with:
dotnet-version: '8.0.x'
dotnet-version: ${{ env.dotnet-version }}

- name: Install MAUI Workload
run: |
dotnet workload install maui --version ${{ env.maui-workload-version }}

- name: Set up MSBuild
uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
Expand All @@ -103,11 +114,6 @@ jobs:
echo "GitHub ref: $GITHUB_REF"
echo "GitHub event: $GITHUB_EVENT"

- name: Checkout repo
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0

- name: Login to Azure - CI Subscription
uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
with:
Expand Down Expand Up @@ -294,6 +300,11 @@ jobs:
android_folder_path_bash: src/App/Platforms/Android
android_manifest_path: src/App/Platforms/Android/AndroidManifest.xml
steps:
- name: Checkout repo
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0

- name: Setup NuGet
uses: nuget/setup-nuget@a21f25cd3998bf370fde17e3f1b4c12c175172f9 # v2.0.0
with:
Expand All @@ -302,7 +313,11 @@ jobs:
- name: Set up .NET
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
with:
dotnet-version: '8.0.x'
dotnet-version: ${{ env.dotnet-version }}

- name: Install MAUI Workload
run: |
dotnet workload install maui --version ${{ env.maui-workload-version }}

- name: Set up MSBuild
uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
Expand All @@ -324,9 +339,6 @@ jobs:
echo "GitHub ref: $GITHUB_REF"
echo "GitHub event: $GITHUB_EVENT"

- name: Checkout repo
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- name: Login to Azure - CI Subscription
uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
with:
Expand Down Expand Up @@ -432,10 +444,15 @@ jobs:
app_output_name: App
app_ci_output_filename: App_x64_Debug
steps:
- name: Checkout repo
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
submodules: 'true'

- name: Set XCode version
uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
with:
xcode-version: 15.1
xcode-version: 15.4

- name: Setup NuGet
uses: nuget/setup-nuget@a21f25cd3998bf370fde17e3f1b4c12c175172f9 # v2.0.0
Expand All @@ -445,12 +462,10 @@ jobs:
- name: Set up .NET
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
with:
dotnet-version: '8.0.x'
dotnet-version: ${{ env.dotnet-version }}

# This step might be obsolete at some point as .NET MAUI workloads
# are starting to come pre-installed on the GH Actions build agents.
- name: Install MAUI Workload
run: dotnet workload install maui --ignore-failed-sources
run: dotnet workload install maui --version ${{ env.maui-workload-version }}

- name: Print environment
run: |
Expand All @@ -459,11 +474,6 @@ jobs:
echo "GitHub ref: $GITHUB_REF"
echo "GitHub event: $GITHUB_EVENT"

- name: Checkout repo
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
submodules: 'true'

- name: Login to Azure - CI Subscription
uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
with:
Expand Down
1 change: 0 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<IncludeBitwardeniOSExtensions>True</IncludeBitwardeniOSExtensions>
<IncludeBitwardenWatchOSApp>True</IncludeBitwardenWatchOSApp>
<Argon2IdLoadMtouchExtraArgs>-gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"</Argon2IdLoadMtouchExtraArgs>

<!-- Uncomment this when Unit Testing-->
<!-- <CustomConstants>UT</CustomConstants> -->

Expand Down
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "8.0.402",
"rollForward": "disable"
}
}