From e0f1d974db00323d6811d13918aa3d83a96bbc58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 09:48:51 -0700 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/xharness build 20240604.1 (#22950) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.24277.1 -> To Version 9.0.0-prerelease.24304.1 Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- NuGet.config | 7 +------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 022b1d13b0c0..0922c8d74749 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "9.0.0-prerelease.24277.1", + "version": "9.0.0-prerelease.24304.1", "commands": [ "xharness" ] diff --git a/NuGet.config b/NuGet.config index cd58a4d9addd..d9cb3abc74a1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,6 +1,5 @@ - @@ -13,20 +12,17 @@ - - - - + @@ -54,5 +50,4 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5f5dd6ec31d..8af098ce5c23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/xharness - 914dd73b3622741590db173b5dd6eac1aa9cc553 + 03a55dc4462c3851ce4bb939e71410136ea8f5e3 - + https://github.com/dotnet/xharness - 914dd73b3622741590db173b5dd6eac1aa9cc553 + 03a55dc4462c3851ce4bb939e71410136ea8f5e3 - + https://github.com/dotnet/xharness - 914dd73b3622741590db173b5dd6eac1aa9cc553 + 03a55dc4462c3851ce4bb939e71410136ea8f5e3 diff --git a/eng/Versions.props b/eng/Versions.props index 4b0bf80867d1..c6519dfa1dc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,9 +104,9 @@ <_HarfBuzzSharpVersion>7.3.0.2 <_SkiaSharpNativeAssetsVersion>0.0.0-commit.7af1d0840a381c0ce7ef2877454a88dbb2949686.1086 7.0.114 - 9.0.0-prerelease.24277.1 - 9.0.0-prerelease.24277.1 - 9.0.0-prerelease.24277.1 + 9.0.0-prerelease.24304.1 + 9.0.0-prerelease.24304.1 + 9.0.0-prerelease.24304.1 0.9.2 1.0.0.16 1.3.0 From 0eaf35c5099f12bb8353e63229978732c184e6e7 Mon Sep 17 00:00:00 2001 From: Shane Neuville Date: Mon, 10 Jun 2024 13:24:50 -0500 Subject: [PATCH 2/6] Fix PatchVersion (#22955) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c6519dfa1dc7..412ddcadc34d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,7 +4,7 @@ 8.0.70 8 0 - 60 + 70 8.0.100 ci.net8 From a35ed9313cd20eb1638b0e388c1bf64ff6da34a7 Mon Sep 17 00:00:00 2001 From: Shane Neuville Date: Mon, 10 Jun 2024 17:10:15 -0700 Subject: [PATCH 3/6] Remove unnecessary SendAppearing call --- .../tests/Core.UnitTests/NavigationPageLifecycleTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Controls/tests/Core.UnitTests/NavigationPageLifecycleTests.cs b/src/Controls/tests/Core.UnitTests/NavigationPageLifecycleTests.cs index e11a43ce45f9..299e15b8e9b1 100644 --- a/src/Controls/tests/Core.UnitTests/NavigationPageLifecycleTests.cs +++ b/src/Controls/tests/Core.UnitTests/NavigationPageLifecycleTests.cs @@ -81,7 +81,6 @@ void OnInitialPageAppearing(object sender, EventArgs e) _ = new TestWindow(nav); - nav.SendAppearing(); await waitForFirstAppearing.Task; initialPage.Appearing += (sender, _) => rootPageFiresAppearingAfterPop = (ContentPage)sender; From 5d6753110f98f5997b46e06c920eb341f8381386 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 11 Jun 2024 17:00:48 -0700 Subject: [PATCH 4/6] [main] Update arcade and xharness (#22981) * Update arcade * Update dotnet-tools.json * Update xharness --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 20 +++++----- eng/Versions.props | 8 ++-- .../job/source-index-stage1.yml | 39 +++++++++++++------ .../templates/job/source-index-stage1.yml | 39 +++++++++++++------ global.json | 4 +- 6 files changed, 71 insertions(+), 41 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0922c8d74749..08371f46f87f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "9.0.0-prerelease.24304.1", + "version": "9.0.0-prerelease.24311.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8af098ce5c23..9b192028500b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + https://github.com/dotnet/xharness - 03a55dc4462c3851ce4bb939e71410136ea8f5e3 + 975b330d51119efc4884f7a323784662cbf74391 - + https://github.com/dotnet/xharness - 03a55dc4462c3851ce4bb939e71410136ea8f5e3 + 975b330d51119efc4884f7a323784662cbf74391 - + https://github.com/dotnet/xharness - 03a55dc4462c3851ce4bb939e71410136ea8f5e3 + 975b330d51119efc4884f7a323784662cbf74391 - + https://github.com/dotnet/arcade - 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 + 9f6799fdc16ae19b3e9478c55b997a6aab839d09 - + https://github.com/dotnet/arcade - 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 + 9f6799fdc16ae19b3e9478c55b997a6aab839d09 diff --git a/eng/Versions.props b/eng/Versions.props index 412ddcadc34d..0183e3e48eba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,16 +104,16 @@ <_HarfBuzzSharpVersion>7.3.0.2 <_SkiaSharpNativeAssetsVersion>0.0.0-commit.7af1d0840a381c0ce7ef2877454a88dbb2949686.1086 7.0.114 - 9.0.0-prerelease.24304.1 - 9.0.0-prerelease.24304.1 - 9.0.0-prerelease.24304.1 + 9.0.0-prerelease.24311.2 + 9.0.0-prerelease.24311.2 + 9.0.0-prerelease.24311.2 0.9.2 1.0.0.16 1.3.0 0.9.0 4.2.3 8.0.3 - 8.0.0-beta.24225.1 + 8.0.0-beta.24310.5 17.6.0 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index f0513aee5b0d..60dfb6b2d1c0 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20230228.2 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -14,14 +15,14 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables - template: /eng/common/templates-official/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: @@ -41,16 +42,16 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core SDK 6 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 6.0.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -62,7 +63,21 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" + + - script: | + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b98202aa02d8..0b6bb89dc78a 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20230228.2 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -14,14 +15,14 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: @@ -40,16 +41,16 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core SDK 6 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 6.0.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -61,7 +62,21 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" + + - script: | + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) diff --git a/global.json b/global.json index b26b64979308..2b3c65d222ba 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.100-preview.3.24204.13" + "dotnet": "9.0.100-preview.4.24267.66" }, "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24225.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5" } } From df0d35311e68ca17fc37b429170fc280ddacb29e Mon Sep 17 00:00:00 2001 From: MartyIX <203266+MartyIX@users.noreply.github.com> Date: Wed, 12 Jun 2024 09:58:22 +0200 Subject: [PATCH 5/6] Upgrade from 1.5.1 to 1.5.4 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0183e3e48eba..922ed2da6856 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0 - 1.5.240311000 + 1.5.240607001 10.0.22621.756 1.2.0 From b01e16389d30a6b894e2dc964320b7d7350b5d7b Mon Sep 17 00:00:00 2001 From: Jakub Florkowski <42434498+kubaflo@users.noreply.github.com> Date: Wed, 12 Jun 2024 20:21:33 +0200 Subject: [PATCH 6/6] SwipeView Fix #22580 (#22741) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Javier Suárez --- .../src/Core/SwipeView/SwipeView.Mapper.cs | 39 +++++++++++++++++++ .../Xaml/Hosting/AppHostBuilderExtensions.cs | 1 + 2 files changed, 40 insertions(+) create mode 100644 src/Controls/src/Core/SwipeView/SwipeView.Mapper.cs diff --git a/src/Controls/src/Core/SwipeView/SwipeView.Mapper.cs b/src/Controls/src/Core/SwipeView/SwipeView.Mapper.cs new file mode 100644 index 000000000000..1b1f918451d6 --- /dev/null +++ b/src/Controls/src/Core/SwipeView/SwipeView.Mapper.cs @@ -0,0 +1,39 @@ +using System; +using Microsoft.Maui.Controls.Compatibility; + +namespace Microsoft.Maui.Controls +{ + public partial class SwipeView + { + [Obsolete("Use SwipeViewHandler.Mapper instead.")] + internal static IPropertyMapper ControlsSwipeMapper = + new ControlsMapper(SwipeViewHandler.Mapper); + + internal static new void RemapForControls() + { + // Adjusted the mapping to preserve SwipeView.Entry legacy behavior + SwipeViewHandler.Mapper.AppendToMapping(nameof(Background), MapBackground); + } + + static void MapBackground(ISwipeViewHandler handler, SwipeView swipeView) + { + if (swipeView.Content is not null) + { + var contentBackgroundIsNull = Brush.IsNullOrEmpty(swipeView.Content.Background); + var contentBackgroundColorIsNull = swipeView.Content.BackgroundColor == null; + + if (contentBackgroundIsNull && contentBackgroundColorIsNull) + { + if (!Brush.IsNullOrEmpty(swipeView.Background)) + { + swipeView.Content.Background = swipeView.Background; + } + else if (swipeView.BackgroundColor != null) + { + swipeView.Content.BackgroundColor = swipeView.BackgroundColor; + } + } + } + } + } +} diff --git a/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs b/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs index 50eeb913fc75..c7a02e335a49 100644 --- a/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs +++ b/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs @@ -242,6 +242,7 @@ internal static MauiAppBuilder RemapForControls(this MauiAppBuilder builder) Window.RemapForControls(); Editor.RemapForControls(); Entry.RemapForControls(); + SwipeView.RemapForControls(); Picker.RemapForControls(); SearchBar.RemapForControls(); TabbedPage.RemapForControls();