From c30f611da970ccd935dbb2d500229d0c91c8b2ae Mon Sep 17 00:00:00 2001 From: Alex Soto Date: Wed, 19 Apr 2023 17:38:21 -0400 Subject: [PATCH 1/4] [net6.0] Update dependencies from xamarin/xamarin-macios to support Xcode 14.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aec940d7c4bd..36c955d41e36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 2801b26e0dcd7c20b42cf77fa6f23e70b7bce397 - + https://github.com/xamarin/xamarin-macios - 97664b121a66fd5713e9936525586c813202ebd1 + 08e0d3fe34c09a49cf2a8b6468171eb59729d78e - + https://github.com/xamarin/xamarin-macios - 97664b121a66fd5713e9936525586c813202ebd1 + 08e0d3fe34c09a49cf2a8b6468171eb59729d78e - + https://github.com/xamarin/xamarin-macios - 97664b121a66fd5713e9936525586c813202ebd1 + 08e0d3fe34c09a49cf2a8b6468171eb59729d78e - + https://github.com/xamarin/xamarin-macios - 97664b121a66fd5713e9936525586c813202ebd1 + 08e0d3fe34c09a49cf2a8b6468171eb59729d78e https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 077353672cfb..c15b36a75f34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.506 - 16.2.47 - 16.2.47 - 13.1.47 - 16.1.285 + 16.4.47 + 16.4.47 + 13.3.47 + 16.4.47 7.0.400-preview.1.0 From e05302f65ede1f2fd06b59bee771714f5d4a04cb Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 20 Apr 2023 11:12:41 +0100 Subject: [PATCH 2/4] Fix variables to use ventura --- eng/pipelines/common/variables.yml | 4 ++-- eng/pipelines/device-tests.yml | 14 ++++++-------- eng/pipelines/handlers.yml | 16 ++++------------ 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index e6d90735367c..b3f4ed1c4f7c 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -8,9 +8,9 @@ variables: - name: DOTNET_VERSION value: 5.0.201 - name: REQUIRED_XCODE - value: 14.2.0 + value: 14.3.0 - name: DEVICETESTS_REQUIRED_XCODE - value: 14.2.0 + value: 14.3.0 - name: LocBranchPrefix value: 'loc-hb' - name: isMainBranch diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml index 6d6f25bc0292..b7b87355ae6a 100644 --- a/eng/pipelines/device-tests.yml +++ b/eng/pipelines/device-tests.yml @@ -60,14 +60,15 @@ parameters: name: $(androidTestsVmPool) vmImage: $(androidTestsVmImage) demands: - - macOS.Name -equals Monterey + - macOS.Name -equals Ventura - macOS.Architecture -equals x64 - name: iosPool type: object default: - name: $(iosTestsVmPool) - vmImage: $(iosTestsVmImage) - + name: $(androidTestsVmPool) + vmImage: $(androidTestsVmImage) + - macOS.Name -equals Ventura + - macOS.Architecture -equals x64 resources: repositories: - repository: xamarin-templates @@ -85,7 +86,7 @@ stages: ${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}: androidApiLevels: [ 30, 29, 28, 27, 26, 25, 24, 23 ] # androidApiLevels: [ 30, 29, 28, 27, 26, 25, 24, 23, 22, 21 ] # fix the issue of getting the test results off - iosVersions: [ 'latest', '14.5', '13.7', '12.4' ] + iosVersions: [ 'latest', '14.5', '13.7'] provisionatorChannel: ${{ parameters.provisionatorChannel }} ${{ if not(or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv')))) }}: androidApiLevels: [ 30, 23 ] @@ -102,18 +103,15 @@ stages: desc: Core androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable android: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj - iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI ios: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj - name: controls desc: Controls androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable android: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj - iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI ios: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj - name: blazorwebview desc: BlazorWebView androidApiLevelsExclude: [ 27, 26, 25, 24, 23, 22, 21 ] # BlazorWebView requires a recent version of Chrome android: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj - iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI ios: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj \ No newline at end of file diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml index e1022a4d5282..03fcbac6a8fc 100644 --- a/eng/pipelines/handlers.yml +++ b/eng/pipelines/handlers.yml @@ -139,10 +139,8 @@ stages: name: ${{ BuildPlatform.poolName }} vmImage: ${{ BuildPlatform.vmImage }} demands: - - macOS.Name -equals Monterey + - macOS.Name -equals Ventura - macOS.Architecture -equals x64 - - Agent.HasDevices -equals False - - Agent.IsPaired -equals False steps: - template: common/provision.yml parameters: @@ -186,10 +184,8 @@ stages: name: ${{ PackPlatform.poolName }} vmImage: ${{ PackPlatform.vmImage }} demands: - - macOS.Name -equals Monterey + - macOS.Name -equals Ventura - macOS.Architecture -equals x64 - - Agent.HasDevices -equals False - - Agent.IsPaired -equals False steps: - template: common/pack.yml parameters: @@ -217,10 +213,8 @@ stages: name: ${{ BuildPlatform.poolName }} vmImage: ${{ BuildPlatform.vmImage }} demands: - - macOS.Name -equals Monterey + - macOS.Name -equals Ventura - macOS.Architecture -equals x64 - - Agent.HasDevices -equals False - - Agent.IsPaired -equals False steps: - template: common/provision.yml parameters: @@ -272,10 +266,8 @@ stages: name: ${{ BuildPlatform.poolName }} vmImage: ${{ BuildPlatform.vmImage }} demands: - - macOS.Name -equals Monterey + - macOS.Name -equals Ventura - macOS.Architecture -equals x64 - - Agent.HasDevices -equals False - - Agent.IsPaired -equals False steps: - template: common/provision.yml parameters: From 0642c205a993713590fa8deb564351bc788a9d7b Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 20 Apr 2023 11:22:24 +0100 Subject: [PATCH 3/4] Fix yaml --- eng/pipelines/device-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml index b7b87355ae6a..3e1802750128 100644 --- a/eng/pipelines/device-tests.yml +++ b/eng/pipelines/device-tests.yml @@ -67,6 +67,7 @@ parameters: default: name: $(androidTestsVmPool) vmImage: $(androidTestsVmImage) + demands: - macOS.Name -equals Ventura - macOS.Architecture -equals x64 resources: From efb6a016a17dcc7f0bc1397595665648dc27c969 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 20 Apr 2023 11:44:49 +0100 Subject: [PATCH 4/4] Bump xharness --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 49131060379f..88392e17015b 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22531.1", + "version": "1.0.0-prerelease.23212.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36c955d41e36..5d08ad27e871 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,17 +75,17 @@ https://github.com/dotnet/Microsoft.Maui.Graphics 015c4cd2d4ce120e516d75601ef5e80004b141a7 - + https://github.com/dotnet/xharness a8e8fc0ffeb9b8c56ab799597597ce35d5be6111 c1a5db9daed957c62a2c803809c7aeb6fc05f4a3 - + https://github.com/dotnet/xharness a8e8fc0ffeb9b8c56ab799597597ce35d5be6111 c1a5db9daed957c62a2c803809c7aeb6fc05f4a3 - + https://github.com/dotnet/xharness a8e8fc0ffeb9b8c56ab799597597ce35d5be6111 c1a5db9daed957c62a2c803809c7aeb6fc05f4a3 diff --git a/eng/Versions.props b/eng/Versions.props index c15b36a75f34..ef7c51a7cce7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,9 +55,9 @@ <_HarfBuzzSharpVersion>2.8.2.2 <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483 7.0.100-preview.5.22226.1 - 1.0.0-prerelease.22531.1 - 1.0.0-prerelease.22531.1 - 1.0.0-prerelease.22531.1 + 1.0.0-prerelease.23212.1 + 1.0.0-prerelease.23212.1 + 1.0.0-prerelease.23212.1 0.9.0 0.5.13 1.2.0