Skip to content

Commit d9d4335

Browse files
Update .NET MAUI resources (#153)
* Update non-Telerik packages * [maui] Move project up one folder level * Update project path in workflows * Update main_build-maui.yml Refinements * Significant improvements using real steps * Update main_build-maui.yml * Update main_build-maui_release.yml * Update main_build-maui_release.yml * [maui] Add 8.0.0's theming mechanism * Update main_build-maui_release.yml * Update main_build-maui.yml * Update main_build-maui_release.yml * Update main_build-maui.yml * Force use of Xcode 16.1
1 parent 4d2d166 commit d9d4335

File tree

107 files changed

+11482
-186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+11482
-186
lines changed

.github/workflows/main_build-maui.yml

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,21 @@ on:
1111
- '.github/workflows/main_build-maui.yml'
1212

1313
env:
14-
PROJECT_PATH: "src/MAUI/MauiDemo/MauiDemo.csproj"
14+
PROJECT_PATH: "src/MAUI/MauiDemo.csproj"
1515
NUGETCONFIG_PATH: "src/NuGet.Config"
1616
TELERIK_USERNAME: ${{secrets.MyTelerikAccountUsername}}
1717
TELERIK_PASSWORD: ${{secrets.MyTelerikAccountPassword}}
18+
DOTNET_VERSION: "9.0.x"
19+
WINUI_TFM: "net9.0-windows10.0.22621.0"
20+
ANDROID_TFM: "net9.0-android"
21+
IOS_TFM: "net9.0-ios"
22+
MACCATALYST_TFM: "net9.0-maccatalyst"
1823

1924
jobs:
20-
2125
# ***************************** #
22-
# >>>>>>> Android build <<<<<<< #
26+
# >>>>>>> Windows Build <<<<<<< #
2327
# ***************************** #
24-
maui-android:
28+
maui-windows:
2529
runs-on: windows-latest
2630
steps:
2731
- name: Checkout
@@ -32,27 +36,26 @@ jobs:
3236
- name: Setup .NET Core SDK
3337
uses: actions/setup-dotnet@v4
3438
with:
35-
dotnet-version: '9.0.x'
39+
dotnet-version: ${{env.DOTNET_VERSION}}
3640

37-
- uses: actions/setup-java@v4
38-
with:
39-
distribution: 'microsoft'
40-
java-version: '11'
41+
# For WinUI builds
42+
- name: Add msbuild to PATH
43+
uses: microsoft/setup-msbuild@v2
4144

4245
- name: Install MAUI workloads
4346
run: dotnet workload install maui --source https://api.nuget.org/v3/index.json
4447

4548
- name: Restore NuGet packages
4649
run: dotnet restore ${{env.PROJECT_PATH}} --configfile ${{env.NUGETCONFIG_PATH}}
4750

48-
- name: Build Maui Android project
49-
run: dotnet build ${{env.PROJECT_PATH}} -c Debug -f net9.0-android --no-restore -p:PublishTrimmed=False
51+
- name: Build Maui WinUI project
52+
run: dotnet build ${{env.PROJECT_PATH}} -c Debug -f ${{env.WINUI_TFM}}
5053

5154

5255
# ***************************** #
53-
# >>>>>>> Windows Build <<<<<<< #
56+
# >>>>>>> Android build <<<<<<< #
5457
# ***************************** #
55-
maui-windows:
58+
maui-android:
5659
runs-on: windows-latest
5760
steps:
5861
- name: Checkout
@@ -63,20 +66,21 @@ jobs:
6366
- name: Setup .NET Core SDK
6467
uses: actions/setup-dotnet@v4
6568
with:
66-
dotnet-version: '9.0.x'
69+
dotnet-version: ${{env.DOTNET_VERSION}}
6770

68-
# For WinUI builds
69-
- name: Add msbuild to PATH
70-
uses: microsoft/setup-msbuild@v2
71+
- uses: actions/setup-java@v4
72+
with:
73+
distribution: 'microsoft'
74+
java-version: '11'
7175

7276
- name: Install MAUI workloads
7377
run: dotnet workload install maui --source https://api.nuget.org/v3/index.json
7478

7579
- name: Restore NuGet packages
7680
run: dotnet restore ${{env.PROJECT_PATH}} --configfile ${{env.NUGETCONFIG_PATH}}
7781

78-
- name: Build Maui WinUI project
79-
run: dotnet build ${{env.PROJECT_PATH}} -c Debug -f net9.0-windows10.0.22621.0
82+
- name: Build Maui Android project
83+
run: dotnet build ${{env.PROJECT_PATH}} -c Debug -f ${{env.ANDROID_TFM}} --no-restore -p:PublishTrimmed=False
8084

8185

8286
# ************************* #
@@ -90,14 +94,14 @@ jobs:
9094
with:
9195
fetch-depth: 0
9296

93-
#- uses: maxim-lobanov/setup-xcode@v1
94-
# with:
95-
# xcode-version: latest
97+
- uses: maxim-lobanov/setup-xcode@v1
98+
with:
99+
xcode-version: 16.1
96100

97101
- name: Setup .NET Core SDK
98102
uses: actions/setup-dotnet@v4
99103
with:
100-
dotnet-version: '9.0.x'
104+
dotnet-version: ${{env.DOTNET_VERSION}}
101105

102106
- name: Install MAUI workloads
103107
run: dotnet workload install maui --source https://api.nuget.org/v3/index.json
@@ -106,7 +110,7 @@ jobs:
106110
run: dotnet restore ${{env.PROJECT_PATH}} --configfile ${{env.NUGETCONFIG_PATH}}
107111

108112
- name: Build MAUI iOS project
109-
run: dotnet build ${{env.PROJECT_PATH}} -c Debug -f net9.0-ios --no-restore -p:PublishTrimmed=True -p:MtouchLink=SdkOnly
113+
run: dotnet build ${{env.PROJECT_PATH}} -c Debug -f ${{env.IOS_TFM}} --no-restore -p:PublishTrimmed=True -p:MtouchLink=SdkOnly
110114

111115

112116
# ********************************* #
@@ -120,14 +124,14 @@ jobs:
120124
with:
121125
fetch-depth: 0
122126

123-
# - uses: maxim-lobanov/setup-xcode@v1
124-
# with:
125-
# xcode-version: latest
127+
- uses: maxim-lobanov/setup-xcode@v1
128+
with:
129+
xcode-version: 16.1
126130

127131
- name: Setup .NET Core SDK
128132
uses: actions/setup-dotnet@v4
129133
with:
130-
dotnet-version: '9.0.x'
134+
dotnet-version: ${{env.DOTNET_VERSION}}
131135

132136
- name: Install MAUI workloads
133137
run: dotnet workload install maui --source https://api.nuget.org/v3/index.json
@@ -136,4 +140,4 @@ jobs:
136140
run: dotnet restore ${{env.PROJECT_PATH}} --configfile ${{env.NUGETCONFIG_PATH}}
137141

138142
- name: Build MAUI MacCatalyst project
139-
run: dotnet build ${{env.PROJECT_PATH}} -f net9.0-maccatalyst -c Debug --no-restore -p:PublishTrimmed=True -p:MtouchLink=SdkOnly
143+
run: dotnet build ${{env.PROJECT_PATH}} -f ${{env.MACCATALYST_TFM}} -c Debug --no-restore -p:PublishTrimmed=True -p:MtouchLink=SdkOnly

0 commit comments

Comments
 (0)