From 7e36c87b30bac69464f9029b13629450fa2fdd05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Jun 2023 12:18:12 +0000 Subject: [PATCH 01/10] Update dependencies from https://github.com/dotnet/arcade build 20230531.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23281.3 --- eng/Version.Details.xml | 20 ++++++++++---------- 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 ++-- 6 files changed, 29 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16dc3ad4e..f7c4a1a6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 + 4b21797cb317811358903666286e8d1873cc2c24 - + https://github.com/dotnet/arcade - 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 + 4b21797cb317811358903666286e8d1873cc2c24 - + https://github.com/dotnet/arcade - 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 + 4b21797cb317811358903666286e8d1873cc2c24 - + https://github.com/dotnet/arcade - 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 + 4b21797cb317811358903666286e8d1873cc2c24 - + https://github.com/dotnet/arcade - 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 + 4b21797cb317811358903666286e8d1873cc2c24 https://github.com/dotnet/arcade-services diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index e10a59687..6c4ac6fec 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 44ad26abf..e20ee3a98 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 a97a185a3..110052183 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 38cf94ff8..ffe0b4e2d 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 5f921cf89..f569d70bd 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "allowPrerelease": true }, "tools": { - "dotnet": "8.0.100-preview.3.23178.7", + "dotnet": "8.0.100-preview.4.23260.5", "runtimes": { "dotnet": [ "6.0.0" @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23265.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23281.3" } } From d443173f1b489e40e1b00ab8095c074a83746e46 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 3 Jun 2023 12:23:43 +0000 Subject: [PATCH 02/10] Update dependencies from https://github.com/dotnet/arcade build 20230602.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23302.3 --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7c4a1a6d..254b65e37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 4b21797cb317811358903666286e8d1873cc2c24 + 234e0726c7384ee84bf08550f2d16a1ff2d5c543 - + https://github.com/dotnet/arcade - 4b21797cb317811358903666286e8d1873cc2c24 + 234e0726c7384ee84bf08550f2d16a1ff2d5c543 - + https://github.com/dotnet/arcade - 4b21797cb317811358903666286e8d1873cc2c24 + 234e0726c7384ee84bf08550f2d16a1ff2d5c543 - + https://github.com/dotnet/arcade - 4b21797cb317811358903666286e8d1873cc2c24 + 234e0726c7384ee84bf08550f2d16a1ff2d5c543 - + https://github.com/dotnet/arcade - 4b21797cb317811358903666286e8d1873cc2c24 + 234e0726c7384ee84bf08550f2d16a1ff2d5c543 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index f569d70bd..7e7184e7d 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23281.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23302.3" } } From 933d954853384340be7c0b65d9a645aee49a61e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jun 2023 12:22:07 +0000 Subject: [PATCH 03/10] Update dependencies from https://github.com/dotnet/arcade build 20230607.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23307.2 --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 254b65e37..ffac379f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + a178d756de78f9fd55339cb92665e791a3ba6535 - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + a178d756de78f9fd55339cb92665e791a3ba6535 - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + a178d756de78f9fd55339cb92665e791a3ba6535 - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + a178d756de78f9fd55339cb92665e791a3ba6535 - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + a178d756de78f9fd55339cb92665e791a3ba6535 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 7e7184e7d..9607ca506 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23302.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23307.2" } } From de5ca565fe2541545b5a32af1d7e9aaded23c38c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Jun 2023 12:19:57 +0000 Subject: [PATCH 04/10] Update dependencies from https://github.com/dotnet/arcade build 20230608.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23308.2 --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffac379f6..7b1f7376b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - a178d756de78f9fd55339cb92665e791a3ba6535 + 1205248d5cc014b68c2fb8cfbf091a77aa433453 - + https://github.com/dotnet/arcade - a178d756de78f9fd55339cb92665e791a3ba6535 + 1205248d5cc014b68c2fb8cfbf091a77aa433453 - + https://github.com/dotnet/arcade - a178d756de78f9fd55339cb92665e791a3ba6535 + 1205248d5cc014b68c2fb8cfbf091a77aa433453 - + https://github.com/dotnet/arcade - a178d756de78f9fd55339cb92665e791a3ba6535 + 1205248d5cc014b68c2fb8cfbf091a77aa433453 - + https://github.com/dotnet/arcade - a178d756de78f9fd55339cb92665e791a3ba6535 + 1205248d5cc014b68c2fb8cfbf091a77aa433453 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 9607ca506..0a22695b2 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23307.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23308.2" } } From ef45c7abd8514ba6985037445d6ded529da3d91a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 Jun 2023 12:20:06 +0000 Subject: [PATCH 05/10] Update dependencies from https://github.com/dotnet/arcade build 20230609.8 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23309.8 --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b1f7376b..08b999ac5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 1205248d5cc014b68c2fb8cfbf091a77aa433453 + 9994c5ed43856c35591d94ead68ef501a020eb2e - + https://github.com/dotnet/arcade - 1205248d5cc014b68c2fb8cfbf091a77aa433453 + 9994c5ed43856c35591d94ead68ef501a020eb2e - + https://github.com/dotnet/arcade - 1205248d5cc014b68c2fb8cfbf091a77aa433453 + 9994c5ed43856c35591d94ead68ef501a020eb2e - + https://github.com/dotnet/arcade - 1205248d5cc014b68c2fb8cfbf091a77aa433453 + 9994c5ed43856c35591d94ead68ef501a020eb2e - + https://github.com/dotnet/arcade - 1205248d5cc014b68c2fb8cfbf091a77aa433453 + 9994c5ed43856c35591d94ead68ef501a020eb2e https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 0a22695b2..eedeb248b 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23308.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23309.8" } } From f66b5b51d81294c3ec81366988bdde3233678db6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jun 2023 12:16:30 +0000 Subject: [PATCH 06/10] Update dependencies from https://github.com/dotnet/arcade build 20230613.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23313.6 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08b999ac5..36d7d316c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 9994c5ed43856c35591d94ead68ef501a020eb2e + 74bd8c5340936e8125d1ed89d38817bc06646450 - + https://github.com/dotnet/arcade - 9994c5ed43856c35591d94ead68ef501a020eb2e + 74bd8c5340936e8125d1ed89d38817bc06646450 - + https://github.com/dotnet/arcade - 9994c5ed43856c35591d94ead68ef501a020eb2e + 74bd8c5340936e8125d1ed89d38817bc06646450 - + https://github.com/dotnet/arcade - 9994c5ed43856c35591d94ead68ef501a020eb2e + 74bd8c5340936e8125d1ed89d38817bc06646450 - + https://github.com/dotnet/arcade - 9994c5ed43856c35591d94ead68ef501a020eb2e + 74bd8c5340936e8125d1ed89d38817bc06646450 https://github.com/dotnet/arcade-services diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index ffe0b4e2d..c9eced9f7 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 eedeb248b..2a72f0664 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "allowPrerelease": true }, "tools": { - "dotnet": "8.0.100-preview.4.23260.5", + "dotnet": "8.0.100-preview.5.23303.2", "runtimes": { "dotnet": [ "6.0.0" @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23309.8" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23313.6" } } From 487fed822dbcb256bfd27de694614d6566006abd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 12:15:04 +0000 Subject: [PATCH 07/10] Update dependencies from https://github.com/dotnet/arcade build 20230614.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23314.1 --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36d7d316c..0db540732 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 74bd8c5340936e8125d1ed89d38817bc06646450 + c27937680063bcf06804c9fd0466d26a0f9ea4e6 - + https://github.com/dotnet/arcade - 74bd8c5340936e8125d1ed89d38817bc06646450 + c27937680063bcf06804c9fd0466d26a0f9ea4e6 - + https://github.com/dotnet/arcade - 74bd8c5340936e8125d1ed89d38817bc06646450 + c27937680063bcf06804c9fd0466d26a0f9ea4e6 - + https://github.com/dotnet/arcade - 74bd8c5340936e8125d1ed89d38817bc06646450 + c27937680063bcf06804c9fd0466d26a0f9ea4e6 - + https://github.com/dotnet/arcade - 74bd8c5340936e8125d1ed89d38817bc06646450 + c27937680063bcf06804c9fd0466d26a0f9ea4e6 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 2a72f0664..28cfa26a4 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23313.6" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23314.1" } } From 17c966b73d9ce547a73259a18fd328b20e490eb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 Jun 2023 12:18:05 +0000 Subject: [PATCH 08/10] Update dependencies from https://github.com/dotnet/arcade build 20230616.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23316.6 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/dotnet-install.sh | 4 ++++ global.json | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0db540732..f31511ea7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - c27937680063bcf06804c9fd0466d26a0f9ea4e6 + e2334b2be36919347923d0ec872a46acddb1e385 - + https://github.com/dotnet/arcade - c27937680063bcf06804c9fd0466d26a0f9ea4e6 + e2334b2be36919347923d0ec872a46acddb1e385 - + https://github.com/dotnet/arcade - c27937680063bcf06804c9fd0466d26a0f9ea4e6 + e2334b2be36919347923d0ec872a46acddb1e385 - + https://github.com/dotnet/arcade - c27937680063bcf06804c9fd0466d26a0f9ea4e6 + e2334b2be36919347923d0ec872a46acddb1e385 - + https://github.com/dotnet/arcade - c27937680063bcf06804c9fd0466d26a0f9ea4e6 + e2334b2be36919347923d0ec872a46acddb1e385 https://github.com/dotnet/arcade-services diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index abd045a32..7e69e3a9e 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -54,6 +54,10 @@ cpuname=$(uname -m) case $cpuname in arm64|aarch64) buildarch=arm64 + if [ "$(getconf LONG_BIT)" -lt 64 ]; then + # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS) + buildarch=arm + fi ;; loongarch64) buildarch=loongarch64 diff --git a/global.json b/global.json index 28cfa26a4..5b4a4ca13 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23314.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23316.6" } } From 8fcc14911f9ab1aca542b4512a4e789697d8f4e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Jun 2023 12:17:40 +0000 Subject: [PATCH 09/10] Update dependencies from https://github.com/dotnet/arcade build 20230619.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23319.3 --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f31511ea7..ad66a961a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - e2334b2be36919347923d0ec872a46acddb1e385 + a7352a700a522e0d1c3e65ec4cbe5df238d60f92 - + https://github.com/dotnet/arcade - e2334b2be36919347923d0ec872a46acddb1e385 + a7352a700a522e0d1c3e65ec4cbe5df238d60f92 - + https://github.com/dotnet/arcade - e2334b2be36919347923d0ec872a46acddb1e385 + a7352a700a522e0d1c3e65ec4cbe5df238d60f92 - + https://github.com/dotnet/arcade - e2334b2be36919347923d0ec872a46acddb1e385 + a7352a700a522e0d1c3e65ec4cbe5df238d60f92 - + https://github.com/dotnet/arcade - e2334b2be36919347923d0ec872a46acddb1e385 + a7352a700a522e0d1c3e65ec4cbe5df238d60f92 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 5b4a4ca13..97d41b48c 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23316.6" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23319.3" } } From a76fc92fee777a20087b1b8a92ff3ecf52fd31bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Jun 2023 12:15:27 +0000 Subject: [PATCH 10/10] Update dependencies from https://github.com/dotnet/arcade build 20230620.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23320.3 --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad66a961a..bad2271f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - a7352a700a522e0d1c3e65ec4cbe5df238d60f92 + 06d73ccc1f421af06c2794741a9913f474f66b3d - + https://github.com/dotnet/arcade - a7352a700a522e0d1c3e65ec4cbe5df238d60f92 + 06d73ccc1f421af06c2794741a9913f474f66b3d - + https://github.com/dotnet/arcade - a7352a700a522e0d1c3e65ec4cbe5df238d60f92 + 06d73ccc1f421af06c2794741a9913f474f66b3d - + https://github.com/dotnet/arcade - a7352a700a522e0d1c3e65ec4cbe5df238d60f92 + 06d73ccc1f421af06c2794741a9913f474f66b3d - + https://github.com/dotnet/arcade - a7352a700a522e0d1c3e65ec4cbe5df238d60f92 + 06d73ccc1f421af06c2794741a9913f474f66b3d https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 97d41b48c..14b44010a 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23319.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23320.3" } }