Skip to content

Commit 6874961

Browse files
jsuarezruizjsuarezruiz
committed
Merge branch 'main' into android-date-picker-focus-unfocus-events-added
2 parents 4163fea + b01e163 commit 6874961

File tree

9 files changed

+112
-43
lines changed

9 files changed

+112
-43
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
]
2222
},
2323
"microsoft.dotnet.xharness.cli": {
24-
"version": "9.0.0-prerelease.24304.1",
24+
"version": "9.0.0-prerelease.24311.2",
2525
"commands": [
2626
"xharness"
2727
]

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24304.1">
3+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24311.2">
44
<Uri>https://github.com/dotnet/xharness</Uri>
5-
<Sha>03a55dc4462c3851ce4bb939e71410136ea8f5e3</Sha>
5+
<Sha>975b330d51119efc4884f7a323784662cbf74391</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.24304.1">
7+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.24311.2">
88
<Uri>https://github.com/dotnet/xharness</Uri>
9-
<Sha>03a55dc4462c3851ce4bb939e71410136ea8f5e3</Sha>
9+
<Sha>975b330d51119efc4884f7a323784662cbf74391</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24304.1">
11+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24311.2">
1212
<Uri>https://github.com/dotnet/xharness</Uri>
13-
<Sha>03a55dc4462c3851ce4bb939e71410136ea8f5e3</Sha>
13+
<Sha>975b330d51119efc4884f7a323784662cbf74391</Sha>
1414
</Dependency>
1515
</ProductDependencies>
1616
<ToolsetDependencies>
17-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24225.1">
17+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24310.5">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>67d23f4ba1813b315e7e33c71d18b63475f5c5f8</Sha>
19+
<Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24225.1">
21+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24310.5">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>67d23f4ba1813b315e7e33c71d18b63475f5c5f8</Sha>
23+
<Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
2424
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2525
</Dependency>
2626
</ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<!-- emsdk -->
6161
<MicrosoftNETWorkloadEmscriptenPackageVersion>8.0.0</MicrosoftNETWorkloadEmscriptenPackageVersion>
6262
<!-- wasdk -->
63-
<MicrosoftWindowsAppSDKPackageVersion>1.5.240311000</MicrosoftWindowsAppSDKPackageVersion>
63+
<MicrosoftWindowsAppSDKPackageVersion>1.5.240607001</MicrosoftWindowsAppSDKPackageVersion>
6464
<MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
6565
<MicrosoftGraphicsWin2DPackageVersion>1.2.0</MicrosoftGraphicsWin2DPackageVersion>
6666
<!-- Everything else -->
@@ -104,16 +104,16 @@
104104
<_HarfBuzzSharpVersion>7.3.0.2</_HarfBuzzSharpVersion>
105105
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.7af1d0840a381c0ce7ef2877454a88dbb2949686.1086</_SkiaSharpNativeAssetsVersion>
106106
<MicrosoftTemplateEngineTasksVersion>7.0.114</MicrosoftTemplateEngineTasksVersion>
107-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24304.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
108-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24304.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
109-
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24304.1</MicrosoftDotNetXHarnessCLIVersion>
107+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24311.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
108+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24311.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
109+
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24311.2</MicrosoftDotNetXHarnessCLIVersion>
110110
<TizenUIExtensionsVersion>0.9.2</TizenUIExtensionsVersion>
111111
<SvgSkiaPackageVersion>1.0.0.16</SvgSkiaPackageVersion>
112112
<FizzlerPackageVersion>1.3.0</FizzlerPackageVersion>
113113
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
114114
<ExCSSPackageVersion>4.2.3</ExCSSPackageVersion>
115115
<SystemDrawingCommonPackageVersion>8.0.3</SystemDrawingCommonPackageVersion>
116-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24225.1</MicrosoftDotNetBuildTasksFeedVersion>
116+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24310.5</MicrosoftDotNetBuildTasksFeedVersion>
117117
</PropertyGroup>
118118
<PropertyGroup>
119119
<MicrosoftNETTestSdkPackageVersion>17.6.0</MicrosoftNETTestSdkPackageVersion>

‎eng/common/templates-official/job/source-index-stage1.yml‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20230228.2
3+
sourceIndexUploadPackageVersion: 2.0.0-20240502.12
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
45
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
56
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
67
preSteps: []
@@ -14,14 +15,14 @@ jobs:
1415
dependsOn: ${{ parameters.dependsOn }}
1516
condition: ${{ parameters.condition }}
1617
variables:
17-
- name: SourceIndexPackageVersion
18-
value: ${{ parameters.sourceIndexPackageVersion }}
18+
- name: SourceIndexUploadPackageVersion
19+
value: ${{ parameters.sourceIndexUploadPackageVersion }}
20+
- name: SourceIndexProcessBinlogPackageVersion
21+
value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
1922
- name: SourceIndexPackageSource
2023
value: ${{ parameters.sourceIndexPackageSource }}
2124
- name: BinlogPath
2225
value: ${{ parameters.binlogPath }}
23-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
24-
- group: source-dot-net stage1 variables
2526
- template: /eng/common/templates-official/variables/pool-providers.yml
2627

2728
${{ if ne(parameters.pool, '') }}:
@@ -41,16 +42,16 @@ jobs:
4142
- ${{ preStep }}
4243

4344
- task: UseDotNet@2
44-
displayName: Use .NET Core SDK 6
45+
displayName: Use .NET 8 SDK
4546
inputs:
4647
packageType: sdk
47-
version: 6.0.x
48+
version: 8.0.x
4849
installationPath: $(Agent.TempDirectory)/dotnet
4950
workingDirectory: $(Agent.TempDirectory)
5051

5152
- script: |
52-
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
53-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
53+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
54+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
5455
displayName: Download Tools
5556
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
5657
workingDirectory: $(Agent.TempDirectory)
@@ -62,7 +63,21 @@ jobs:
6263
displayName: Process Binlog into indexable sln
6364

6465
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
65-
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
66+
- task: AzureCLI@2
67+
displayName: Get stage 1 auth token
68+
inputs:
69+
azureSubscription: 'SourceDotNet Stage1 Publish'
70+
addSpnToEnvironment: true
71+
scriptType: 'ps'
72+
scriptLocation: 'inlineScript'
73+
inlineScript: |
74+
echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId"
75+
echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken"
76+
echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId"
77+
78+
- script: |
79+
az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
80+
displayName: "Login to Azure"
81+
82+
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
6683
displayName: Upload stage1 artifacts to source index
67-
env:
68-
BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)

‎eng/common/templates/job/source-index-stage1.yml‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20230228.2
3+
sourceIndexUploadPackageVersion: 2.0.0-20240502.12
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
45
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
56
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
67
preSteps: []
@@ -14,14 +15,14 @@ jobs:
1415
dependsOn: ${{ parameters.dependsOn }}
1516
condition: ${{ parameters.condition }}
1617
variables:
17-
- name: SourceIndexPackageVersion
18-
value: ${{ parameters.sourceIndexPackageVersion }}
18+
- name: SourceIndexUploadPackageVersion
19+
value: ${{ parameters.sourceIndexUploadPackageVersion }}
20+
- name: SourceIndexProcessBinlogPackageVersion
21+
value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
1922
- name: SourceIndexPackageSource
2023
value: ${{ parameters.sourceIndexPackageSource }}
2124
- name: BinlogPath
2225
value: ${{ parameters.binlogPath }}
23-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
24-
- group: source-dot-net stage1 variables
2526
- template: /eng/common/templates/variables/pool-providers.yml
2627

2728
${{ if ne(parameters.pool, '') }}:
@@ -40,16 +41,16 @@ jobs:
4041
- ${{ preStep }}
4142

4243
- task: UseDotNet@2
43-
displayName: Use .NET Core SDK 6
44+
displayName: Use .NET 8 SDK
4445
inputs:
4546
packageType: sdk
46-
version: 6.0.x
47+
version: 8.0.x
4748
installationPath: $(Agent.TempDirectory)/dotnet
4849
workingDirectory: $(Agent.TempDirectory)
4950

5051
- script: |
51-
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
52-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
52+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
53+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
5354
displayName: Download Tools
5455
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
5556
workingDirectory: $(Agent.TempDirectory)
@@ -61,7 +62,21 @@ jobs:
6162
displayName: Process Binlog into indexable sln
6263

6364
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
64-
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
65+
- task: AzureCLI@2
66+
displayName: Get stage 1 auth token
67+
inputs:
68+
azureSubscription: 'SourceDotNet Stage1 Publish'
69+
addSpnToEnvironment: true
70+
scriptType: 'ps'
71+
scriptLocation: 'inlineScript'
72+
inlineScript: |
73+
echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId"
74+
echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken"
75+
echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId"
76+
77+
- script: |
78+
az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
79+
displayName: "Login to Azure"
80+
81+
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
6582
displayName: Upload stage1 artifacts to source index
66-
env:
67-
BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.3.24204.13"
3+
"dotnet": "9.0.100-preview.4.24267.66"
44
},
55
"msbuild-sdks": {
66
"MSBuild.Sdk.Extras": "3.0.44",
77
"Microsoft.Build.NoTargets": "3.7.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24225.1"
8+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5"
99
}
1010
}

‎src/Controls/src/Core/SwipeView/SwipeView.Mapper.cs‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
using System;
2+
using Microsoft.Maui.Controls.Compatibility;
3+
4+
namespace Microsoft.Maui.Controls
5+
{
6+
public partial class SwipeView
7+
{
8+
[Obsolete("Use SwipeViewHandler.Mapper instead.")]
9+
internal static IPropertyMapper<ISwipeView, ISwipeViewHandler> ControlsSwipeMapper =
10+
new ControlsMapper<SwipeView, SwipeViewHandler>(SwipeViewHandler.Mapper);
11+
12+
internal static new void RemapForControls()
13+
{
14+
// Adjusted the mapping to preserve SwipeView.Entry legacy behavior
15+
SwipeViewHandler.Mapper.AppendToMapping<SwipeView, ISwipeViewHandler>(nameof(Background), MapBackground);
16+
}
17+
18+
static void MapBackground(ISwipeViewHandler handler, SwipeView swipeView)
19+
{
20+
if (swipeView.Content is not null)
21+
{
22+
var contentBackgroundIsNull = Brush.IsNullOrEmpty(swipeView.Content.Background);
23+
var contentBackgroundColorIsNull = swipeView.Content.BackgroundColor == null;
24+
25+
if (contentBackgroundIsNull && contentBackgroundColorIsNull)
26+
{
27+
if (!Brush.IsNullOrEmpty(swipeView.Background))
28+
{
29+
swipeView.Content.Background = swipeView.Background;
30+
}
31+
else if (swipeView.BackgroundColor != null)
32+
{
33+
swipeView.Content.BackgroundColor = swipeView.BackgroundColor;
34+
}
35+
}
36+
}
37+
}
38+
}
39+
}

‎src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ internal static MauiAppBuilder RemapForControls(this MauiAppBuilder builder)
242242
Window.RemapForControls();
243243
Editor.RemapForControls();
244244
Entry.RemapForControls();
245+
SwipeView.RemapForControls();
245246
Picker.RemapForControls();
246247
SearchBar.RemapForControls();
247248
TabbedPage.RemapForControls();

‎src/Controls/tests/Core.UnitTests/NavigationPageLifecycleTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ void OnInitialPageAppearing(object sender, EventArgs e)
8181

8282
_ = new TestWindow(nav);
8383

84-
nav.SendAppearing();
8584
await waitForFirstAppearing.Task;
8685
initialPage.Appearing += (sender, _)
8786
=> rootPageFiresAppearingAfterPop = (ContentPage)sender;

0 commit comments

Comments
 (0)