From be5ebeee2dd84038973596edb66b5e9e0e88eb4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 May 2023 12:12:37 +0000 Subject: [PATCH 01/10] Update dependencies from https://github.com/dotnet/arcade build 20230519.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23269.1 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- global.json | 6 ++-- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f7b56b7bd70d7..0dc4c9b35f074a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc @@ -122,69 +122,69 @@ 9e7fbcab4e5275f63c0cd37553ba426de9194309 - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc https://github.com/dotnet/runtime-assets @@ -315,9 +315,9 @@ https://github.com/dotnet/xharness aa434d0c7e6eb46df1ec11b3c63add37d835c4d0 - + https://github.com/dotnet/arcade - f4269875971171c278c2cd695e9ef94b6516e4be + fb6291b40fa4334dbd167e2071953e83cc8b9fdc https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 2b7e2b42881ab9..dbb2d5f5047981 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23268.1 - 8.0.0-beta.23268.1 - 8.0.0-beta.23268.1 - 8.0.0-beta.23268.1 - 8.0.0-beta.23268.1 - 2.5.1-beta.23268.1 - 8.0.0-beta.23268.1 - 8.0.0-beta.23268.1 - 8.0.0-beta.23268.1 - 8.0.0-beta.23268.1 - 8.0.0-beta.23268.1 - 8.0.0-beta.23268.1 - 8.0.0-beta.23268.1 - 8.0.0-beta.23268.1 - 8.0.0-beta.23268.1 + 8.0.0-beta.23269.1 + 8.0.0-beta.23269.1 + 8.0.0-beta.23269.1 + 8.0.0-beta.23269.1 + 8.0.0-beta.23269.1 + 2.5.1-beta.23269.1 + 8.0.0-beta.23269.1 + 8.0.0-beta.23269.1 + 8.0.0-beta.23269.1 + 8.0.0-beta.23269.1 + 8.0.0-beta.23269.1 + 8.0.0-beta.23269.1 + 8.0.0-beta.23269.1 + 8.0.0-beta.23269.1 + 8.0.0-beta.23269.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 9f7c7882947acf..7354f24c75468f 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.3.23178.7" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23268.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23268.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23268.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23269.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23269.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23269.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.5.23251.1" From f8db49b954c01a391f7ec22d3d02f932ba10b5bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 May 2023 12:12:27 +0000 Subject: [PATCH 02/10] Update dependencies from https://github.com/dotnet/arcade build 20230519.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23269.2 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- global.json | 6 ++-- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dc4c9b35f074a..c82a3e7a31b9f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f @@ -122,69 +122,69 @@ 9e7fbcab4e5275f63c0cd37553ba426de9194309 - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f https://github.com/dotnet/runtime-assets @@ -315,9 +315,9 @@ https://github.com/dotnet/xharness aa434d0c7e6eb46df1ec11b3c63add37d835c4d0 - + https://github.com/dotnet/arcade - fb6291b40fa4334dbd167e2071953e83cc8b9fdc + 792c346a52b2388152c2fad6f626b88ed8736d6f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index dbb2d5f5047981..37272ed3ba442e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23269.1 - 8.0.0-beta.23269.1 - 8.0.0-beta.23269.1 - 8.0.0-beta.23269.1 - 8.0.0-beta.23269.1 - 2.5.1-beta.23269.1 - 8.0.0-beta.23269.1 - 8.0.0-beta.23269.1 - 8.0.0-beta.23269.1 - 8.0.0-beta.23269.1 - 8.0.0-beta.23269.1 - 8.0.0-beta.23269.1 - 8.0.0-beta.23269.1 - 8.0.0-beta.23269.1 - 8.0.0-beta.23269.1 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 + 2.5.1-beta.23269.2 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 7354f24c75468f..de2e5132ffd0b8 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.3.23178.7" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23269.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23269.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23269.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23269.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23269.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23269.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.5.23251.1" From 8dfb616f81a84d73bea7813351b3ac0fe53bbec7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 May 2023 12:10:49 +0000 Subject: [PATCH 03/10] Update dependencies from https://github.com/dotnet/arcade build 20230524.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23274.6 --- eng/Version.Details.xml | 72 ++++++++++----------- eng/Versions.props | 30 ++++----- eng/common/sdk-task.ps1 | 2 +- eng/common/templates/job/job.yml | 12 ++-- eng/common/templates/steps/source-build.yml | 6 ++ eng/common/tools.ps1 | 4 +- global.json | 10 +-- 7 files changed, 73 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c82a3e7a31b9f6..4d94b3444ef62c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 @@ -122,69 +122,69 @@ 9e7fbcab4e5275f63c0cd37553ba426de9194309 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 https://github.com/dotnet/runtime-assets @@ -315,9 +315,9 @@ https://github.com/dotnet/xharness aa434d0c7e6eb46df1ec11b3c63add37d835c4d0 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + ab7df8826d2978b5660d75b33059e25666f4def3 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 37272ed3ba442e..11f0811743ed3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 - 2.5.1-beta.23269.2 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 + 8.0.0-beta.23274.6 + 8.0.0-beta.23274.6 + 8.0.0-beta.23274.6 + 8.0.0-beta.23274.6 + 8.0.0-beta.23274.6 + 2.5.1-beta.23274.6 + 8.0.0-beta.23274.6 + 8.0.0-beta.23274.6 + 8.0.0-beta.23274.6 + 8.0.0-beta.23274.6 + 8.0.0-beta.23274.6 + 8.0.0-beta.23274.6 + 8.0.0-beta.23274.6 + 8.0.0-beta.23274.6 + 8.0.0-beta.23274.6 6.0.0-preview.1.102 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index e10a5968797463..6c4ac6fec1a99a 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.4.1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 44ad26abf54ba2..e20ee3a983cb05 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -75,6 +75,10 @@ jobs: - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - name: EnableRichCodeNavigation value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -83,7 +87,7 @@ jobs: - ${{ if ne(variable.name, '') }}: - name: ${{ variable.name }} value: ${{ variable.value }} - + # handle variable groups - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} @@ -169,7 +173,7 @@ jobs: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks + displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} env: @@ -219,7 +223,7 @@ jobs: displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' + testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} @@ -230,7 +234,7 @@ jobs: displayName: Publish TRX Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' + testResultsFiles: '*.trx' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index a97a185a367a92..1100521834a943 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -68,6 +68,11 @@ steps: runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' fi + baseOsArgs= + if [ '${{ parameters.platform.baseOS }}' != '' ]; then + baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -86,6 +91,7 @@ steps: $internalRestoreArgs \ $targetRidArgs \ $runtimeOsArgs \ + $baseOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true \ /p:AssetManifestFileName=$assetManifestFileName diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 38cf94ff88c6f3..ffe0b4e2dfc4d7 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -384,8 +384,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/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview - $defaultXCopyMSBuildVersion = '17.4.1' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2 + $defaultXCopyMSBuildVersion = '17.6.0-2' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index de2e5132ffd0b8..fc9d686731c35c 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "8.0.100-preview.3.23178.7", + "version": "8.0.100-preview.4.23260.5", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.100-preview.3.23178.7" + "dotnet": "8.0.100-preview.4.23260.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23269.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23269.2", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23269.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23274.6", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23274.6", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23274.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.5.23251.1" From f056996d940f143a0d7c2d7799aaedfc63b4466d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 May 2023 12:10:52 +0000 Subject: [PATCH 04/10] Update dependencies from https://github.com/dotnet/arcade build 20230525.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23275.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 6 ++-- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d94b3444ef62c..3be40cb0e41110 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 @@ -117,74 +117,74 @@ 54eb3b811c57f5e94617d31a102fc9cb664ccdd5 - + https://github.com/dotnet/xliff-tasks - 9e7fbcab4e5275f63c0cd37553ba426de9194309 + a8431741d7de7531e4268a8eeb6871fb48b62a43 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 https://github.com/dotnet/runtime-assets @@ -315,9 +315,9 @@ https://github.com/dotnet/xharness aa434d0c7e6eb46df1ec11b3c63add37d835c4d0 - + https://github.com/dotnet/arcade - ab7df8826d2978b5660d75b33059e25666f4def3 + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 11f0811743ed3d..6f9656c5c02a4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23274.6 - 8.0.0-beta.23274.6 - 8.0.0-beta.23274.6 - 8.0.0-beta.23274.6 - 8.0.0-beta.23274.6 - 2.5.1-beta.23274.6 - 8.0.0-beta.23274.6 - 8.0.0-beta.23274.6 - 8.0.0-beta.23274.6 - 8.0.0-beta.23274.6 - 8.0.0-beta.23274.6 - 8.0.0-beta.23274.6 - 8.0.0-beta.23274.6 - 8.0.0-beta.23274.6 - 8.0.0-beta.23274.6 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 + 2.5.1-beta.23275.2 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index fc9d686731c35c..38f95b078cb24b 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.4.23260.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23274.6", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23274.6", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23274.6", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23275.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23275.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23275.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.5.23251.1" From 7610bf5d9258f0a594654dd398291a5e629f3e7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 May 2023 12:11:09 +0000 Subject: [PATCH 05/10] Update dependencies from https://github.com/dotnet/arcade build 20230526.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23276.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- global.json | 6 ++-- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3be40cb0e41110..76987ba75eee41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 @@ -122,69 +122,69 @@ a8431741d7de7531e4268a8eeb6871fb48b62a43 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 https://github.com/dotnet/runtime-assets @@ -315,9 +315,9 @@ https://github.com/dotnet/xharness aa434d0c7e6eb46df1ec11b3c63add37d835c4d0 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 8fb90a220cf89b59f7753dbdd98726336e38ad29 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 6f9656c5c02a4f..d246a0122922fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 - 2.5.1-beta.23275.2 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 + 8.0.0-beta.23276.2 + 8.0.0-beta.23276.2 + 8.0.0-beta.23276.2 + 8.0.0-beta.23276.2 + 8.0.0-beta.23276.2 + 2.5.1-beta.23276.2 + 8.0.0-beta.23276.2 + 8.0.0-beta.23276.2 + 8.0.0-beta.23276.2 + 8.0.0-beta.23276.2 + 8.0.0-beta.23276.2 + 8.0.0-beta.23276.2 + 8.0.0-beta.23276.2 + 8.0.0-beta.23276.2 + 8.0.0-beta.23276.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 38f95b078cb24b..1d32578b154a98 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.4.23260.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23275.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23275.2", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23275.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23276.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23276.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23276.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.5.23251.1" From ac7ddcf17f9fb7c62fa187b3926f5310fdd899bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 May 2023 12:10:27 +0000 Subject: [PATCH 06/10] Update dependencies from https://github.com/dotnet/arcade build 20230527.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23277.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- global.json | 6 ++-- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76987ba75eee41..fc90494f69cf5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b @@ -122,69 +122,69 @@ a8431741d7de7531e4268a8eeb6871fb48b62a43 - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b https://github.com/dotnet/runtime-assets @@ -315,9 +315,9 @@ https://github.com/dotnet/xharness aa434d0c7e6eb46df1ec11b3c63add37d835c4d0 - + https://github.com/dotnet/arcade - 8fb90a220cf89b59f7753dbdd98726336e38ad29 + 115a8d22c9fb710780775360813120ebd1edb94b https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index d246a0122922fc..072f1320909f36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23276.2 - 8.0.0-beta.23276.2 - 8.0.0-beta.23276.2 - 8.0.0-beta.23276.2 - 8.0.0-beta.23276.2 - 2.5.1-beta.23276.2 - 8.0.0-beta.23276.2 - 8.0.0-beta.23276.2 - 8.0.0-beta.23276.2 - 8.0.0-beta.23276.2 - 8.0.0-beta.23276.2 - 8.0.0-beta.23276.2 - 8.0.0-beta.23276.2 - 8.0.0-beta.23276.2 - 8.0.0-beta.23276.2 + 8.0.0-beta.23277.1 + 8.0.0-beta.23277.1 + 8.0.0-beta.23277.1 + 8.0.0-beta.23277.1 + 8.0.0-beta.23277.1 + 2.5.1-beta.23277.1 + 8.0.0-beta.23277.1 + 8.0.0-beta.23277.1 + 8.0.0-beta.23277.1 + 8.0.0-beta.23277.1 + 8.0.0-beta.23277.1 + 8.0.0-beta.23277.1 + 8.0.0-beta.23277.1 + 8.0.0-beta.23277.1 + 8.0.0-beta.23277.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 1d32578b154a98..a1068e266317be 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.4.23260.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23276.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23276.2", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23276.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23277.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23277.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23277.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.5.23251.1" From df6d2ac0d0aa5040e3d618a54a231737058d5cee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 May 2023 12:11:02 +0000 Subject: [PATCH 07/10] Update dependencies from https://github.com/dotnet/arcade build 20230529.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23279.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- global.json | 6 ++-- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc90494f69cf5a..28566ffbb06a32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 @@ -122,69 +122,69 @@ a8431741d7de7531e4268a8eeb6871fb48b62a43 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 https://github.com/dotnet/runtime-assets @@ -315,9 +315,9 @@ https://github.com/dotnet/xharness aa434d0c7e6eb46df1ec11b3c63add37d835c4d0 - + https://github.com/dotnet/arcade - 115a8d22c9fb710780775360813120ebd1edb94b + 174c08a43b26fc26ba98975065f1125f910f5c37 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 072f1320909f36..f2a5e5f835e3dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23277.1 - 8.0.0-beta.23277.1 - 8.0.0-beta.23277.1 - 8.0.0-beta.23277.1 - 8.0.0-beta.23277.1 - 2.5.1-beta.23277.1 - 8.0.0-beta.23277.1 - 8.0.0-beta.23277.1 - 8.0.0-beta.23277.1 - 8.0.0-beta.23277.1 - 8.0.0-beta.23277.1 - 8.0.0-beta.23277.1 - 8.0.0-beta.23277.1 - 8.0.0-beta.23277.1 - 8.0.0-beta.23277.1 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 + 2.5.1-beta.23279.1 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index a1068e266317be..fed8da3587b37d 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.4.23260.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23277.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23277.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23277.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23279.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23279.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23279.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.5.23251.1" From 60dd4f582714052313b3a8c2edd2fec5b9df9ad2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 May 2023 12:11:17 +0000 Subject: [PATCH 08/10] Update dependencies from https://github.com/dotnet/arcade build 20230529.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23279.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- global.json | 6 ++-- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28566ffbb06a32..c08e928d6fdd07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f @@ -122,69 +122,69 @@ a8431741d7de7531e4268a8eeb6871fb48b62a43 - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f https://github.com/dotnet/runtime-assets @@ -315,9 +315,9 @@ https://github.com/dotnet/xharness aa434d0c7e6eb46df1ec11b3c63add37d835c4d0 - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 998d84a61e745ac6e0268d37baef10fa0043d06f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index f2a5e5f835e3dc..73b692de53f0c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 - 2.5.1-beta.23279.1 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 + 8.0.0-beta.23279.4 + 8.0.0-beta.23279.4 + 8.0.0-beta.23279.4 + 8.0.0-beta.23279.4 + 8.0.0-beta.23279.4 + 2.5.1-beta.23279.4 + 8.0.0-beta.23279.4 + 8.0.0-beta.23279.4 + 8.0.0-beta.23279.4 + 8.0.0-beta.23279.4 + 8.0.0-beta.23279.4 + 8.0.0-beta.23279.4 + 8.0.0-beta.23279.4 + 8.0.0-beta.23279.4 + 8.0.0-beta.23279.4 6.0.0-preview.1.102 diff --git a/global.json b/global.json index fed8da3587b37d..caae613b12e5bd 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.4.23260.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23279.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23279.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23279.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23279.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23279.4", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23279.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.5.23251.1" From 34535af2387a669e0e36acfc98d2c7a3954223d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 May 2023 18:17:19 +0000 Subject: [PATCH 09/10] Update dependencies from https://github.com/dotnet/arcade build 20230530.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23280.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- global.json | 6 ++-- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c08e928d6fdd07..92a9b3ed792122 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d @@ -122,69 +122,69 @@ a8431741d7de7531e4268a8eeb6871fb48b62a43 - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d https://github.com/dotnet/runtime-assets @@ -315,9 +315,9 @@ https://github.com/dotnet/xharness aa434d0c7e6eb46df1ec11b3c63add37d835c4d0 - + https://github.com/dotnet/arcade - 998d84a61e745ac6e0268d37baef10fa0043d06f + affe3f66d36e48946fd59ac9fa31b004cb558e7d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 73b692de53f0c2..a1a487897ce7ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23279.4 - 8.0.0-beta.23279.4 - 8.0.0-beta.23279.4 - 8.0.0-beta.23279.4 - 8.0.0-beta.23279.4 - 2.5.1-beta.23279.4 - 8.0.0-beta.23279.4 - 8.0.0-beta.23279.4 - 8.0.0-beta.23279.4 - 8.0.0-beta.23279.4 - 8.0.0-beta.23279.4 - 8.0.0-beta.23279.4 - 8.0.0-beta.23279.4 - 8.0.0-beta.23279.4 - 8.0.0-beta.23279.4 + 8.0.0-beta.23280.1 + 8.0.0-beta.23280.1 + 8.0.0-beta.23280.1 + 8.0.0-beta.23280.1 + 8.0.0-beta.23280.1 + 2.5.1-beta.23280.1 + 8.0.0-beta.23280.1 + 8.0.0-beta.23280.1 + 8.0.0-beta.23280.1 + 8.0.0-beta.23280.1 + 8.0.0-beta.23280.1 + 8.0.0-beta.23280.1 + 8.0.0-beta.23280.1 + 8.0.0-beta.23280.1 + 8.0.0-beta.23280.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index caae613b12e5bd..16577825c34602 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.4.23260.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23279.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23279.4", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23279.4", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23280.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23280.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23280.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.5.23251.1" From d2e32d6477f1339d4aa21787c3893a9579fa00e7 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 30 May 2023 20:46:29 +0200 Subject: [PATCH 10/10] Remove duplicate package references --- .../ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj | 1 - .../ILCompiler.TypeSystem.Tests.csproj | 1 - 2 files changed, 2 deletions(-) diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj b/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj index 3ddbde70bd2f08..4512bbfd88e7d0 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj +++ b/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj @@ -17,7 +17,6 @@ - diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj index 1f6b33ff18ba39..d62215c7901a56 100644 --- a/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj +++ b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj @@ -20,7 +20,6 @@ -