From a0c50cddfeb92a82e49180a6f238316ab47ca41b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 May 2023 12:09:54 +0000 Subject: [PATCH 1/8] Update dependencies from https://github.com/dotnet/arcade build 20230519.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 8.0.0-beta.23262.5 -> To Version 8.0.0-beta.23269.2 Dependency coherency updates Microsoft.SourceLink.GitHub From Version 8.0.0-beta.23218.3 -> To Version 8.0.0-beta.23252.2 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86a3dd8cc8f9..68e66bc19a1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -330,31 +330,31 @@ https://github.com/dotnet/runtime 6fd40193b9e8b9c5028edf741f266ff01bc75636 - + https://github.com/dotnet/arcade - 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/sourcelink - 47c52dd2ebf9edfd40abdcff999c13eb461f6ce2 + 54eb3b811c57f5e94617d31a102fc9cb664ccdd5 - + https://github.com/dotnet/arcade - 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + 792c346a52b2388152c2fad6f626b88ed8736d6f - + https://github.com/dotnet/arcade - 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + 792c346a52b2388152c2fad6f626b88ed8736d6f https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 4e70a4b85475..7f7e11909a34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,11 +146,11 @@ 6.2.2 6.2.2 - 8.0.0-beta.23262.5 - 8.0.0-beta.23262.5 - 8.0.0-beta.23262.5 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 + 8.0.0-beta.23269.2 - 8.0.0-beta.23218.3 + 8.0.0-beta.23252.2 8.0.0-alpha.1.23262.1 diff --git a/global.json b/global.json index 6cd31d7e099b..88d6e6daaba1 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23262.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23262.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23269.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23269.2" } } From 44cfc5aba19f8327c181291eb96032ee7f635062 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 May 2023 16:59:27 +0000 Subject: [PATCH 2/8] Update dependencies from https://github.com/dotnet/arcade build 20230525.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 8.0.0-beta.23262.5 -> To Version 8.0.0-beta.23275.2 Dependency coherency updates Microsoft.SourceLink.GitHub From Version 8.0.0-beta.23218.3 -> To Version 8.0.0-beta.23252.2 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 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 | 4 ++-- 7 files changed, 32 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68e66bc19a1e..c0a3ee0670c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -330,9 +330,9 @@ https://github.com/dotnet/runtime 6fd40193b9e8b9c5028edf741f266ff01bc75636 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 @@ -340,21 +340,21 @@ 54eb3b811c57f5e94617d31a102fc9cb664ccdd5 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 7f7e11909a34..0aa07009c4e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,9 +146,9 @@ 6.2.2 6.2.2 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 - 8.0.0-beta.23269.2 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 + 8.0.0-beta.23275.2 8.0.0-beta.23252.2 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index e10a59687974..6c4ac6fec1a9 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 44ad26abf54b..e20ee3a983cb 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 a97a185a367a..1100521834a9 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 38cf94ff88c6..ffe0b4e2dfc4 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 88d6e6daaba1..bcee8bae931b 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23269.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23269.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23275.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23275.2" } } From bce3b77d3c4235db544af7bba6bbe6f0f53955fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 May 2023 12:10:07 +0000 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/arcade build 20230529.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 8.0.0-beta.23262.5 -> To Version 8.0.0-beta.23279.1 Dependency coherency updates Microsoft.SourceLink.GitHub From Version 8.0.0-beta.23218.3 -> To Version 8.0.0-beta.23252.2 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0a3ee0670c1..f8de5d3e1cec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -330,9 +330,9 @@ https://github.com/dotnet/runtime 6fd40193b9e8b9c5028edf741f266ff01bc75636 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 174c08a43b26fc26ba98975065f1125f910f5c37 @@ -340,21 +340,21 @@ 54eb3b811c57f5e94617d31a102fc9cb664ccdd5 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 174c08a43b26fc26ba98975065f1125f910f5c37 - + https://github.com/dotnet/arcade - 11f0a1ba05f4d3896a9cd9e6b28154c327bd3246 + 174c08a43b26fc26ba98975065f1125f910f5c37 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 0aa07009c4e1..7847181c8b77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,9 +146,9 @@ 6.2.2 6.2.2 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 - 8.0.0-beta.23275.2 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 + 8.0.0-beta.23279.1 8.0.0-beta.23252.2 diff --git a/global.json b/global.json index bcee8bae931b..5237915b71d7 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23275.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23275.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23279.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23279.1" } } From 266dc395b21050d204f5578305f240b0ac5caf03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Thu, 1 Jun 2023 11:17:30 -0700 Subject: [PATCH 4/8] Update SDK --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 5237915b71d7..9866cb63287a 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "8.0.100-preview.5.23257.1" + "version": "8.0.100-preview.6.23301.4" }, "tools": { - "dotnet": "8.0.100-preview.5.23257.1", + "dotnet": "8.0.100-preview.6.23301.4", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" From 1d55e4d58af4014cbeeb6a8eb64fc4a056e5e258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Fri, 2 Jun 2023 15:37:49 -0700 Subject: [PATCH 5/8] Update global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 9866cb63287a..c286cc344aa3 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "8.0.100-preview.6.23301.4" + "version": "8.0.100-preview.5.23275.15" }, "tools": { - "dotnet": "8.0.100-preview.6.23301.4", + "dotnet": "8.0.100-preview.5.23275.15", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" From 40392903f9174d76231c270404d9787157396e88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Jun 2023 12:09:59 +0000 Subject: [PATCH 6/8] Update dependencies from https://github.com/dotnet/arcade build 20230602.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 8.0.0-beta.23262.5 -> To Version 8.0.0-beta.23302.3 Dependency coherency updates Microsoft.SourceLink.GitHub From Version 8.0.0-beta.23218.3 -> To Version 8.0.0-beta.23252.2 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20552d5b8df4..c8b832192be1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -359,9 +359,9 @@ https://github.com/dotnet/runtime bf7fb2ecbf69deb6a73bb8bbca1e56e7beec8d8a - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 234e0726c7384ee84bf08550f2d16a1ff2d5c543 @@ -369,21 +369,21 @@ 54eb3b811c57f5e94617d31a102fc9cb664ccdd5 - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 234e0726c7384ee84bf08550f2d16a1ff2d5c543 - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 234e0726c7384ee84bf08550f2d16a1ff2d5c543 - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 234e0726c7384ee84bf08550f2d16a1ff2d5c543 - + https://github.com/dotnet/arcade - 174c08a43b26fc26ba98975065f1125f910f5c37 + 234e0726c7384ee84bf08550f2d16a1ff2d5c543 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 1593e7fbbe5b..6627da3edb91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,9 +154,9 @@ 6.2.2 6.2.2 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 - 8.0.0-beta.23279.1 + 8.0.0-beta.23302.3 + 8.0.0-beta.23302.3 + 8.0.0-beta.23302.3 8.0.0-beta.23252.2 diff --git a/global.json b/global.json index c286cc344aa3..7044353b69d6 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23279.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23279.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23302.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23302.3" } } From afacc0576139b2b6da74926627736f7d1407a143 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Jun 2023 12:10:54 +0000 Subject: [PATCH 7/8] Update dependencies from https://github.com/dotnet/arcade build 20230609.8 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 8.0.0-beta.23262.5 -> To Version 8.0.0-beta.23309.8 Dependency coherency updates Microsoft.SourceLink.GitHub From Version 8.0.0-beta.23218.3 -> To Version 8.0.0-beta.23252.2 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8b832192be1..60c3276b28d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -359,9 +359,9 @@ https://github.com/dotnet/runtime bf7fb2ecbf69deb6a73bb8bbca1e56e7beec8d8a - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + 9994c5ed43856c35591d94ead68ef501a020eb2e @@ -369,21 +369,21 @@ 54eb3b811c57f5e94617d31a102fc9cb664ccdd5 - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + 9994c5ed43856c35591d94ead68ef501a020eb2e - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + 9994c5ed43856c35591d94ead68ef501a020eb2e - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + 9994c5ed43856c35591d94ead68ef501a020eb2e - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + 9994c5ed43856c35591d94ead68ef501a020eb2e https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 6627da3edb91..d11bf5653db5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,9 +154,9 @@ 6.2.2 6.2.2 - 8.0.0-beta.23302.3 - 8.0.0-beta.23302.3 - 8.0.0-beta.23302.3 + 8.0.0-beta.23309.8 + 8.0.0-beta.23309.8 + 8.0.0-beta.23309.8 8.0.0-beta.23252.2 diff --git a/global.json b/global.json index 142a81771ed2..fc1eed99c138 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23302.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23302.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23309.8", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23309.8" } } From 2f0b3a1eb473d60c1abd8662931058e4b7e3a51c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jun 2023 20:26:32 +0000 Subject: [PATCH 8/8] Update dependencies from https://github.com/dotnet/arcade build 20230612.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 8.0.0-beta.23262.5 -> To Version 8.0.0-beta.23312.4 Dependency coherency updates Microsoft.SourceLink.GitHub From Version 8.0.0-beta.23218.3 -> To Version 8.0.0-beta.23309.3 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60c3276b28d3..ebe6624a7001 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -359,31 +359,31 @@ https://github.com/dotnet/runtime bf7fb2ecbf69deb6a73bb8bbca1e56e7beec8d8a - + https://github.com/dotnet/arcade - 9994c5ed43856c35591d94ead68ef501a020eb2e + f3952775e6d00a5b6f43b0615a8a766e095185eb - + https://github.com/dotnet/sourcelink - 54eb3b811c57f5e94617d31a102fc9cb664ccdd5 + 23bda65700e70b6697390dcc4e0f87e2dfbce63a - + https://github.com/dotnet/arcade - 9994c5ed43856c35591d94ead68ef501a020eb2e + f3952775e6d00a5b6f43b0615a8a766e095185eb - + https://github.com/dotnet/arcade - 9994c5ed43856c35591d94ead68ef501a020eb2e + f3952775e6d00a5b6f43b0615a8a766e095185eb - + https://github.com/dotnet/arcade - 9994c5ed43856c35591d94ead68ef501a020eb2e + f3952775e6d00a5b6f43b0615a8a766e095185eb - + https://github.com/dotnet/arcade - 9994c5ed43856c35591d94ead68ef501a020eb2e + f3952775e6d00a5b6f43b0615a8a766e095185eb https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index d11bf5653db5..346edf31fac1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,11 +154,11 @@ 6.2.2 6.2.2 - 8.0.0-beta.23309.8 - 8.0.0-beta.23309.8 - 8.0.0-beta.23309.8 + 8.0.0-beta.23312.4 + 8.0.0-beta.23312.4 + 8.0.0-beta.23312.4 - 8.0.0-beta.23252.2 + 8.0.0-beta.23309.3 8.0.0-alpha.1.23274.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index ffe0b4e2dfc4..c9eced9f7df4 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,7 +379,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } # Minimum VS version to require. - $vsMinVersionReqdStr = '16.8' + $vsMinVersionReqdStr = '17.6' $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr) # If the version of msbuild is going to be xcopied, diff --git a/global.json b/global.json index fc1eed99c138..7089e5870f56 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23309.8", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23309.8" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23312.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23312.4" } }