From 0b87ba02d5a7397ded91ab46da3e592ffac6dd09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 13:41:56 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/xharness build 20241119.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.24556.2 -> To Version 9.0.0-prerelease.24569.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 9 +++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 3876bb5c0b5d..520713f3da43 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "9.0.0-prerelease.24556.2", + "version": "9.0.0-prerelease.24569.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 293403e64869..0b2a12894dc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/xharness - e300b00d4b327b7025630285ee270a827d4d2677 + 426e155ecfd7e0bb02ebfe18cae7adc8b468335b - + https://github.com/dotnet/xharness - e300b00d4b327b7025630285ee270a827d4d2677 + 426e155ecfd7e0bb02ebfe18cae7adc8b468335b - + https://github.com/dotnet/xharness - e300b00d4b327b7025630285ee270a827d4d2677 + 426e155ecfd7e0bb02ebfe18cae7adc8b468335b diff --git a/eng/Versions.props b/eng/Versions.props index 70d45a6ac87b..50ac24a77b3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,8 @@ 20 9.0.100 ci.main - + + true @@ -122,9 +123,9 @@ <_HarfBuzzSharpVersion>7.3.0.2 <_SkiaSharpNativeAssetsVersion>0.0.0-commit.7af1d0840a381c0ce7ef2877454a88dbb2949686.1086 7.0.120 - 9.0.0-prerelease.24556.2 - 9.0.0-prerelease.24556.2 - 9.0.0-prerelease.24556.2 + 9.0.0-prerelease.24569.2 + 9.0.0-prerelease.24569.2 + 9.0.0-prerelease.24569.2 0.9.2 1.0.0.16 1.3.0 From ced0b0ed89860ac40f80b73c6eb2aa75e4d34b42 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 26 Nov 2024 17:42:46 +0000 Subject: [PATCH 2/2] Update versions --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 44 +++++++++++++++++++-------------------- eng/Versions.props | 18 ++++++++-------- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 2 +- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 520713f3da43..851511f30c14 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "9.0.0-prerelease.24569.2", + "version": "9.0.0-prerelease.24575.3", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b2a12894dc9..5c3638f4f782 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,50 +1,50 @@ - + https://github.com/dotnet/xharness - 426e155ecfd7e0bb02ebfe18cae7adc8b468335b + 22c8d5baf6124c74e7cf3c1eaf4343cdf086b9e3 - + https://github.com/dotnet/xharness - 426e155ecfd7e0bb02ebfe18cae7adc8b468335b + 22c8d5baf6124c74e7cf3c1eaf4343cdf086b9e3 - + https://github.com/dotnet/xharness - 426e155ecfd7e0bb02ebfe18cae7adc8b468335b + 22c8d5baf6124c74e7cf3c1eaf4343cdf086b9e3 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 diff --git a/eng/Versions.props b/eng/Versions.props index 50ac24a77b3c..8936679473a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -123,22 +123,22 @@ <_HarfBuzzSharpVersion>7.3.0.2 <_SkiaSharpNativeAssetsVersion>0.0.0-commit.7af1d0840a381c0ce7ef2877454a88dbb2949686.1086 7.0.120 - 9.0.0-prerelease.24569.2 - 9.0.0-prerelease.24569.2 - 9.0.0-prerelease.24569.2 + 9.0.0-prerelease.24575.3 + 9.0.0-prerelease.24575.3 + 9.0.0-prerelease.24575.3 0.9.2 1.0.0.16 1.3.0 0.9.0 4.2.3 8.0.3 - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 1.1.87-gba258badda - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 17.6.0 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index aab40de3fd9a..4f0546dce120 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 22954477a574..aa94fb174596 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0 - $defaultXCopyMSBuildVersion = '17.10.0-pre.4.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 + $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 5aefcc1d6305..fc79498cb541 100644 --- a/global.json +++ b/global.json @@ -5,7 +5,7 @@ "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2" }, "sdk": { "allowPrerelease": true