Skip to content

Commit 72fccc7

Browse files
TheCodeTravelerTheCodeTraveler
authored
[Housekeeping] Increase Xcode to 16.3 for Sample App Builds in CI/CD Pipelines (#2622)
* Update azure-pipelines.yml * Update dotnet-build.yml * Add Null Check * Update dotnet-build.yml * Update Xcode setup in workflow * Add macOS condition for Xcode steps * Update azure-pipelines.yml * Update azure-pipelines.yml * Update NuGet Packages --------- Co-authored-by: Brandon Minnick <[email protected]>
1 parent 46f82e2 commit 72fccc7

File tree

16 files changed

+50
-36
lines changed

16 files changed

+50
-36
lines changed

‎.github/workflows/dotnet-build.yml‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ env:
4343
PathToCommunityToolkitMediaElementAnalyzersCodeFixCsproj: 'src/CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes/CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes.csproj'
4444
PathToCommunityToolkitAnalyzersUnitTestProjectDirectory: 'src/CommunityToolkit.Maui.Analyzers.UnitTests'
4545
PathToCommunityToolkitAnalyzersBenchmarkCsproj: 'src/CommunityToolkit.Maui.Analyzers.Benchmarks/CommunityToolkit.Maui.Analyzers.Benchmarks.csproj'
46-
CommunityToolkitSampleApp_Xcode_Version: '16.2'
4746
CommunityToolkitLibrary_Xcode_Version: '16.2'
4847

4948
concurrency:
@@ -62,19 +61,23 @@ jobs:
6261
- name: Checkout code
6362
uses: actions/checkout@main
6463

65-
- name: Set Xcode version
64+
- name: Set Latest Xcode Version
6665
if: runner.os == 'macOS'
67-
run: |
68-
echo Installed Xcode Versions:
69-
ls -al /Applications | grep Xcode
70-
sudo xcode-select --switch /Applications/Xcode_${{ env.CommunityToolkitSampleApp_Xcode_Version }}.app/Contents/Developer
66+
uses: maxim-lobanov/setup-xcode@v1
67+
with:
68+
xcode-version: latest-stable
7169

7270
- name: Install Latest .NET SDK, v${{ env.LATEST_NET_VERSION }}
7371
uses: actions/setup-dotnet@v4
7472
with:
7573
dotnet-version: ${{ env.LATEST_NET_VERSION }}
7674
dotnet-quality: 'ga'
7775

76+
- uses: actions/setup-java@v4
77+
with:
78+
distribution: 'microsoft'
79+
java-version: '17'
80+
7881
- name: Install .NET MAUI Workload
7982
run: |
8083
dotnet workload install maui
@@ -127,19 +130,23 @@ jobs:
127130
echo "NugetPackageVersionMaps=${{ env.CurrentSemanticVersionBase }}-build-${{ github.event.pull_request.number }}.${{ github.run_number }}+${{ github.sha }}"
128131
shell: bash
129132

130-
- name: Set Xcode version
131-
if: ${{ runner.os == 'macOS' }}
132-
run: |
133-
echo Installed Xcode Versions:
134-
ls -al /Applications | grep Xcode
135-
sudo xcode-select --switch /Applications/Xcode_${{ env.CommunityToolkitLibrary_Xcode_Version }}.app/Contents/Developer
133+
- name: Set Xcode Version
134+
if: runner.os == 'macOS'
135+
uses: maxim-lobanov/setup-xcode@v1
136+
with:
137+
xcode-version: ${{ env.CommunityToolkitLibrary_Xcode_Version }}
136138

137139
- name: Install .NET SDK v${{ env.TOOLKIT_NET_VERSION }}
138140
uses: actions/setup-dotnet@v4
139141
with:
140142
dotnet-version: ${{ env.TOOLKIT_NET_VERSION }}
141143
dotnet-quality: 'ga'
142144

145+
- uses: actions/setup-java@v4
146+
with:
147+
distribution: 'microsoft'
148+
java-version: '17'
149+
143150
- name: Install .NET MAUI Workload
144151
run: |
145152
dotnet workload install maui
@@ -328,4 +335,4 @@ jobs:
328335
**/*.nupkg
329336
--source https://api.nuget.org/v3/index.json
330337
--api-key ${{ secrets.NUGET_PACKAGE_PUSH_TOKEN }}
331-
--skip-duplicate
338+
--skip-duplicate

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<NuGetAuditMode>all</NuGetAuditMode>
1717

1818
<!-- MAUI Specific -->
19-
<MauiPackageVersion>9.0.50</MauiPackageVersion>
19+
<MauiPackageVersion>9.0.60</MauiPackageVersion>
2020
<NextMauiPackageVersion>10.0.0</NextMauiPackageVersion>
2121
<MauiStrictXamlCompilation>true</MauiStrictXamlCompilation>
2222
<SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>

‎azure-pipelines.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ variables:
2828
PathToCommunityToolkitAnalyzersUnitTestCsproj: 'src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj'
2929
PathToCommunityToolkitAnalyzersBenchmarkCsproj: 'src/CommunityToolkit.Maui.Analyzers.Benchmarks/CommunityToolkit.Maui.Analyzers.Benchmarks.csproj'
3030
DotNetMauiRollbackFile: 'https://maui.blob.core.windows.net/metadata/rollbacks/8.0.6.json'
31-
CommunityToolkitSampleApp_Xcode_Version: '16.2'
31+
CommunityToolkitSampleApp_Xcode_Version: '16.3'
3232
CommunityToolkitLibrary_Xcode_Version: '16.2'
3333

3434
trigger:
@@ -72,7 +72,14 @@ jobs:
7272
script: |
7373
echo Installed Xcode Versions:
7474
ls -al /Applications | grep Xcode
75-
echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(CommunityToolkitSampleApp_Xcode_Version).app;sudo xcode-select --switch /Applications/Xcode_$(CommunityToolkitSampleApp_Xcode_Version).app/Contents/Developer
75+
76+
echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(CommunityToolkitSampleApp_Xcode_Version).app
77+
sudo xcode-select --switch /Applications/Xcode_$(CommunityToolkitSampleApp_Xcode_Version).app/Contents/Developer
78+
79+
xcodebuild -downloadPlatform iOS
80+
81+
echo Installed Simulator SDKs:
82+
xcodebuild -showsdks
7683
7784
- task: UseDotNet@2
7885
displayName: 'Install Latest .NET SDK, v$(LATEST_NET_VERSION)'

‎samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<PackageReference Include="Microsoft.Maui.Controls" Version="*" />
6767
<PackageReference Include="CommunityToolkit.Maui.Markup" Version="5.1.0" />
6868
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
69-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" />
70-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.2" />
69+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.4.0" />
70+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.4" />
7171
</ItemGroup>
7272

7373
<PropertyGroup>

‎src/CommunityToolkit.Maui.Analyzers.CodeFixes/CommunityToolkit.Maui.Analyzers.CodeFixes.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" PrivateAssets="all" />
11+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0" PrivateAssets="all" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest"/>
15+
<Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
1616
</ItemGroup>
1717

1818
<ItemGroup>
1919
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
2020
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
21-
<PackageReference Include="xunit.v3" Version="2.0.0" />
22-
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.13.1" />
23-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
21+
<PackageReference Include="xunit.v3" Version="2.0.1" />
22+
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
23+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0" />
2424
</ItemGroup>
2525

2626
<ItemGroup>
2727
<!--Fix vulnerabilities-->
28-
<PackageReference Include="System.Formats.Asn1" Version="9.0.2" />
28+
<PackageReference Include="System.Formats.Asn1" Version="9.0.4" />
2929
<PackageReference Include="System.Net.Http" Version="4.3.4" />
3030
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
3131
</ItemGroup>

‎src/CommunityToolkit.Maui.Analyzers/CommunityToolkit.Maui.Analyzers.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" PrivateAssets="all" />
16+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0" PrivateAssets="all" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎src/CommunityToolkit.Maui.Camera.Analyzers.CodeFixes/CommunityToolkit.Maui.Camera.Analyzers.CodeFixes.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" PrivateAssets="all" />
11+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0" PrivateAssets="all" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/CommunityToolkit.Maui.Camera.Analyzers/CommunityToolkit.Maui.Camera.Analyzers.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" PrivateAssets="all" />
16+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0" PrivateAssets="all" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<PackageReference Include="Microsoft.Maui.Core" Version="[$(MauiPackageVersion),$(NextMauiPackageVersion))" />
5454
<PackageReference Include="Microsoft.Maui.Essentials" Version="[$(MauiPackageVersion),$(NextMauiPackageVersion))" />
5555
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" Condition=" '$(Configuration)'=='Release' " PrivateAssets="All" />
56-
<PackageReference Include="System.Speech" Version="9.0.0" Condition="'$(TargetFramework)' == '$(NetVersion)-windows10.0.19041.0'" />
56+
<PackageReference Include="System.Speech" Version="9.0.4" Condition="'$(TargetFramework)' == '$(NetVersion)-windows10.0.19041.0'" />
5757
</ItemGroup>
5858

5959
</Project>

0 commit comments

Comments
 (0)