Skip to content

Commit 5c5021c

Browse files
albyrock87albyrock87
authored
Merge branch 'main' into stop-propagation-by-fixed-constraints
2 parents 5c4411c + b2b2191 commit 5c5021c

File tree

311 files changed

+5278
-592
lines changed

Some content is hidden

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

311 files changed

+5278
-592
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"rollForward": false
2525
},
2626
"microsoft.dotnet.xharness.cli": {
27-
"version": "9.0.0-prerelease.25163.3",
27+
"version": "9.0.0-prerelease.25167.9",
2828
"commands": [
2929
"xharness"
3030
],

‎.github/workflows/dotnet-format-daily-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
git commit -a -m 'Automated dotnet-format update'
3434
3535
- name: Create Pull Request
36-
uses: peter-evans/create-pull-request@v3
36+
uses: dotnet/actions-create-pull-request@v4
3737
with:
3838
title: '[housekeeping] Automated PR to fix formatting errors'
3939
body: |

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ templatesTest/
1313
*.user
1414
*.userosscache
1515
*.sln.docstates
16+
/src/Controls/tests/TestCases.HostApp/MauiProgram.user.cs
1617

1718
# User-specific files (MonoDevelop/Xamarin Studio)
1819
*.userprefs

‎docs/design/UITesting.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,25 @@ This will be the majority of new tests added which will be primarily for testing
2626
You will need to create some kind of UI to test against, which will go in the Controls.TestCases.HostApp project. This will be an actual MAUI app under test and has no dependency on Appium. Create a new class within `src/Controls/tests/TestCases.HostApp/Issues` and attribute it with `[Issue]`. Create it like any normal page you would make in app to reproduce the issue. This could be just in XAML or just code, along with a screenshot.
2727
This project requires a rebuild after making changes because the `Controls.TestCases.Shared.Tests` is loosely coupled to this project. It initiates a previously compiled executable from `src/Controls/tests/TestCases.HostApp`.
2828

29+
When working on a single test case it may be convenient to start the app by using the issue page as the main one.
30+
This can be easily achieved by creating a `MauiProgram.user.cs` file in the `src/Controls/tests/TestCases.HostApp` folder and adding the following code:
31+
32+
```csharp
33+
using Controls.TestCases.HostApp.Issues;
34+
35+
namespace Maui.Controls.Sample;
36+
37+
public partial class MauiProgram
38+
{
39+
static partial void OverrideMainPage(ref Page mainPage)
40+
{
41+
mainPage = new Issue99999(); // My issue number here
42+
}
43+
}
44+
```
45+
46+
That file is not tracked by git, so it won't be committed by mistake.
47+
2948
## Adding a Test to Interact with the Reproduction
3049

3150
Next you will need to create the appium test in the `Controls.TestCases.Shared.Tests` project, which is a library project that runs NUnit tests via Appium. Add a new class with the same name as the Reproduction within this folder: `src/Controls/tests/TestCases.Shared.Tests/Tests/Issues`. Have the class derive from `_IssuesUITest` and add your test(s) as methods.

‎eng/Publishing.props

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,5 @@
22
<PropertyGroup>
33
<PublishingVersion>3</PublishingVersion>
44
<ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
5-
<PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishBlobItems</PublishDependsOnTargets>
65
</PropertyGroup>
7-
8-
<ItemGroup>
9-
<_InstallerManifestFilesToPublish Include="$(ArtifactsShippingPackagesDir)\**\*.zip" />
10-
</ItemGroup>
11-
12-
<Target Name="_PublishBlobItems">
13-
<ItemGroup>
14-
<ItemsToPushToBlobFeed Include="@(_InstallerManifestFilesToPublish)">
15-
<IsShipping>true</IsShipping>
16-
<PublishFlatContainer>true</PublishFlatContainer>
17-
<RelativeBlobPath>$(_UploadPathRoot)/$(_PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
18-
</ItemsToPushToBlobFeed>
19-
</ItemGroup>
20-
</Target>
216
</Project>

‎eng/Signing.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<FileSignInfo Include="ExCSS.dll" CertificateName="3PartySHA2" />
2020
<FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />
2121

22-
<FileSignInfo Include="OpenSans-Regular.ttf" CertificateName="3PartySHA2" />
23-
<FileSignInfo Include="OpenSans-Semibold.ttf" CertificateName="3PartySHA2" />
24-
<FileSignInfo Include="FluentSystemIcons-Regular.ttf" CertificateName="3PartySHA2" />
25-
<FileSignInfo Include="SegoeUI-Semibold.ttf" CertificateName="3PartySHA2" />
22+
<FileSignInfo Include="OpenSans-Regular.ttf" CertificateName="3PartyScriptsSHA2" />
23+
<FileSignInfo Include="OpenSans-Semibold.ttf" CertificateName="3PartyScriptsSHA2" />
24+
<FileSignInfo Include="FluentSystemIcons-Regular.ttf" CertificateName="3PartyScriptsSHA2" />
25+
<FileSignInfo Include="SegoeUI-Semibold.ttf" CertificateName="3PartyScriptsSHA2" />
2626

2727
</ItemGroup>
2828

‎eng/Version.Details.xml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.25163.3">
3+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.25167.9">
44
<Uri>https://github.com/dotnet/xharness</Uri>
5-
<Sha>43abbd605a98afaf4d4f10595ff854174487f639</Sha>
5+
<Sha>8fa551353a0b2c90afb82c507f23afdf966d57c5</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.25163.3">
7+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.25167.9">
88
<Uri>https://github.com/dotnet/xharness</Uri>
9-
<Sha>43abbd605a98afaf4d4f10595ff854174487f639</Sha>
9+
<Sha>8fa551353a0b2c90afb82c507f23afdf966d57c5</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.25163.3">
11+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.25167.9">
1212
<Uri>https://github.com/dotnet/xharness</Uri>
13-
<Sha>43abbd605a98afaf4d4f10595ff854174487f639</Sha>
13+
<Sha>8fa551353a0b2c90afb82c507f23afdf966d57c5</Sha>
1414
</Dependency>
1515
</ProductDependencies>
1616
<ToolsetDependencies>
17-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25161.4">
17+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25164.2">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
19+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25161.4">
21+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25164.2">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
23+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25161.4">
25+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25164.2">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
27+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25161.4">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25164.2">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
31+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25161.4">
33+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25164.2">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
35+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25161.4">
37+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25164.2">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
39+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25161.4">
41+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25164.2">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
43+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25161.4">
45+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25164.2">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
47+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
4848
</Dependency>
4949
</ToolsetDependencies>
5050
</Dependencies>

‎eng/Versions.props

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,22 +125,22 @@
125125
<_HarfBuzzSharpVersion>8.3.0.1</_HarfBuzzSharpVersion>
126126
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.e57e2a11dac4ccc72bea52939dede49816842005.1728</_SkiaSharpNativeAssetsVersion>
127127
<MicrosoftTemplateEngineTasksVersion>7.0.120</MicrosoftTemplateEngineTasksVersion>
128-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25163.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
129-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25163.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
130-
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25163.3</MicrosoftDotNetXHarnessCLIVersion>
128+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25167.9</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
129+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25167.9</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
130+
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25167.9</MicrosoftDotNetXHarnessCLIVersion>
131131
<TizenUIExtensionsVersion>0.9.2</TizenUIExtensionsVersion>
132132
<SvgSkiaPackageVersion>2.0.0.4</SvgSkiaPackageVersion>
133133
<FizzlerPackageVersion>1.3.0</FizzlerPackageVersion>
134134
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
135135
<ExCSSPackageVersion>4.2.3</ExCSSPackageVersion>
136136
<SystemDrawingCommonPackageVersion>9.0.0</SystemDrawingCommonPackageVersion>
137-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksFeedVersion>
138-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
139-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
140-
<MicrosoftDotNetHelixSdkPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetHelixSdkPackageVersion>
137+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksFeedVersion>
138+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
139+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
140+
<MicrosoftDotNetHelixSdkPackageVersion>9.0.0-beta.25164.2</MicrosoftDotNetHelixSdkPackageVersion>
141141
<MicroBuildPluginsSwixBuildDotnetPackageVersion>1.1.87-gba258badda</MicroBuildPluginsSwixBuildDotnetPackageVersion>
142-
<MicrosoftDotNetRemoteExecutorPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetRemoteExecutorPackageVersion>
143-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
142+
<MicrosoftDotNetRemoteExecutorPackageVersion>9.0.0-beta.25164.2</MicrosoftDotNetRemoteExecutorPackageVersion>
143+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.25164.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
144144
</PropertyGroup>
145145
<PropertyGroup>
146146
<MicrosoftNETTestSdkPackageVersion>17.6.0</MicrosoftNETTestSdkPackageVersion>

‎eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
4343

4444
# Enable repos to use a particular version of the on-line dotnet-install scripts.
45-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
45+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
4646
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
4747

4848
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
262262
if (!(Test-Path $installScript)) {
263263
Create-Directory $dotnetRoot
264264
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
265-
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
265+
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
266266

267267
Retry({
268268
Write-Host "GET $uri"

‎eng/common/tools.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
5454
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
5555

5656
# Enable repos to use a particular version of the on-line dotnet-install scripts.
57-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
57+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
5858
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
5959

6060
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -295,7 +295,7 @@ function with_retries {
295295
function GetDotNetInstallScript {
296296
local root=$1
297297
local install_script="$root/dotnet-install.sh"
298-
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
298+
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
299299

300300
if [[ ! -a "$install_script" ]]; then
301301
mkdir -p "$root"

0 commit comments

Comments
 (0)