Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] Update dependencies from dotnet/xharness #18179

Merged
merged 3 commits into from
Oct 23, 2023
Merged

[main] Update dependencies from dotnet/xharness #18179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c73fc52
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Oct 20, 2023
3482270
Fix version
rmarinho Oct 20, 2023
eb3b240
try run on Xcode15
rmarinho Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "8.0.0-prerelease.23516.1",
"version": "8.0.0-prerelease.23519.1",
"commands": [
"xharness"
]
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23516.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23519.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>02098f6cf81169134770ee47acc2aca0910635bb</Sha>
<Sha>de2e6a5e7ac1f33558ba06af1173122d93f0962e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23516.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23519.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>02098f6cf81169134770ee47acc2aca0910635bb</Sha>
<Sha>de2e6a5e7ac1f33558ba06af1173122d93f0962e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23516.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23519.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>02098f6cf81169134770ee47acc2aca0910635bb</Sha>
<Sha>de2e6a5e7ac1f33558ba06af1173122d93f0962e</Sha>
</Dependency>
</ProductDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<_HarfBuzzSharpVersion>7.3.0</_HarfBuzzSharpVersion>
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.e2c5c86249621857107c779af0f79b4d06613766.655</_SkiaSharpNativeAssetsVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23516.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23516.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23516.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23519.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23519.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23519.1</MicrosoftDotNetXHarnessCLIVersion>
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
<SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
<FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>
Expand Down
3 changes: 2 additions & 1 deletion eng/pipelines/common/maui-templates.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ jobs:
demands:
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
- Agent.OSVersion -equals 13.5
steps:

- ${{ each step in parameters.prepareSteps }}:
Expand Down Expand Up @@ -161,7 +162,7 @@ jobs:
DOTNET_TOKEN: $(dotnetbuilds-internal-container-read-token)
PRIVATE_BUILD: $(PrivateBuild)

- script: dotnet tool update Microsoft.DotNet.XHarness.CLI --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json --version "1.0.0-prerelease*" -g
- script: dotnet tool update Microsoft.DotNet.XHarness.CLI --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json --version "8.0.0-prerelease.23519.1" -g
displayName: install xharness

- pwsh: ./build.ps1 --target=dotnet-integration-build --verbosity=diagnostic
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ variables:
- name: DOTNET_VERSION
value: 7.0.401
- name: REQUIRED_XCODE
value: 14.3.1
value: 15.0.0
- name: DEVICETESTS_REQUIRED_XCODE
value: 14.3.1
value: 15.0.0
- name: LocBranchPrefix
value: 'loc-hb'
- name: isMainBranch
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/device-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ parameters:
demands:
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
- Agent.OSVersion -equals 13.5

- name: catalystPool
type: object
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/ui-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ parameters:
demands:
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
- Agent.OSVersion -equals 13.5

- name: windowsPool
type: object
Expand Down
Loading