From 18f1ba044b8da615b79ea01fcfd58177f7ea3880 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jun 2023 12:16:50 +0000 Subject: [PATCH 001/117] 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 ++++++++++---------- eng/common/dotnet-install.sh | 4 ++++ 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 | 6 +++--- global.json | 4 ++-- 7 files changed, 34 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16dc3ad4e..bad2271f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 + 06d73ccc1f421af06c2794741a9913f474f66b3d - + https://github.com/dotnet/arcade - 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 + 06d73ccc1f421af06c2794741a9913f474f66b3d - + https://github.com/dotnet/arcade - 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 + 06d73ccc1f421af06c2794741a9913f474f66b3d - + https://github.com/dotnet/arcade - 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 + 06d73ccc1f421af06c2794741a9913f474f66b3d - + https://github.com/dotnet/arcade - 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 + 06d73ccc1f421af06c2794741a9913f474f66b3d 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/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..c9eced9f7 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,13 +379,13 @@ 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, # 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..14b44010a 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.5.23303.2", "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.23320.3" } } From 85d63717a48476f9e7835267fd64e51bd4ff740a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Jun 2023 12:15:32 +0000 Subject: [PATCH 002/117] Update dependencies from https://github.com/dotnet/arcade build 20230622.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.23322.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 bad2271f8..afc324fa5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 06d73ccc1f421af06c2794741a9913f474f66b3d + 9747cf5ac4abb6a5a13cf31fa78b91d599180e07 - + https://github.com/dotnet/arcade - 06d73ccc1f421af06c2794741a9913f474f66b3d + 9747cf5ac4abb6a5a13cf31fa78b91d599180e07 - + https://github.com/dotnet/arcade - 06d73ccc1f421af06c2794741a9913f474f66b3d + 9747cf5ac4abb6a5a13cf31fa78b91d599180e07 - + https://github.com/dotnet/arcade - 06d73ccc1f421af06c2794741a9913f474f66b3d + 9747cf5ac4abb6a5a13cf31fa78b91d599180e07 - + https://github.com/dotnet/arcade - 06d73ccc1f421af06c2794741a9913f474f66b3d + 9747cf5ac4abb6a5a13cf31fa78b91d599180e07 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 14b44010a..42f7add51 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23320.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23322.2" } } From 146c94b0e0649b62b7d476daff09f477a6cd1087 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jun 2023 12:20:50 +0000 Subject: [PATCH 003/117] Update dependencies from https://github.com/dotnet/arcade build 20230626.5 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.23326.5 --- 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 afc324fa5..fc531a71f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 9747cf5ac4abb6a5a13cf31fa78b91d599180e07 + c0e0c6d3e5b5fd90084486f11f0a7cb3d4577e4f - + https://github.com/dotnet/arcade - 9747cf5ac4abb6a5a13cf31fa78b91d599180e07 + c0e0c6d3e5b5fd90084486f11f0a7cb3d4577e4f - + https://github.com/dotnet/arcade - 9747cf5ac4abb6a5a13cf31fa78b91d599180e07 + c0e0c6d3e5b5fd90084486f11f0a7cb3d4577e4f - + https://github.com/dotnet/arcade - 9747cf5ac4abb6a5a13cf31fa78b91d599180e07 + c0e0c6d3e5b5fd90084486f11f0a7cb3d4577e4f - + https://github.com/dotnet/arcade - 9747cf5ac4abb6a5a13cf31fa78b91d599180e07 + c0e0c6d3e5b5fd90084486f11f0a7cb3d4577e4f https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 42f7add51..55a9e7255 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23322.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23326.5" } } From d633189a0a8283451d8f62b920a1e1990f125e1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Jun 2023 12:19:53 +0000 Subject: [PATCH 004/117] Update dependencies from https://github.com/dotnet/arcade build 20230627.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.23327.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 fc531a71f..6a2511c23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - c0e0c6d3e5b5fd90084486f11f0a7cb3d4577e4f + e7302feb026ccd0d7855023b58c6ab41e37d7e7c - + https://github.com/dotnet/arcade - c0e0c6d3e5b5fd90084486f11f0a7cb3d4577e4f + e7302feb026ccd0d7855023b58c6ab41e37d7e7c - + https://github.com/dotnet/arcade - c0e0c6d3e5b5fd90084486f11f0a7cb3d4577e4f + e7302feb026ccd0d7855023b58c6ab41e37d7e7c - + https://github.com/dotnet/arcade - c0e0c6d3e5b5fd90084486f11f0a7cb3d4577e4f + e7302feb026ccd0d7855023b58c6ab41e37d7e7c - + https://github.com/dotnet/arcade - c0e0c6d3e5b5fd90084486f11f0a7cb3d4577e4f + e7302feb026ccd0d7855023b58c6ab41e37d7e7c https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 55a9e7255..a769392cf 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23326.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23327.3" } } From b265b2b3df0f760e2312a1c19734fe3a7a4a6a1c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Jun 2023 12:20:31 +0000 Subject: [PATCH 005/117] Update dependencies from https://github.com/dotnet/arcade build 20230628.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.23328.2 --- eng/Version.Details.xml | 20 +++++------ eng/common/sdl/configure-sdl-tool.ps1 | 40 ++++++++++++++-------- eng/common/sdl/execute-all-sdl-tools.ps1 | 4 ++- eng/common/templates/steps/execute-sdl.yml | 2 +- global.json | 2 +- 5 files changed, 41 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a2511c23..e928397a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - e7302feb026ccd0d7855023b58c6ab41e37d7e7c + 8ac0e1280f04bc897998a1f33bf6f27fe2146561 - + https://github.com/dotnet/arcade - e7302feb026ccd0d7855023b58c6ab41e37d7e7c + 8ac0e1280f04bc897998a1f33bf6f27fe2146561 - + https://github.com/dotnet/arcade - e7302feb026ccd0d7855023b58c6ab41e37d7e7c + 8ac0e1280f04bc897998a1f33bf6f27fe2146561 - + https://github.com/dotnet/arcade - e7302feb026ccd0d7855023b58c6ab41e37d7e7c + 8ac0e1280f04bc897998a1f33bf6f27fe2146561 - + https://github.com/dotnet/arcade - e7302feb026ccd0d7855023b58c6ab41e37d7e7c + 8ac0e1280f04bc897998a1f33bf6f27fe2146561 https://github.com/dotnet/arcade-services diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1 index bdbf49e6c..ee9eb8933 100644 --- a/eng/common/sdl/configure-sdl-tool.ps1 +++ b/eng/common/sdl/configure-sdl-tool.ps1 @@ -17,7 +17,9 @@ Param( # Optional: Additional params to add to any tool using PoliCheck. [string[]] $PoliCheckAdditionalRunConfigParams, # Optional: Additional params to add to any tool using CodeQL/Semmle. - [string[]] $CodeQLAdditionalRunConfigParams + [string[]] $CodeQLAdditionalRunConfigParams, + # Optional: Additional params to add to any tool using Binskim. + [string[]] $BinskimAdditionalRunConfigParams ) $ErrorActionPreference = 'Stop' @@ -69,22 +71,32 @@ try { $gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig" # For some tools, add default and automatic args. - if ($tool.Name -eq 'credscan') { - if ($targetDirectory) { - $tool.Args += "`"TargetDirectory < $TargetDirectory`"" + switch -Exact ($tool.Name) { + 'credscan' { + if ($targetDirectory) { + $tool.Args += "`"TargetDirectory < $TargetDirectory`"" + } + $tool.Args += "`"OutputType < pre`"" + $tool.Args += $CrScanAdditionalRunConfigParams } - $tool.Args += "`"OutputType < pre`"" - $tool.Args += $CrScanAdditionalRunConfigParams - } elseif ($tool.Name -eq 'policheck') { - if ($targetDirectory) { - $tool.Args += "`"Target < $TargetDirectory`"" + 'policheck' { + if ($targetDirectory) { + $tool.Args += "`"Target < $TargetDirectory`"" + } + $tool.Args += $PoliCheckAdditionalRunConfigParams } - $tool.Args += $PoliCheckAdditionalRunConfigParams - } elseif ($tool.Name -eq 'semmle' -or $tool.Name -eq 'codeql') { - if ($targetDirectory) { - $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`"" + {$_ -in 'semmle', 'codeql'} { + if ($targetDirectory) { + $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`"" + } + $tool.Args += $CodeQLAdditionalRunConfigParams + } + 'binskim' { + if ($targetDirectory) { + $tool.Args += "`"Target < $TargetDirectory`"" + } + $tool.Args += $BinskimAdditionalRunConfigParams } - $tool.Args += $CodeQLAdditionalRunConfigParams } # Create variable pointing to the args array directly so we can use splat syntax later. diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 4797e012c..4715d75e9 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -35,6 +35,7 @@ Param( [string[]] $CrScanAdditionalRunConfigParams, # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1") [string[]] $PoliCheckAdditionalRunConfigParams, # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1") [string[]] $CodeQLAdditionalRunConfigParams, # Optional: Additional Params to custom build a Semmle/CodeQL run config in the format @("xyz < abc","sdf < 1") + [string[]] $BinskimAdditionalRunConfigParams, # Optional: Additional Params to custom build a Binskim run config in the format @("xyz < abc","sdf < 1") [bool] $BreakOnFailure=$False # Optional: Fail the build if there were errors during the run ) @@ -107,7 +108,8 @@ try { -GuardianLoggerLevel $GuardianLoggerLevel ` -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams ` -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams ` - -CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams + -CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams ` + -BinskimAdditionalRunConfigParams $BinskimAdditionalRunConfigParams if ($BreakOnFailure) { Exit-IfNZEC "Sdl" } diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 9dd5709f6..07426fde0 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -33,7 +33,7 @@ steps: - ${{ if ne(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} - displayName: Execute SDL + displayName: Execute SDL (Overridden) continueOnError: ${{ parameters.sdlContinueOnError }} condition: ${{ parameters.condition }} diff --git a/global.json b/global.json index a769392cf..31664b0f5 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23327.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23328.2" } } From 2961aa79cd82b8a4091e93138ecd76a99de92235 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 30 Jun 2023 12:19:47 +0000 Subject: [PATCH 006/117] Update dependencies from https://github.com/dotnet/arcade build 20230629.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.23329.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 e928397a4..e7ce04017 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 3f47191cc250c6cf7c1861079a2ee2f8c0fcc21b - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 3f47191cc250c6cf7c1861079a2ee2f8c0fcc21b - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 3f47191cc250c6cf7c1861079a2ee2f8c0fcc21b - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 3f47191cc250c6cf7c1861079a2ee2f8c0fcc21b - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 3f47191cc250c6cf7c1861079a2ee2f8c0fcc21b https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 31664b0f5..87db8778a 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23328.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23329.1" } } From 84ceab0f7b8869bf29aa6a9deeec10b9c1ac680d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 Jul 2023 12:19:13 +0000 Subject: [PATCH 007/117] Update dependencies from https://github.com/dotnet/arcade build 20230630.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.23330.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 e7ce04017..044d7e373 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 3f47191cc250c6cf7c1861079a2ee2f8c0fcc21b + 9fc23a576f443284d25cd4311f5778158ad289c9 - + https://github.com/dotnet/arcade - 3f47191cc250c6cf7c1861079a2ee2f8c0fcc21b + 9fc23a576f443284d25cd4311f5778158ad289c9 - + https://github.com/dotnet/arcade - 3f47191cc250c6cf7c1861079a2ee2f8c0fcc21b + 9fc23a576f443284d25cd4311f5778158ad289c9 - + https://github.com/dotnet/arcade - 3f47191cc250c6cf7c1861079a2ee2f8c0fcc21b + 9fc23a576f443284d25cd4311f5778158ad289c9 - + https://github.com/dotnet/arcade - 3f47191cc250c6cf7c1861079a2ee2f8c0fcc21b + 9fc23a576f443284d25cd4311f5778158ad289c9 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 87db8778a..882d02e0b 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23329.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23330.1" } } From 2aa26748aa6d01fa7aa4f95e0ac9a6b2de0ca6c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jul 2023 12:19:15 +0000 Subject: [PATCH 008/117] Update dependencies from https://github.com/dotnet/arcade build 20230703.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.23353.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 044d7e373..c3be025b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 9fc23a576f443284d25cd4311f5778158ad289c9 + e4bd767159fde419b50dd54c6d83e1ef970a68d0 - + https://github.com/dotnet/arcade - 9fc23a576f443284d25cd4311f5778158ad289c9 + e4bd767159fde419b50dd54c6d83e1ef970a68d0 - + https://github.com/dotnet/arcade - 9fc23a576f443284d25cd4311f5778158ad289c9 + e4bd767159fde419b50dd54c6d83e1ef970a68d0 - + https://github.com/dotnet/arcade - 9fc23a576f443284d25cd4311f5778158ad289c9 + e4bd767159fde419b50dd54c6d83e1ef970a68d0 - + https://github.com/dotnet/arcade - 9fc23a576f443284d25cd4311f5778158ad289c9 + e4bd767159fde419b50dd54c6d83e1ef970a68d0 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 882d02e0b..767b63a9f 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23330.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23353.2" } } From ea1d9906b3e0544801a35e6390796600d7d93f0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jul 2023 12:18:56 +0000 Subject: [PATCH 009/117] Update dependencies from https://github.com/dotnet/arcade build 20230706.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.23356.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 c3be025b3..f71f728a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - e4bd767159fde419b50dd54c6d83e1ef970a68d0 + 28209139ee0e4b7c5b3dbfe74e30c6de8399189e - + https://github.com/dotnet/arcade - e4bd767159fde419b50dd54c6d83e1ef970a68d0 + 28209139ee0e4b7c5b3dbfe74e30c6de8399189e - + https://github.com/dotnet/arcade - e4bd767159fde419b50dd54c6d83e1ef970a68d0 + 28209139ee0e4b7c5b3dbfe74e30c6de8399189e - + https://github.com/dotnet/arcade - e4bd767159fde419b50dd54c6d83e1ef970a68d0 + 28209139ee0e4b7c5b3dbfe74e30c6de8399189e - + https://github.com/dotnet/arcade - e4bd767159fde419b50dd54c6d83e1ef970a68d0 + 28209139ee0e4b7c5b3dbfe74e30c6de8399189e https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 767b63a9f..ceb3f5d5c 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23353.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23356.1" } } From ad0dc8b5fbe7f5cea10bf63c427e0192926656a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jul 2023 12:17:42 +0000 Subject: [PATCH 010/117] Update dependencies from https://github.com/dotnet/arcade build 20230707.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.23357.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 f71f728a9..916c86265 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 28209139ee0e4b7c5b3dbfe74e30c6de8399189e + 853cdb7499e6edddd5239e4b7a90f098ea84a261 - + https://github.com/dotnet/arcade - 28209139ee0e4b7c5b3dbfe74e30c6de8399189e + 853cdb7499e6edddd5239e4b7a90f098ea84a261 - + https://github.com/dotnet/arcade - 28209139ee0e4b7c5b3dbfe74e30c6de8399189e + 853cdb7499e6edddd5239e4b7a90f098ea84a261 - + https://github.com/dotnet/arcade - 28209139ee0e4b7c5b3dbfe74e30c6de8399189e + 853cdb7499e6edddd5239e4b7a90f098ea84a261 - + https://github.com/dotnet/arcade - 28209139ee0e4b7c5b3dbfe74e30c6de8399189e + 853cdb7499e6edddd5239e4b7a90f098ea84a261 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index ceb3f5d5c..1aafcb2a1 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23356.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23357.3" } } From d3d9c0c21644c9c8287041cafede30b2785a1044 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jul 2023 12:18:54 +0000 Subject: [PATCH 011/117] Update dependencies from https://github.com/dotnet/arcade build 20230710.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.23360.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 916c86265..5a082ef4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 853cdb7499e6edddd5239e4b7a90f098ea84a261 + 226c103b56a979243f08032e6cddb4deb66ea54b - + https://github.com/dotnet/arcade - 853cdb7499e6edddd5239e4b7a90f098ea84a261 + 226c103b56a979243f08032e6cddb4deb66ea54b - + https://github.com/dotnet/arcade - 853cdb7499e6edddd5239e4b7a90f098ea84a261 + 226c103b56a979243f08032e6cddb4deb66ea54b - + https://github.com/dotnet/arcade - 853cdb7499e6edddd5239e4b7a90f098ea84a261 + 226c103b56a979243f08032e6cddb4deb66ea54b - + https://github.com/dotnet/arcade - 853cdb7499e6edddd5239e4b7a90f098ea84a261 + 226c103b56a979243f08032e6cddb4deb66ea54b https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 1aafcb2a1..6e3dc7573 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23357.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23360.1" } } From 1f4372390191cf92f33ffef62d3175ba877465b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jul 2023 12:18:05 +0000 Subject: [PATCH 012/117] Update dependencies from https://github.com/dotnet/arcade build 20230710.4 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.23360.4 --- 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 5a082ef4f..09fe52e07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 226c103b56a979243f08032e6cddb4deb66ea54b + dd0aec2c9a3ee25da70212063fddf6cc47cd8780 - + https://github.com/dotnet/arcade - 226c103b56a979243f08032e6cddb4deb66ea54b + dd0aec2c9a3ee25da70212063fddf6cc47cd8780 - + https://github.com/dotnet/arcade - 226c103b56a979243f08032e6cddb4deb66ea54b + dd0aec2c9a3ee25da70212063fddf6cc47cd8780 - + https://github.com/dotnet/arcade - 226c103b56a979243f08032e6cddb4deb66ea54b + dd0aec2c9a3ee25da70212063fddf6cc47cd8780 - + https://github.com/dotnet/arcade - 226c103b56a979243f08032e6cddb4deb66ea54b + dd0aec2c9a3ee25da70212063fddf6cc47cd8780 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 6e3dc7573..7778fb95e 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23360.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23360.4" } } From c65adf8f73aca8fc4a42b7dedb67167357a44ef0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jul 2023 12:20:04 +0000 Subject: [PATCH 013/117] Update dependencies from https://github.com/dotnet/arcade build 20230711.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.23361.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 09fe52e07..b580b8ab1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - dd0aec2c9a3ee25da70212063fddf6cc47cd8780 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - dd0aec2c9a3ee25da70212063fddf6cc47cd8780 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - dd0aec2c9a3ee25da70212063fddf6cc47cd8780 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - dd0aec2c9a3ee25da70212063fddf6cc47cd8780 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - dd0aec2c9a3ee25da70212063fddf6cc47cd8780 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 7778fb95e..046dd7817 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23360.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23361.1" } } From 33dd6ddd61846c3c0f83cbd9c7445b0d9b81965f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jul 2023 12:16:08 +0000 Subject: [PATCH 014/117] Update dependencies from https://github.com/dotnet/arcade build 20230712.5 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.23362.5 --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b580b8ab1..074933234 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 046dd7817..5b9c49da2 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "allowPrerelease": true }, "tools": { - "dotnet": "8.0.100-preview.5.23303.2", + "dotnet": "8.0.100-preview.6.23330.14", "runtimes": { "dotnet": [ "6.0.0" @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23361.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23362.5" } } From 6d4acbcfe16ef09f56c56a0d37e786be62d4434d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jul 2023 12:16:34 +0000 Subject: [PATCH 015/117] Update dependencies from https://github.com/dotnet/arcade build 20230713.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.23363.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 074933234..860d75853 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 6334d895ace2d332a5ef47dd2f5e483edb968c84 - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 6334d895ace2d332a5ef47dd2f5e483edb968c84 - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 6334d895ace2d332a5ef47dd2f5e483edb968c84 - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 6334d895ace2d332a5ef47dd2f5e483edb968c84 - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 6334d895ace2d332a5ef47dd2f5e483edb968c84 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 5b9c49da2..fb160b366 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23362.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23363.3" } } From fe45d58b57eadc0359645ed9c39ab186839d7046 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jul 2023 12:07:23 +0000 Subject: [PATCH 016/117] Update dependencies from https://github.com/dotnet/arcade build 20230714.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.23364.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/sdl/configure-sdl-tool.ps1 | 2 +- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 860d75853..f6ed1c9f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 6334d895ace2d332a5ef47dd2f5e483edb968c84 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 6334d895ace2d332a5ef47dd2f5e483edb968c84 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 6334d895ace2d332a5ef47dd2f5e483edb968c84 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 6334d895ace2d332a5ef47dd2f5e483edb968c84 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 6334d895ace2d332a5ef47dd2f5e483edb968c84 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c https://github.com/dotnet/arcade-services diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1 index ee9eb8933..e4108e39d 100644 --- a/eng/common/sdl/configure-sdl-tool.ps1 +++ b/eng/common/sdl/configure-sdl-tool.ps1 @@ -93,7 +93,7 @@ try { } 'binskim' { if ($targetDirectory) { - $tool.Args += "`"Target < $TargetDirectory`"" + $tool.Args += "`"Target < $TargetDirectory\**`"" } $tool.Args += $BinskimAdditionalRunConfigParams } diff --git a/global.json b/global.json index fb160b366..f32b8d422 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23363.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23364.2" } } From 3d014efa4804fa2d9588bef7a2fcde8f8b480268 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jul 2023 12:09:34 +0000 Subject: [PATCH 017/117] Update dependencies from https://github.com/dotnet/arcade build 20230719.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.23369.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 f6ed1c9f6..91990cb5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 60ea5b2eca5af06fc63b250f8669d2c70179b18c + 9fba71ca242ef84c4b7696c380cc00efe734adb3 - + https://github.com/dotnet/arcade - 60ea5b2eca5af06fc63b250f8669d2c70179b18c + 9fba71ca242ef84c4b7696c380cc00efe734adb3 - + https://github.com/dotnet/arcade - 60ea5b2eca5af06fc63b250f8669d2c70179b18c + 9fba71ca242ef84c4b7696c380cc00efe734adb3 - + https://github.com/dotnet/arcade - 60ea5b2eca5af06fc63b250f8669d2c70179b18c + 9fba71ca242ef84c4b7696c380cc00efe734adb3 - + https://github.com/dotnet/arcade - 60ea5b2eca5af06fc63b250f8669d2c70179b18c + 9fba71ca242ef84c4b7696c380cc00efe734adb3 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index f32b8d422..6b74a1d82 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23364.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23369.2" } } From e980cf592ca18bf60aa63f8187471e7d270e586e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Jul 2023 12:09:25 +0000 Subject: [PATCH 018/117] Update dependencies from https://github.com/dotnet/arcade build 20230720.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.23370.6 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/sdl/configure-sdl-tool.ps1 | 4 +++- global.json | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91990cb5a..47882e409 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 9fba71ca242ef84c4b7696c380cc00efe734adb3 + a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 - + https://github.com/dotnet/arcade - 9fba71ca242ef84c4b7696c380cc00efe734adb3 + a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 - + https://github.com/dotnet/arcade - 9fba71ca242ef84c4b7696c380cc00efe734adb3 + a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 - + https://github.com/dotnet/arcade - 9fba71ca242ef84c4b7696c380cc00efe734adb3 + a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 - + https://github.com/dotnet/arcade - 9fba71ca242ef84c4b7696c380cc00efe734adb3 + a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 https://github.com/dotnet/arcade-services diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1 index e4108e39d..27f5a4115 100644 --- a/eng/common/sdl/configure-sdl-tool.ps1 +++ b/eng/common/sdl/configure-sdl-tool.ps1 @@ -93,7 +93,9 @@ try { } 'binskim' { if ($targetDirectory) { - $tool.Args += "`"Target < $TargetDirectory\**`"" + # Binskim crashes due to specific PDBs. GitHub issue: https://github.com/microsoft/binskim/issues/924. + # We are excluding all `_.pdb` files from the scan. + $tool.Args += "`"Target < $TargetDirectory\**;-:file|$TargetDirectory\**\_.pdb`"" } $tool.Args += $BinskimAdditionalRunConfigParams } diff --git a/global.json b/global.json index 6b74a1d82..93390b60b 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23369.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23370.6" } } From e11102483141cfcaaa9111ade940514118e2aa28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Jul 2023 12:08:51 +0000 Subject: [PATCH 019/117] Update dependencies from https://github.com/dotnet/arcade build 20230721.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.23371.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 47882e409..73ab08f41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 + 602351e3681015ea789b2aeaa7b2a9156a8baf38 - + https://github.com/dotnet/arcade - a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 + 602351e3681015ea789b2aeaa7b2a9156a8baf38 - + https://github.com/dotnet/arcade - a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 + 602351e3681015ea789b2aeaa7b2a9156a8baf38 - + https://github.com/dotnet/arcade - a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 + 602351e3681015ea789b2aeaa7b2a9156a8baf38 - + https://github.com/dotnet/arcade - a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 + 602351e3681015ea789b2aeaa7b2a9156a8baf38 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 93390b60b..2892a3794 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23370.6" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23371.1" } } From 9246fbe9bafd7a96c75581d493abfc01f6985487 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jul 2023 12:09:53 +0000 Subject: [PATCH 020/117] Update dependencies from https://github.com/dotnet/arcade build 20230726.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.23376.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 73ab08f41..eed909bce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 602351e3681015ea789b2aeaa7b2a9156a8baf38 + 9c133f0206c655b7a12a045b1de7c76804cde3fb - + https://github.com/dotnet/arcade - 602351e3681015ea789b2aeaa7b2a9156a8baf38 + 9c133f0206c655b7a12a045b1de7c76804cde3fb - + https://github.com/dotnet/arcade - 602351e3681015ea789b2aeaa7b2a9156a8baf38 + 9c133f0206c655b7a12a045b1de7c76804cde3fb - + https://github.com/dotnet/arcade - 602351e3681015ea789b2aeaa7b2a9156a8baf38 + 9c133f0206c655b7a12a045b1de7c76804cde3fb - + https://github.com/dotnet/arcade - 602351e3681015ea789b2aeaa7b2a9156a8baf38 + 9c133f0206c655b7a12a045b1de7c76804cde3fb https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 2892a3794..60fbc043f 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23371.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23376.1" } } From 9226c205b7c0d37d3802dcc317366c5cd215a508 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jul 2023 12:10:06 +0000 Subject: [PATCH 021/117] Update dependencies from https://github.com/dotnet/arcade build 20230727.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.23377.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 eed909bce..7aa083964 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 9c133f0206c655b7a12a045b1de7c76804cde3fb + 94ab279661f45a3bc9f6e86a5d52718ed80cd318 - + https://github.com/dotnet/arcade - 9c133f0206c655b7a12a045b1de7c76804cde3fb + 94ab279661f45a3bc9f6e86a5d52718ed80cd318 - + https://github.com/dotnet/arcade - 9c133f0206c655b7a12a045b1de7c76804cde3fb + 94ab279661f45a3bc9f6e86a5d52718ed80cd318 - + https://github.com/dotnet/arcade - 9c133f0206c655b7a12a045b1de7c76804cde3fb + 94ab279661f45a3bc9f6e86a5d52718ed80cd318 - + https://github.com/dotnet/arcade - 9c133f0206c655b7a12a045b1de7c76804cde3fb + 94ab279661f45a3bc9f6e86a5d52718ed80cd318 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 60fbc043f..9c2d691ab 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23376.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23377.1" } } From 174fc6dbb428b3e908767639198cf62246c48233 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Jul 2023 12:08:53 +0000 Subject: [PATCH 022/117] Update dependencies from https://github.com/dotnet/arcade build 20230728.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.23378.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 7aa083964..05128e817 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 94ab279661f45a3bc9f6e86a5d52718ed80cd318 + 54dd37d44a2adfb8b966fac466c2ece40f8b20dd - + https://github.com/dotnet/arcade - 94ab279661f45a3bc9f6e86a5d52718ed80cd318 + 54dd37d44a2adfb8b966fac466c2ece40f8b20dd - + https://github.com/dotnet/arcade - 94ab279661f45a3bc9f6e86a5d52718ed80cd318 + 54dd37d44a2adfb8b966fac466c2ece40f8b20dd - + https://github.com/dotnet/arcade - 94ab279661f45a3bc9f6e86a5d52718ed80cd318 + 54dd37d44a2adfb8b966fac466c2ece40f8b20dd - + https://github.com/dotnet/arcade - 94ab279661f45a3bc9f6e86a5d52718ed80cd318 + 54dd37d44a2adfb8b966fac466c2ece40f8b20dd https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 9c2d691ab..a9c81ab15 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23377.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23378.2" } } From 8851c787754f97610be2241c1007e22b73dcc839 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Aug 2023 12:08:59 +0000 Subject: [PATCH 023/117] Update dependencies from https://github.com/dotnet/arcade build 20230731.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.23381.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 05128e817..404481387 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 54dd37d44a2adfb8b966fac466c2ece40f8b20dd + aeaa48c51d6494adc1b1fab870e7b8c89752d1ba - + https://github.com/dotnet/arcade - 54dd37d44a2adfb8b966fac466c2ece40f8b20dd + aeaa48c51d6494adc1b1fab870e7b8c89752d1ba - + https://github.com/dotnet/arcade - 54dd37d44a2adfb8b966fac466c2ece40f8b20dd + aeaa48c51d6494adc1b1fab870e7b8c89752d1ba - + https://github.com/dotnet/arcade - 54dd37d44a2adfb8b966fac466c2ece40f8b20dd + aeaa48c51d6494adc1b1fab870e7b8c89752d1ba - + https://github.com/dotnet/arcade - 54dd37d44a2adfb8b966fac466c2ece40f8b20dd + aeaa48c51d6494adc1b1fab870e7b8c89752d1ba https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index a9c81ab15..72780a3a4 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23378.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23381.1" } } From 37ea18ac87665ac3e067e996f45b8fc6aa012f36 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Aug 2023 12:10:01 +0000 Subject: [PATCH 024/117] Update dependencies from https://github.com/dotnet/arcade build 20230801.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.23401.3 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/sdl/extract-artifact-packages.ps1 | 20 +++++++++++--------- global.json | 2 +- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 404481387..658df9215 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d - + https://github.com/dotnet/arcade - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d - + https://github.com/dotnet/arcade - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d - + https://github.com/dotnet/arcade - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d - + https://github.com/dotnet/arcade - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d https://github.com/dotnet/arcade-services diff --git a/eng/common/sdl/extract-artifact-packages.ps1 b/eng/common/sdl/extract-artifact-packages.ps1 index 7f28d9c59..f031ed5b2 100644 --- a/eng/common/sdl/extract-artifact-packages.ps1 +++ b/eng/common/sdl/extract-artifact-packages.ps1 @@ -35,31 +35,33 @@ try { param( [string] $PackagePath # Full path to a NuGet package ) - + if (!(Test-Path $PackagePath)) { Write-PipelineTelemetryError -Category 'Build' -Message "Input file does not exist: $PackagePath" ExitWithExitCode 1 } - + $RelevantExtensions = @('.dll', '.exe', '.pdb') Write-Host -NoNewLine 'Extracting ' ([System.IO.Path]::GetFileName($PackagePath)) '...' - + $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId - + Add-Type -AssemblyName System.IO.Compression.FileSystem - + [System.IO.Directory]::CreateDirectory($ExtractPath); - + try { $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) $zip.Entries | Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | ForEach-Object { - $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.Name - - [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true) + $TargetPath = Join-Path -Path $ExtractPath -ChildPath (Split-Path -Path $_.FullName) + [System.IO.Directory]::CreateDirectory($TargetPath); + + $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.FullName + [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile) } } catch { diff --git a/global.json b/global.json index 72780a3a4..953684d8e 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23381.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23401.3" } } From 50ab0ea82137516b607e1109d0932de570883485 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Aug 2023 12:09:23 +0000 Subject: [PATCH 025/117] Update dependencies from https://github.com/dotnet/arcade build 20230802.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.23402.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 658df9215..66bc4455a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - f99e2f9b8aca08b8fa0877e78a448c0c0b74236d + 3addc5d978d01e864792d2c6bce0b50ec105f857 - + https://github.com/dotnet/arcade - f99e2f9b8aca08b8fa0877e78a448c0c0b74236d + 3addc5d978d01e864792d2c6bce0b50ec105f857 - + https://github.com/dotnet/arcade - f99e2f9b8aca08b8fa0877e78a448c0c0b74236d + 3addc5d978d01e864792d2c6bce0b50ec105f857 - + https://github.com/dotnet/arcade - f99e2f9b8aca08b8fa0877e78a448c0c0b74236d + 3addc5d978d01e864792d2c6bce0b50ec105f857 - + https://github.com/dotnet/arcade - f99e2f9b8aca08b8fa0877e78a448c0c0b74236d + 3addc5d978d01e864792d2c6bce0b50ec105f857 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 953684d8e..4ba62b218 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23401.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23402.2" } } From 17846e0f4c2acd14285d30dec2c2c0225fdbc54d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Aug 2023 12:09:57 +0000 Subject: [PATCH 026/117] Update dependencies from https://github.com/dotnet/arcade build 20230803.7 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.23403.7 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/templates/steps/source-build.yml | 9 +++++++++ global.json | 2 +- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66bc4455a..8c6a8f09c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 https://github.com/dotnet/arcade-services diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 110052183..41bbb9157 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -118,3 +118,12 @@ steps: artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() + +# Manually inject component detection so that we can ignore the source build upstream cache, which contains +# a nupkg cache of input packages (a local feed). +# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' +# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets +- task: ComponentGovernanceComponentDetection@0 + displayName: Component Detection (Exclude upstream cache) + inputs: + ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' diff --git a/global.json b/global.json index 4ba62b218..b2d848254 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23402.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23403.7" } } From 1eb6bff6c1b71c3dc0ef2894c45a4078335e4346 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Aug 2023 12:08:58 +0000 Subject: [PATCH 027/117] Update dependencies from https://github.com/dotnet/arcade build 20230804.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.23404.2 --- eng/Version.Details.xml | 20 +++++++++---------- eng/common/loc/P22DotNetHtmlLocalization.lss | Bin 3810 -> 3842 bytes global.json | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c6a8f09c..f0909f020 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 https://github.com/dotnet/arcade-services diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss index 6661fed566e49b0c206665bc21f135e06c9b89c4..858a0b237c62ce4f2ee12aa14794f160f6b122b7 100644 GIT binary patch delta 274 zcmaDP+a$;Ke*az|n#iQX$U9L_gN>JqL4iSGqQ3ORGAW?Q1Qjlb2!joS{zOAbi0B6! zCSI<|ip=VhLl{FCc_;TV>rD1wb_28WKvIp|l9MO!aluqwVe-JE3Mi$(QiGy^k2Qyp zcXJgh2O}fzByO?EbC~%yFJp^h0r5&8LVSE82)RSthrlX5CZFL2dIY2eC=as!FRvoZ VC5(KsFeZ}w7+K^&o(6kQ830GCL398B delta 289 zcmZpYdnC*B|KCJ59Y(H+iP97Oc_zkKO`NVWagPln*JOPr<;k*)5sCa-6G z0Wy(Sbn`m43>Gj`eDVTrmdU$#btcDi1KkdioE*R>0M!WMtz(ne{FHkKBZ~3}45bsf c6(=X~aZS$V(*VjreBsR}4-AfjvJ?He0GoYJrT_o{ diff --git a/global.json b/global.json index b2d848254..d49b8b90c 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23403.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23404.2" } } From 6a281c39ee849f159f17d62b35f19f01d87ef501 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Aug 2023 12:08:44 +0000 Subject: [PATCH 028/117] Update dependencies from https://github.com/dotnet/arcade build 20230807.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.23407.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 f0909f020..e76264139 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index d49b8b90c..2948d1761 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23404.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23407.1" } } From 3812b473ab66cb8734ff6b5017fdfb9ed366ace0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Aug 2023 12:10:57 +0000 Subject: [PATCH 029/117] Update dependencies from https://github.com/dotnet/arcade build 20230808.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.23408.6 --- eng/Version.Details.xml | 20 ++-- eng/common/native/init-distro-rid.sh | 132 ++++++++++++++++++++++++++ eng/common/native/init-os-and-arch.sh | 80 ++++++++++++++++ global.json | 4 +- 4 files changed, 224 insertions(+), 12 deletions(-) create mode 100644 eng/common/native/init-distro-rid.sh create mode 100644 eng/common/native/init-os-and-arch.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e76264139..8b8e5b21e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 https://github.com/dotnet/arcade-services diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh new file mode 100644 index 000000000..aba9fe240 --- /dev/null +++ b/eng/common/native/init-distro-rid.sh @@ -0,0 +1,132 @@ +#!/usr/bin/env bash + +# getNonPortableDistroRid +# +# Input: +# targetOs: (str) +# targetArch: (str) +# rootfsDir: (str) +# +# Return: +# non-portable rid +getNonPortableDistroRid() +{ + local targetOs="$1" + local targetArch="$2" + local rootfsDir="$3" + local nonPortableRid="" + + if [ "$targetOs" = "linux" ]; then + if [ -e "${rootfsDir}/etc/os-release" ]; then + source "${rootfsDir}/etc/os-release" + + if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then + # remove the last version digit + VERSION_ID="${VERSION_ID%.*}" + fi + + if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then + nonPortableRid="${ID}.${VERSION_ID}-${targetArch}" + else + # Rolling release distros either do not set VERSION_ID, set it as blank or + # set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux); + # so omit it here to be consistent with everything else. + nonPortableRid="${ID}-${targetArch}" + fi + + elif [ -e "${rootfsDir}/android_platform" ]; then + source "$rootfsDir"/android_platform + nonPortableRid="$RID" + fi + fi + + if [ "$targetOs" = "freebsd" ]; then + # $rootfsDir can be empty. freebsd-version is shell script and it should always work. + __freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; }) + nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}" + elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then + __android_sdk_version=$(getprop ro.build.version.sdk) + nonPortableRid="android.$__android_sdk_version-${targetArch}" + elif [ "$targetOs" = "illumos" ]; then + __uname_version=$(uname -v) + case "$__uname_version" in + omnios-*) + __omnios_major_version=$(echo "${__uname_version:8:2}") + nonPortableRid=omnios."$__omnios_major_version"-"$targetArch" + ;; + joyent_*) + __smartos_major_version=$(echo "${__uname_version:7:4}") + nonPortableRid=smartos."$__smartos_major_version"-"$targetArch" + ;; + illumos_*) + nonPortableRid=openindiana-"$targetArch" + ;; + esac + elif [ "$targetOs" = "solaris" ]; then + __uname_version=$(uname -v) + __solaris_major_version=$(echo "${__uname_version%.*}") + nonPortableRid=solaris."$__solaris_major_version"-"$targetArch" + elif [ "$targetOs" = "haiku" ]; then + __uname_release=$(uname -r) + nonPortableRid=haiku.r"$__uname_release"-"$targetArch" + fi + + echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')" +} + +# initDistroRidGlobal +# +# Input: +# os: (str) +# arch: (str) +# isPortable: (int) +# rootfsDir?: (nullable:string) +# +# Return: +# None +# +# Notes: +# +# It is important to note that the function does not return anything, but it +# exports the following variables on success: +# +# __DistroRid : Non-portable rid of the target platform. +# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform. +# +initDistroRidGlobal() +{ + local targetOs="$1" + local targetArch="$2" + local isPortable="$3" + local rootfsDir="" + if [ "$#" -ge 4 ]; then + rootfsDir="$4" + fi + + if [ -n "${rootfsDir}" ]; then + # We may have a cross build. Check for the existence of the rootfsDir + if [ ! -e "${rootfsDir}" ]; then + echo "Error rootfsDir has been passed, but the location is not valid." + exit 1 + fi + fi + + __DistroRid=$(getNonPortableDistroRid "${targetOs}" "${targetArch}" "${rootfsDir}") + + if [ -z "${__PortableTargetOS:-}" ]; then + __PortableTargetOS="$targetOs" + + STRINGS="$(command -v strings || true)" + if [ -z "$STRINGS" ]; then + STRINGS="$(command -v llvm-strings || true)" + fi + + # Check for musl-based distros (e.g Alpine Linux, Void Linux). + if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl || + ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then + __PortableTargetOS="linux-musl" + fi + fi + + export __DistroRid __PortableTargetOS +} diff --git a/eng/common/native/init-os-and-arch.sh b/eng/common/native/init-os-and-arch.sh new file mode 100644 index 000000000..e693617a6 --- /dev/null +++ b/eng/common/native/init-os-and-arch.sh @@ -0,0 +1,80 @@ +#!/usr/bin/env bash + +# Use uname to determine what the OS is. +OSName=$(uname -s | tr '[:upper:]' '[:lower:]') + +if command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then + OSName="android" +fi + +case "$OSName" in +freebsd|linux|netbsd|openbsd|sunos|android|haiku) + os="$OSName" ;; +darwin) + os=osx ;; +*) + echo "Unsupported OS $OSName detected!" + exit 1 ;; +esac + +# On Solaris, `uname -m` is discouraged, see https://docs.oracle.com/cd/E36784_01/html/E36870/uname-1.html +# and `uname -p` returns processor type (e.g. i386 on amd64). +# The appropriate tool to determine CPU is isainfo(1) https://docs.oracle.com/cd/E36784_01/html/E36870/isainfo-1.html. +if [ "$os" = "sunos" ]; then + if uname -o 2>&1 | grep -q illumos; then + os="illumos" + else + os="solaris" + fi + CPUName=$(isainfo -n) +else + # For the rest of the operating systems, use uname(1) to determine what the CPU is. + CPUName=$(uname -m) +fi + +case "$CPUName" in + arm64|aarch64) + arch=arm64 + ;; + + loongarch64) + arch=loongarch64 + ;; + + riscv64) + arch=riscv64 + ;; + + amd64|x86_64) + arch=x64 + ;; + + armv7l|armv8l) + if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then + arch=armel + else + arch=arm + fi + ;; + + armv6l) + arch=armv6 + ;; + + i[3-6]86) + echo "Unsupported CPU $CPUName detected, build might not succeed!" + arch=x86 + ;; + + s390x) + arch=s390x + ;; + + ppc64le) + arch=ppc64le + ;; + *) + echo "Unknown CPU $CPUName detected!" + exit 1 + ;; +esac diff --git a/global.json b/global.json index 2948d1761..3312fdb2d 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "allowPrerelease": true }, "tools": { - "dotnet": "8.0.100-preview.6.23330.14", + "dotnet": "8.0.100-preview.7.23376.3", "runtimes": { "dotnet": [ "6.0.0" @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23407.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23408.6" } } From 586714fbb7acaef79d9670c8f21a3e141ae8fc6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Aug 2023 12:09:52 +0000 Subject: [PATCH 030/117] Update dependencies from https://github.com/dotnet/arcade build 20230809.5 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.23409.5 --- 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 8b8e5b21e..9233c1be7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 3312fdb2d..4add3e080 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23408.6" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23409.5" } } From 4ed8c59c3db4d890b0c91bb2df1c9833a91ebef9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Aug 2023 12:08:22 +0000 Subject: [PATCH 031/117] Update dependencies from https://github.com/dotnet/arcade build 20230811.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.23411.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 9233c1be7..cd540ebac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - bebd2de1988036b47ecefc7e72b66ce2f403e43d + 9b2af35a6702526dc8a7c5fcadcc44efd0dca170 - + https://github.com/dotnet/arcade - bebd2de1988036b47ecefc7e72b66ce2f403e43d + 9b2af35a6702526dc8a7c5fcadcc44efd0dca170 - + https://github.com/dotnet/arcade - bebd2de1988036b47ecefc7e72b66ce2f403e43d + 9b2af35a6702526dc8a7c5fcadcc44efd0dca170 - + https://github.com/dotnet/arcade - bebd2de1988036b47ecefc7e72b66ce2f403e43d + 9b2af35a6702526dc8a7c5fcadcc44efd0dca170 - + https://github.com/dotnet/arcade - bebd2de1988036b47ecefc7e72b66ce2f403e43d + 9b2af35a6702526dc8a7c5fcadcc44efd0dca170 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 4add3e080..4578f5bfc 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23409.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1" } } From ade39b13836f2ab1ccca33809ee159e6a5bd756d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Aug 2023 12:09:11 +0000 Subject: [PATCH 032/117] Update dependencies from https://github.com/dotnet/arcade build 20230814.5 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.23414.5 --- eng/Version.Details.xml | 20 +++---- eng/common/native/init-distro-rid.sh | 6 +-- eng/common/sdl/trim-assets-version.ps1 | 75 ++++++++++++++++++++++++++ eng/common/tools.ps1 | 6 ++- global.json | 2 +- 5 files changed, 93 insertions(+), 16 deletions(-) create mode 100644 eng/common/sdl/trim-assets-version.ps1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd540ebac..c3c2ec61e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 9b2af35a6702526dc8a7c5fcadcc44efd0dca170 + d3b8861e20aaf0179034c6076d156e2442b26f9b - + https://github.com/dotnet/arcade - 9b2af35a6702526dc8a7c5fcadcc44efd0dca170 + d3b8861e20aaf0179034c6076d156e2442b26f9b - + https://github.com/dotnet/arcade - 9b2af35a6702526dc8a7c5fcadcc44efd0dca170 + d3b8861e20aaf0179034c6076d156e2442b26f9b - + https://github.com/dotnet/arcade - 9b2af35a6702526dc8a7c5fcadcc44efd0dca170 + d3b8861e20aaf0179034c6076d156e2442b26f9b - + https://github.com/dotnet/arcade - 9b2af35a6702526dc8a7c5fcadcc44efd0dca170 + d3b8861e20aaf0179034c6076d156e2442b26f9b https://github.com/dotnet/arcade-services diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh index aba9fe240..de1687b2c 100644 --- a/eng/common/native/init-distro-rid.sh +++ b/eng/common/native/init-distro-rid.sh @@ -79,7 +79,6 @@ getNonPortableDistroRid() # Input: # os: (str) # arch: (str) -# isPortable: (int) # rootfsDir?: (nullable:string) # # Return: @@ -97,10 +96,9 @@ initDistroRidGlobal() { local targetOs="$1" local targetArch="$2" - local isPortable="$3" local rootfsDir="" - if [ "$#" -ge 4 ]; then - rootfsDir="$4" + if [ "$#" -ge 3 ]; then + rootfsDir="$3" fi if [ -n "${rootfsDir}" ]; then diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1 new file mode 100644 index 000000000..d8cfec910 --- /dev/null +++ b/eng/common/sdl/trim-assets-version.ps1 @@ -0,0 +1,75 @@ +<# +.SYNOPSIS +Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name. + +.PARAMETER InputPath +Full path to directory where artifact packages are stored + +.PARAMETER Recursive +Search for NuGet packages recursively + +#> + +Param( + [string] $InputPath, + [bool] $Recursive = $true +) + +$CliToolName = "Microsoft.DotNet.VersionTools.Cli" + +function Install-VersionTools-Cli { + param( + [Parameter(Mandatory=$true)][string]$Version + ) + + Write-Host "Installing the package '$CliToolName' with a version of '$version' ..." + $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" + + $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version") + Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait +} + +# ------------------------------------------------------------------- + +if (!(Test-Path $InputPath)) { + Write-Host "Input Path '$InputPath' does not exist" + ExitWithExitCode 1 +} + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +$disableConfigureToolsetImport = $true +$global:LASTEXITCODE = 0 + +# `tools.ps1` checks $ci to perform some actions. Since the SDL +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +. $PSScriptRoot\..\tools.ps1 + +try { + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + + $toolsetVersion = Read-ArcadeSdkVersion + Install-VersionTools-Cli -Version $toolsetVersion + + $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName}) + if ($null -eq $cliToolFound) { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed." + ExitWithExitCode 1 + } + + Exec-BlockVerbosely { + & "$dotnet" $CliToolName trim-assets-version ` + --assets-path $InputPath ` + --recursive $Recursive + Exit-IfNZEC "Sdl" + } +} +catch { + Write-Host $_ + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ + ExitWithExitCode 1 +} \ No newline at end of file diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index c9eced9f7..aa74ab4a8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -671,6 +671,10 @@ function InitializeNativeTools() { } } +function Read-ArcadeSdkVersion() { + return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk' +} + function InitializeToolset() { if (Test-Path variable:global:_ToolsetBuildProj) { return $global:_ToolsetBuildProj @@ -678,7 +682,7 @@ function InitializeToolset() { $nugetCache = GetNuGetPackageCachePath - $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk' + $toolsetVersion = Read-ArcadeSdkVersion $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt" if (Test-Path $toolsetLocationFile) { diff --git a/global.json b/global.json index 4578f5bfc..fbb01e387 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23414.5" } } From cff168ac63216f191920e1ef5f08e4372e8c1414 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Aug 2023 12:14:15 +0000 Subject: [PATCH 033/117] Update dependencies from https://github.com/dotnet/arcade build 20230815.4 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.23415.4 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/SetupNugetSources.ps1 | 2 +- eng/common/SetupNugetSources.sh | 2 +- global.json | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3c2ec61e..d09fac3c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - d3b8861e20aaf0179034c6076d156e2442b26f9b + 46ff142f43e887d5f9a4d87ef39d72166f61db8d - + https://github.com/dotnet/arcade - d3b8861e20aaf0179034c6076d156e2442b26f9b + 46ff142f43e887d5f9a4d87ef39d72166f61db8d - + https://github.com/dotnet/arcade - d3b8861e20aaf0179034c6076d156e2442b26f9b + 46ff142f43e887d5f9a4d87ef39d72166f61db8d - + https://github.com/dotnet/arcade - d3b8861e20aaf0179034c6076d156e2442b26f9b + 46ff142f43e887d5f9a4d87ef39d72166f61db8d - + https://github.com/dotnet/arcade - d3b8861e20aaf0179034c6076d156e2442b26f9b + 46ff142f43e887d5f9a4d87ef39d72166f61db8d https://github.com/dotnet/arcade-services diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6e9972394..6c65e8192 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -153,7 +153,7 @@ if ($dotnet31Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } -$dotnetVersions = @('5','6','7') +$dotnetVersions = @('5','6','7','8') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 8af7d899d..d387c7eac 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -105,7 +105,7 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet3.1-internal-transport') fi -DotNetVersions=('5' '6' '7') +DotNetVersions=('5' '6' '7' '8') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; diff --git a/global.json b/global.json index fbb01e387..5b5841da3 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23414.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4" } } From ced2009c11aea9367792040c62395f9728570e8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Aug 2023 12:09:20 +0000 Subject: [PATCH 034/117] Update dependencies from https://github.com/dotnet/arcade build 20230817.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.23417.3 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/native/init-compiler.sh | 2 +- eng/common/sdl/trim-assets-version.ps1 | 2 +- eng/common/templates/job/execute-sdl.yml | 5 +++++ global.json | 2 +- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d09fac3c9..48bf3176c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 7837a0b504ed9a598daebd50f20520ccda5fe2b1 - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 7837a0b504ed9a598daebd50f20520ccda5fe2b1 - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 7837a0b504ed9a598daebd50f20520ccda5fe2b1 - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 7837a0b504ed9a598daebd50f20520ccda5fe2b1 - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 7837a0b504ed9a598daebd50f20520ccda5fe2b1 https://github.com/dotnet/arcade-services diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 517401b68..f5c1ec7ea 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then # Set default versions if [ -z "$majorVersion" ]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [ "$compiler" = "clang" ]; then versions="16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" + if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi for version in $versions; do diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1 index d8cfec910..a2e004877 100644 --- a/eng/common/sdl/trim-assets-version.ps1 +++ b/eng/common/sdl/trim-assets-version.ps1 @@ -25,7 +25,7 @@ function Install-VersionTools-Cli { Write-Host "Installing the package '$CliToolName' with a version of '$version' ..." $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" - $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version") + $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version", "--create-manifest-if-needed") Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait } diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 7aabaa180..7870f93bc 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -105,6 +105,11 @@ jobs: downloadPath: $(Build.ArtifactStagingDirectory)\artifacts checkDownloadedFiles: true + - powershell: eng/common/sdl/trim-assets-version.ps1 + -InputPath $(Build.ArtifactStagingDirectory)\artifacts + displayName: Trim the version from the NuGet packages + continueOnError: ${{ parameters.sdlContinueOnError }} + - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts diff --git a/global.json b/global.json index 5b5841da3..b3a03aa05 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23417.3" } } From 4fa5347fadc30522bb54824f44824a3e1adc998e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 20 Aug 2023 12:08:26 +0000 Subject: [PATCH 035/117] Update dependencies from https://github.com/dotnet/arcade build 20230819.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.23419.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 48bf3176c..89176e4a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 7837a0b504ed9a598daebd50f20520ccda5fe2b1 + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 7837a0b504ed9a598daebd50f20520ccda5fe2b1 + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 7837a0b504ed9a598daebd50f20520ccda5fe2b1 + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 7837a0b504ed9a598daebd50f20520ccda5fe2b1 + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 7837a0b504ed9a598daebd50f20520ccda5fe2b1 + 385129cbc980a515ddee2fa56f6b16f3183ed9bc https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index b3a03aa05..5e818fd25 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23417.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23419.1" } } From b0219a60b13249883a767f7298278163e3af1bc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Aug 2023 12:12:09 +0000 Subject: [PATCH 036/117] Update dependencies from https://github.com/dotnet/arcade build 20230822.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.23422.1 --- eng/Version.Details.xml | 20 +++++++++---------- eng/common/loc/P22DotNetHtmlLocalization.lss | Bin 3842 -> 1876 bytes global.json | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89176e4a5..e53b71cbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 385129cbc980a515ddee2fa56f6b16f3183ed9bc + 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b - + https://github.com/dotnet/arcade - 385129cbc980a515ddee2fa56f6b16f3183ed9bc + 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b - + https://github.com/dotnet/arcade - 385129cbc980a515ddee2fa56f6b16f3183ed9bc + 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b - + https://github.com/dotnet/arcade - 385129cbc980a515ddee2fa56f6b16f3183ed9bc + 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b - + https://github.com/dotnet/arcade - 385129cbc980a515ddee2fa56f6b16f3183ed9bc + 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b https://github.com/dotnet/arcade-services diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss index 858a0b237c62ce4f2ee12aa14794f160f6b122b7..5d892d619398f9feeac4cefc1c53ff18a807f732 100644 GIT binary patch literal 1876 zcmd5-O>Y`85WVMDO!tse0|`=3Kq5qFvJwFroLr(PGHdUyD`QjJ8$y14$Ln3lZW2{J zwGs!I&o^(Lhrz|mTEa6oR%kVh&N`>j#re@-x_nwr2#IG`%ct-0baH+K&@f(3mgC!a zLE`z$`_TL4VSG6vqld@GGPwJ;L@RorHxAn^xdXw5(R4X4f7_@k)pTF-lorz22$--N zNp~~4=EJDUfxSBovWjDy#&0y*A$Y%{951Lgf#O!hPmkZU}#I!)Wng z1f<%)R3}u5SL$^NOII+VJC!`W+V>zz0i%$|xtEKJRoWJsS2-4>j6oFy0;9}2)ZXS? z!4+5B;BS?^g*W;n#c6Okuah`~R7l#LlUM`Wwgi;X`GgRCXg2Aj93+p!!wlyufdm#b2J0d!FWGIX~B#Nn{?*T z-%qWy16eI?CAp^@t!rT|vicQ-vsH(!kP=oLa9cnNr~Mvq*K+4!SBpR#0ixlQVLn!4 z_-b`9x-gH#c?z0gti{WerraQ#kQ%)%r?a{+35PnWsUFnNN^8lf0v68Oy&oSBa0E$V ze5J~88to5MDZA?699~0Him^%vH|v?chtS*Ws!BWhyEn^bjuBh5M+wg@h`3AQ cw&^?j6MgS4IM#l5)SHHef6(}&EB`Bh1GJK71^@s6 literal 3842 zcmd^?%T5$g5Qb}Q;yWB!uo4gwSD=IdDhbFa0~=!u%y4NlOykf9`fh|r;uZYH%XVd_Hn3nn?a)ScZi%Hfv^O?o^EPX*xG&pV zdv4F4*^+JAj(y{^Ze6Yo`)Kdu$~&GnS-les=(}Hd4Z$5-wa;woL^azeDs1)bFYF6K zYqo;O3eR7;3PMXZcdt9G7M2L|%(A;+cL+Vh<;40ia7DRYcz+HE1jrRpV_p*&!nF z$63@IaaFcvPRXqUT!EoEiMw~cG<%Xu1rqKRFp4w~aJ8hjgHT7ZDe-mb8W8O!t5`M} ztjgBRJpt|=SdiLxc+i9U&FGh9|IZv$NUelFF6qG*xY~f;wk`WWC*7iH2HNhpSVO7O zyjh))z5&gu%l(Qp>Nx07A`jIOXn!e02v|!Y!amv(`^`P?xq%*=(IC|pQx2Mm#Wop? zaijLey=o_a!^t>PhS7L4AbHDoC--rqkF#Y>vg5i&^y;GPmsmXHUEuiBT|Lj=5A8Un zViJHWkF=5jOaLV5s#-dX{vP4sfVZ=}?;@uYMqc~3{L6QHIy{PC)9lJ@k#y=HUqMdP z=#t_YRzBG-DDIK;Y5PHn(kQ#ieaMsI&5-MIikcQm zB9?pn%E>6AT}IUVSi2;S8K#g0d(Ee4XBw2{|D?DN(56#J`IN_F465Cx8|@w=tHXbj zU&@|NZLLZ7222|77ga@RWjf<2u>)ikm8K_A{31S!HRE05qRWsu=1qcb*PrKMEaNuH zxG7hoiSg&T9>yF6JSZ32L1c$;kl)UW(|FgMr)Xcsb Date: Sat, 26 Aug 2023 12:08:39 +0000 Subject: [PATCH 037/117] Update dependencies from https://github.com/dotnet/arcade build 20230825.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.23425.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 e53b71cbc..c7292b818 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b + 90c167d5c57de4a8bced566379dbd893556c94e8 - + https://github.com/dotnet/arcade - 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b + 90c167d5c57de4a8bced566379dbd893556c94e8 - + https://github.com/dotnet/arcade - 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b + 90c167d5c57de4a8bced566379dbd893556c94e8 - + https://github.com/dotnet/arcade - 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b + 90c167d5c57de4a8bced566379dbd893556c94e8 - + https://github.com/dotnet/arcade - 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b + 90c167d5c57de4a8bced566379dbd893556c94e8 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index bf4bd9758..f9c108848 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23422.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23425.2" } } From 8bbf4f9bfd4f1bb56c3ce53de4294456e77bc6e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Aug 2023 12:12:33 +0000 Subject: [PATCH 038/117] Update dependencies from https://github.com/dotnet/arcade build 20230828.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.23428.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 c7292b818..3d3f50dbf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 90c167d5c57de4a8bced566379dbd893556c94e8 + 3d92d0bfd8c9006f5fe1687e465dc4f8aa068b00 - + https://github.com/dotnet/arcade - 90c167d5c57de4a8bced566379dbd893556c94e8 + 3d92d0bfd8c9006f5fe1687e465dc4f8aa068b00 - + https://github.com/dotnet/arcade - 90c167d5c57de4a8bced566379dbd893556c94e8 + 3d92d0bfd8c9006f5fe1687e465dc4f8aa068b00 - + https://github.com/dotnet/arcade - 90c167d5c57de4a8bced566379dbd893556c94e8 + 3d92d0bfd8c9006f5fe1687e465dc4f8aa068b00 - + https://github.com/dotnet/arcade - 90c167d5c57de4a8bced566379dbd893556c94e8 + 3d92d0bfd8c9006f5fe1687e465dc4f8aa068b00 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index f9c108848..35629222c 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23425.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23428.2" } } From 0932ae161f6f851e6aa7fb36e095598d11123984 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Aug 2023 12:11:19 +0000 Subject: [PATCH 039/117] Update dependencies from https://github.com/dotnet/arcade build 20230829.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.23429.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 3d3f50dbf..18dfb9cdc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 3d92d0bfd8c9006f5fe1687e465dc4f8aa068b00 + 804d586c07a6c598551a2913f0958680cb9135a9 - + https://github.com/dotnet/arcade - 3d92d0bfd8c9006f5fe1687e465dc4f8aa068b00 + 804d586c07a6c598551a2913f0958680cb9135a9 - + https://github.com/dotnet/arcade - 3d92d0bfd8c9006f5fe1687e465dc4f8aa068b00 + 804d586c07a6c598551a2913f0958680cb9135a9 - + https://github.com/dotnet/arcade - 3d92d0bfd8c9006f5fe1687e465dc4f8aa068b00 + 804d586c07a6c598551a2913f0958680cb9135a9 - + https://github.com/dotnet/arcade - 3d92d0bfd8c9006f5fe1687e465dc4f8aa068b00 + 804d586c07a6c598551a2913f0958680cb9135a9 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 35629222c..d4e30e822 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23428.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23429.1" } } From 8bc2a4d977d4acdca900094b9b5d38608f2089b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Sep 2023 12:11:02 +0000 Subject: [PATCH 040/117] Update dependencies from https://github.com/dotnet/arcade build 20230831.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.23431.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/cross/toolchain.cmake | 2 +- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18dfb9cdc..4680152b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 https://github.com/dotnet/arcade-services diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index a88d643c8..0998e875e 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -207,6 +207,7 @@ elseif(ILLUMOS) set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") elseif(HAIKU) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") + set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin") set(TOOLSET_PREFIX ${TOOLCHAIN}-) function(locate_toolchain_exec exec var) @@ -217,7 +218,6 @@ elseif(HAIKU) endif() find_program(EXEC_LOCATION_${exec} - PATHS "${CROSS_ROOTFS}/cross-tools-x86_64/bin" NAMES "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" "${TOOLSET_PREFIX}${exec}") diff --git a/global.json b/global.json index d4e30e822..bdd864893 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23429.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23431.2" } } From cc3f8e155c1397f0544610701e2de06bc4aaecf1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 2 Sep 2023 12:10:04 +0000 Subject: [PATCH 041/117] Update dependencies from https://github.com/dotnet/arcade build 20230901.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.23451.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 4680152b1..fb33bb09d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 + 4665b3d04e1da3796b965c3c3e3b97f55c449a6e - + https://github.com/dotnet/arcade - ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 + 4665b3d04e1da3796b965c3c3e3b97f55c449a6e - + https://github.com/dotnet/arcade - ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 + 4665b3d04e1da3796b965c3c3e3b97f55c449a6e - + https://github.com/dotnet/arcade - ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 + 4665b3d04e1da3796b965c3c3e3b97f55c449a6e - + https://github.com/dotnet/arcade - ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 + 4665b3d04e1da3796b965c3c3e3b97f55c449a6e https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index bdd864893..1120cdc15 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23431.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23451.1" } } From e225eed31cb4ac07bc0a8874277d8b808011761d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Sep 2023 12:08:56 +0000 Subject: [PATCH 042/117] Update dependencies from https://github.com/dotnet/arcade build 20230901.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.23451.1 From 3fe1d9d66e2754f1047cec34cdbb2bae0c7301c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Sep 2023 12:09:23 +0000 Subject: [PATCH 043/117] Update dependencies from https://github.com/dotnet/arcade build 20230901.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.23451.1 From 6e9b46b96631b298352c7370fc2c4290d88503fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Sep 2023 12:07:58 +0000 Subject: [PATCH 044/117] Update dependencies from https://github.com/dotnet/arcade build 20230901.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.23451.1 From b9c51618eb8b637f1ab0b3704b8250412bb55a07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Sep 2023 12:07:30 +0000 Subject: [PATCH 045/117] Update dependencies from https://github.com/dotnet/arcade build 20230901.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.23451.1 From 8a95193664cadb6584479dc025f22f644994d216 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Sep 2023 12:07:10 +0000 Subject: [PATCH 046/117] Update dependencies from https://github.com/dotnet/arcade build 20230901.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.23451.1 From 4d4ca31027c655ccc25894c713d957cdd25c02d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Sep 2023 12:09:13 +0000 Subject: [PATCH 047/117] Update dependencies from https://github.com/dotnet/arcade build 20230901.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.23451.1 From fc8282ca4be095109922e305ac0dfd9668c496e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Sep 2023 12:10:39 +0000 Subject: [PATCH 048/117] Update dependencies from https://github.com/dotnet/arcade build 20230911.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.23461.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 fb33bb09d..8f0f2b71d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 4665b3d04e1da3796b965c3c3e3b97f55c449a6e + 4a908c64757841121e67fda7adaf776c93893163 - + https://github.com/dotnet/arcade - 4665b3d04e1da3796b965c3c3e3b97f55c449a6e + 4a908c64757841121e67fda7adaf776c93893163 - + https://github.com/dotnet/arcade - 4665b3d04e1da3796b965c3c3e3b97f55c449a6e + 4a908c64757841121e67fda7adaf776c93893163 - + https://github.com/dotnet/arcade - 4665b3d04e1da3796b965c3c3e3b97f55c449a6e + 4a908c64757841121e67fda7adaf776c93893163 - + https://github.com/dotnet/arcade - 4665b3d04e1da3796b965c3c3e3b97f55c449a6e + 4a908c64757841121e67fda7adaf776c93893163 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 1120cdc15..96dc13c12 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23451.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23461.2" } } From a1e598b2f25bad7bfc7497832ac8727f6254991e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Sep 2023 12:06:53 +0000 Subject: [PATCH 049/117] Update dependencies from https://github.com/dotnet/arcade build 20230911.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.23461.2 From a659800f0d268954e19d67c9d0344454ea2efbd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Sep 2023 12:11:05 +0000 Subject: [PATCH 050/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.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 8f0f2b71d..e5434fc83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 4a908c64757841121e67fda7adaf776c93893163 + 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/arcade - 4a908c64757841121e67fda7adaf776c93893163 + 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/arcade - 4a908c64757841121e67fda7adaf776c93893163 + 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/arcade - 4a908c64757841121e67fda7adaf776c93893163 + 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/arcade - 4a908c64757841121e67fda7adaf776c93893163 + 1d451c32dda2314c721adbf8829e1c0cd4e681ff https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 96dc13c12..4981598ec 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23461.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1" } } From 3d2c93836d0591bee96afb177e200c3f2031a9cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Sep 2023 12:07:55 +0000 Subject: [PATCH 051/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 9dcbf549bc91447d8417365c575a1db3ed537649 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Sep 2023 12:06:04 +0000 Subject: [PATCH 052/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From e7073f729fc453d6b95dba0546123818885f2f9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Sep 2023 12:05:31 +0000 Subject: [PATCH 053/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 39568d1e4d5321feb85db858efc6ada7313ad779 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Sep 2023 12:06:21 +0000 Subject: [PATCH 054/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From ea1334d6b338826221c4d116d25f1ed126c13fd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Sep 2023 12:05:39 +0000 Subject: [PATCH 055/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 5a348ab547afda36a39e1d55a9fd37d1e456d229 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Sep 2023 12:05:22 +0000 Subject: [PATCH 056/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From b89f8a358dfe280bf5ef996f78020a9b3a5291ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Sep 2023 12:06:34 +0000 Subject: [PATCH 057/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From cb910e2ee459758af88c7162ed263328d8ed7807 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Sep 2023 12:05:05 +0000 Subject: [PATCH 058/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 5b259c1d461567164fff74e5c5438d9c7ec91cc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Sep 2023 12:03:20 +0000 Subject: [PATCH 059/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 2c895fbce4bfce2a113f372fe7f384ee82317c5d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Sep 2023 12:03:01 +0000 Subject: [PATCH 060/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From ff7437e1c22c88044f5895b68e6f3d13449b7dfb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Sep 2023 12:03:27 +0000 Subject: [PATCH 061/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 68ad1ada40337ec3dca83a5df34efaa280d16436 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 12:03:33 +0000 Subject: [PATCH 062/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 7d34eaa064f6fd7db98d8e79eb0085c0103a3406 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Sep 2023 12:04:05 +0000 Subject: [PATCH 063/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 9cdac97741f36619c4c2be423dedb95339df8077 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Sep 2023 12:05:02 +0000 Subject: [PATCH 064/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 310abaefa8ec1bfdcfd7e00531fb141ee7d33a48 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Sep 2023 12:04:56 +0000 Subject: [PATCH 065/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 76fec24b0495ddcd52e77a8d311bc93b1e0ec049 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Sep 2023 12:04:25 +0000 Subject: [PATCH 066/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 6f7c57f64e91a9bb25cb700e0b1d77789bda8403 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 1 Oct 2023 12:04:16 +0000 Subject: [PATCH 067/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 0a9e9e67ef6093e4351bb82a7135ff61f1ecb1cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Oct 2023 12:05:05 +0000 Subject: [PATCH 068/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 5b87ce888e5c86166db68d3f48d71137d90930b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Oct 2023 12:05:37 +0000 Subject: [PATCH 069/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 841f26fada6d41835df6e847a78d80b33e62ec41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Oct 2023 12:04:38 +0000 Subject: [PATCH 070/117] Update dependencies from https://github.com/dotnet/arcade build 20230913.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.23463.1 From 6e2d7661ac0c2ef2d0779e38ff5692bdb11f6c0c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Oct 2023 12:11:10 +0000 Subject: [PATCH 071/117] Update dependencies from https://github.com/dotnet/arcade build 20231004.4 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 9.0.0-beta.23504.4 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 6 +++--- global.json | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5434fc83..e4c676b6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + f1868a684ed9766d4247d672fd5f96bba4d4bb00 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + f1868a684ed9766d4247d672fd5f96bba4d4bb00 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + f1868a684ed9766d4247d672fd5f96bba4d4bb00 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + f1868a684ed9766d4247d672fd5f96bba4d4bb00 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + f1868a684ed9766d4247d672fd5f96bba4d4bb00 https://github.com/dotnet/arcade-services diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 6c4ac6fec..91f8196cc 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.6.0-2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index aa74ab4a8..84cfe7cd9 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } # Minimum VS version to require. - $vsMinVersionReqdStr = '17.6' + $vsMinVersionReqdStr = '17.7' $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr) # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2 - $defaultXCopyMSBuildVersion = '17.6.0-2' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1 + $defaultXCopyMSBuildVersion = '17.7.2-1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 4981598ec..f03783c01 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "allowPrerelease": true }, "tools": { - "dotnet": "8.0.100-preview.7.23376.3", + "dotnet": "8.0.100-rc.1.23455.8", "runtimes": { "dotnet": [ "6.0.0" @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23504.4" } } From 27df9a944894d69d50b435da723d32dcd6883ba5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Oct 2023 12:12:31 +0000 Subject: [PATCH 072/117] Update dependencies from https://github.com/dotnet/arcade build 20231006.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 9.0.0-beta.23506.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 e4c676b6b..81aa5ec85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - f1868a684ed9766d4247d672fd5f96bba4d4bb00 + c5245c4f1d1074087d6bd0e5b311dc9544729172 - + https://github.com/dotnet/arcade - f1868a684ed9766d4247d672fd5f96bba4d4bb00 + c5245c4f1d1074087d6bd0e5b311dc9544729172 - + https://github.com/dotnet/arcade - f1868a684ed9766d4247d672fd5f96bba4d4bb00 + c5245c4f1d1074087d6bd0e5b311dc9544729172 - + https://github.com/dotnet/arcade - f1868a684ed9766d4247d672fd5f96bba4d4bb00 + c5245c4f1d1074087d6bd0e5b311dc9544729172 - + https://github.com/dotnet/arcade - f1868a684ed9766d4247d672fd5f96bba4d4bb00 + c5245c4f1d1074087d6bd0e5b311dc9544729172 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index f03783c01..6f26d10cc 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23504.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23506.1" } } From c4d22454e4dbdfb74b289a46afd405bc9cce3d21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Oct 2023 12:12:03 +0000 Subject: [PATCH 073/117] Update dependencies from https://github.com/dotnet/arcade build 20231006.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 9.0.0-beta.23506.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 81aa5ec85..a94669d00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - c5245c4f1d1074087d6bd0e5b311dc9544729172 + 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 - + https://github.com/dotnet/arcade - c5245c4f1d1074087d6bd0e5b311dc9544729172 + 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 - + https://github.com/dotnet/arcade - c5245c4f1d1074087d6bd0e5b311dc9544729172 + 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 - + https://github.com/dotnet/arcade - c5245c4f1d1074087d6bd0e5b311dc9544729172 + 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 - + https://github.com/dotnet/arcade - c5245c4f1d1074087d6bd0e5b311dc9544729172 + 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 6f26d10cc..96990b721 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23506.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23506.2" } } From b4a188cf6577c25b3a1dae7ef285c8b22cad87ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 8 Oct 2023 12:11:45 +0000 Subject: [PATCH 074/117] Update dependencies from https://github.com/dotnet/arcade build 20231006.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 9.0.0-beta.23506.2 From 3efda361b02928f7563d933b1f6f7e377eb881ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Oct 2023 12:12:32 +0000 Subject: [PATCH 075/117] Update dependencies from https://github.com/dotnet/arcade build 20231008.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 9.0.0-beta.23508.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 a94669d00..65158deab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 + 822f095b8c815dd7b9161140a9ff8151de593f82 - + https://github.com/dotnet/arcade - 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 + 822f095b8c815dd7b9161140a9ff8151de593f82 - + https://github.com/dotnet/arcade - 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 + 822f095b8c815dd7b9161140a9ff8151de593f82 - + https://github.com/dotnet/arcade - 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 + 822f095b8c815dd7b9161140a9ff8151de593f82 - + https://github.com/dotnet/arcade - 1bb0c0184e96b4f2f05d78f117e8805e00d6ae42 + 822f095b8c815dd7b9161140a9ff8151de593f82 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 96990b721..d3fee32d9 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23506.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23508.1" } } From 389a016c324defd3910a8dec16933b68a373ba71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 12:14:39 +0000 Subject: [PATCH 076/117] Update dependencies from https://github.com/dotnet/arcade build 20231010.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 9.0.0-beta.23510.1 --- eng/Version.Details.xml | 20 +++++++++---------- .../post-build/check-channel-consistency.ps1 | 2 +- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65158deab..4d80f23ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 822f095b8c815dd7b9161140a9ff8151de593f82 + 3e1ba969512d5dc45f0885bab7338fe7f14d9689 - + https://github.com/dotnet/arcade - 822f095b8c815dd7b9161140a9ff8151de593f82 + 3e1ba969512d5dc45f0885bab7338fe7f14d9689 - + https://github.com/dotnet/arcade - 822f095b8c815dd7b9161140a9ff8151de593f82 + 3e1ba969512d5dc45f0885bab7338fe7f14d9689 - + https://github.com/dotnet/arcade - 822f095b8c815dd7b9161140a9ff8151de593f82 + 3e1ba969512d5dc45f0885bab7338fe7f14d9689 - + https://github.com/dotnet/arcade - 822f095b8c815dd7b9161140a9ff8151de593f82 + 3e1ba969512d5dc45f0885bab7338fe7f14d9689 https://github.com/dotnet/arcade-services diff --git a/eng/common/post-build/check-channel-consistency.ps1 b/eng/common/post-build/check-channel-consistency.ps1 index 63f3464c9..1728f035a 100644 --- a/eng/common/post-build/check-channel-consistency.ps1 +++ b/eng/common/post-build/check-channel-consistency.ps1 @@ -7,7 +7,7 @@ try { . $PSScriptRoot\post-build-utils.ps1 if ($PromoteToChannels -eq "") { - Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." + Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." ExitWithExitCode 0 } diff --git a/global.json b/global.json index d3fee32d9..3b4aadb95 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23508.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.1" } } From a4ecf7960121a55682480c099f0505afef857b7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Oct 2023 12:12:19 +0000 Subject: [PATCH 077/117] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 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 9.0.0-beta.23510.4 --- 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 4d80f23ca..278683ea4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 3e1ba969512d5dc45f0885bab7338fe7f14d9689 + 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 - + https://github.com/dotnet/arcade - 3e1ba969512d5dc45f0885bab7338fe7f14d9689 + 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 - + https://github.com/dotnet/arcade - 3e1ba969512d5dc45f0885bab7338fe7f14d9689 + 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 - + https://github.com/dotnet/arcade - 3e1ba969512d5dc45f0885bab7338fe7f14d9689 + 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 - + https://github.com/dotnet/arcade - 3e1ba969512d5dc45f0885bab7338fe7f14d9689 + 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 3b4aadb95..ed76530ff 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.4" } } From 18dc8746563c2c3d2e12645eaf3a33a803dd94f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 12:11:22 +0000 Subject: [PATCH 078/117] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 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 9.0.0-beta.23510.4 From 4ecd8f5f0309042bc95c30aadca000a30a5787fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Oct 2023 12:11:41 +0000 Subject: [PATCH 079/117] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 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 9.0.0-beta.23510.4 From 70ccca989804a86d2cc041f30680e0dd44859197 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:11:04 +0000 Subject: [PATCH 080/117] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 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 9.0.0-beta.23510.4 From 358dd29fd5ae917b528258cc3c9b6b648ac2c4b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 15 Oct 2023 12:10:10 +0000 Subject: [PATCH 081/117] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 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 9.0.0-beta.23510.4 From 5fca15c12b5e91057ea5ef34706ee1fbda9f0667 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Oct 2023 12:10:51 +0000 Subject: [PATCH 082/117] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 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 9.0.0-beta.23510.4 From 3113452be5aa8aa70bd333fbe43cd8fee662f128 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 12:12:47 +0000 Subject: [PATCH 083/117] Update dependencies from https://github.com/dotnet/arcade build 20231016.5 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 9.0.0-beta.23516.5 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/build.sh | 2 +- eng/common/cross/build-rootfs.sh | 2 +- eng/common/cross/riscv64/tizen/tizen.patch | 9 +++++++++ eng/common/cross/tizen-build-rootfs.sh | 21 +++++++++++++++++++++ eng/common/cross/tizen-fetch.sh | 17 ++++++++++++++--- eng/common/cross/toolchain.cmake | 19 +++++++++++++------ eng/common/sdk-task.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 4 ++-- 11 files changed, 75 insertions(+), 27 deletions(-) create mode 100644 eng/common/cross/riscv64/tizen/tizen.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 278683ea4..5037171ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 + a672b7bba499394acf218dc59171e2d53e754237 - + https://github.com/dotnet/arcade - 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 + a672b7bba499394acf218dc59171e2d53e754237 - + https://github.com/dotnet/arcade - 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 + a672b7bba499394acf218dc59171e2d53e754237 - + https://github.com/dotnet/arcade - 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 + a672b7bba499394acf218dc59171e2d53e754237 - + https://github.com/dotnet/arcade - 0e89c8d7ddbb54510d9d0a757fda5126021b79f0 + a672b7bba499394acf218dc59171e2d53e754237 https://github.com/dotnet/arcade-services diff --git a/eng/common/build.sh b/eng/common/build.sh index 50af40cdd..2c17ba529 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -105,7 +105,7 @@ while [[ $# > 0 ]]; do -binarylog|-bl) binary_log=true ;; - -excludeCIBinarylog|-nobl) + -excludecibinarylog|-nobl) exclude_ci_binary_log=true ;; -pipelineslog|-pl) diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 9caf9b021..4228f202e 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -487,7 +487,7 @@ if [[ "$__CodeName" == "alpine" ]]; then -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \ - search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')" + search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')" fi # install all packages in one go diff --git a/eng/common/cross/riscv64/tizen/tizen.patch b/eng/common/cross/riscv64/tizen/tizen.patch new file mode 100644 index 000000000..eb6d1c074 --- /dev/null +++ b/eng/common/cross/riscv64/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf64-littleriscv) +-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) ) diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh index ac84173d4..ba31c9328 100644 --- a/eng/common/cross/tizen-build-rootfs.sh +++ b/eng/common/cross/tizen-build-rootfs.sh @@ -22,6 +22,10 @@ case "$ARCH" in TIZEN_ARCH="x86_64" LINK_ARCH="x86" ;; + riscv64) + TIZEN_ARCH="riscv64" + LINK_ARCH="riscv" + ;; *) echo "Unsupported architecture for tizen: $ARCH" exit 1 @@ -58,4 +62,21 @@ rm -rf $TIZEN_TMP_DIR echo ">>Start configuring Tizen rootfs" ln -sfn asm-${LINK_ARCH} ./usr/include/asm patch -p1 < $__TIZEN_CROSSDIR/tizen.patch +if [[ "$TIZEN_ARCH" == "riscv64" ]]; then + echo "Fixing broken symlinks in $PWD" + rm ./usr/lib64/libresolv.so + ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so + rm ./usr/lib64/libpthread.so + ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so + rm ./usr/lib64/libdl.so + ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so + rm ./usr/lib64/libutil.so + ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so + rm ./usr/lib64/libm.so + ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so + rm ./usr/lib64/librt.so + ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so + rm ./lib/ld-linux-riscv64-lp64d.so.1 + ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1 +fi echo "< Date: Wed, 18 Oct 2023 12:11:54 +0000 Subject: [PATCH 084/117] Update dependencies from https://github.com/dotnet/arcade build 20231017.7 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 9.0.0-beta.23517.7 --- 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 5037171ba..325d733c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - a672b7bba499394acf218dc59171e2d53e754237 + 7d8abd9dc3c87f248fc1e10aae8840b9dec0a861 - + https://github.com/dotnet/arcade - a672b7bba499394acf218dc59171e2d53e754237 + 7d8abd9dc3c87f248fc1e10aae8840b9dec0a861 - + https://github.com/dotnet/arcade - a672b7bba499394acf218dc59171e2d53e754237 + 7d8abd9dc3c87f248fc1e10aae8840b9dec0a861 - + https://github.com/dotnet/arcade - a672b7bba499394acf218dc59171e2d53e754237 + 7d8abd9dc3c87f248fc1e10aae8840b9dec0a861 - + https://github.com/dotnet/arcade - a672b7bba499394acf218dc59171e2d53e754237 + 7d8abd9dc3c87f248fc1e10aae8840b9dec0a861 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 4daa76658..2b764ff5b 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23516.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23517.7" } } From fb421123f43a0228d43cfe6337066854768fccb5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Oct 2023 12:10:20 +0000 Subject: [PATCH 085/117] Update dependencies from https://github.com/dotnet/arcade build 20231018.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 9.0.0-beta.23518.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 325d733c7..ac84fcf4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 7d8abd9dc3c87f248fc1e10aae8840b9dec0a861 + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 7d8abd9dc3c87f248fc1e10aae8840b9dec0a861 + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 7d8abd9dc3c87f248fc1e10aae8840b9dec0a861 + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 7d8abd9dc3c87f248fc1e10aae8840b9dec0a861 + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 7d8abd9dc3c87f248fc1e10aae8840b9dec0a861 + 6a5ca678aef84f34a1fccc46f76623f41da56553 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 2b764ff5b..af6ea16a3 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23517.7" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23518.2" } } From 14c327797df4dfe95fa13a5b619df196fda132c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Oct 2023 12:08:21 +0000 Subject: [PATCH 086/117] Update dependencies from https://github.com/dotnet/arcade build 20231018.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 9.0.0-beta.23518.2 From 6e6d93700f9f8eb54769b0746e6cdb3a8a504f5c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Oct 2023 12:08:13 +0000 Subject: [PATCH 087/117] Update dependencies from https://github.com/dotnet/arcade build 20231018.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 9.0.0-beta.23518.2 From 89ba57323095711a17c6436f68d6faa28f2b2150 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Oct 2023 12:08:13 +0000 Subject: [PATCH 088/117] Update dependencies from https://github.com/dotnet/arcade build 20231018.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 9.0.0-beta.23518.2 From 95b98c3dcc6b2c43e359ca3d3bb1ba1f3bd6330f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Oct 2023 12:09:08 +0000 Subject: [PATCH 089/117] Update dependencies from https://github.com/dotnet/arcade build 20231018.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 9.0.0-beta.23518.2 From d11b96ac0644a9d7016f1ed5d9e18292cc558989 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Oct 2023 12:08:00 +0000 Subject: [PATCH 090/117] Update dependencies from https://github.com/dotnet/arcade build 20231018.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 9.0.0-beta.23518.2 From ec4a63c548ef3f2c55952b9e507b40eb2df85f3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 Oct 2023 12:10:05 +0000 Subject: [PATCH 091/117] Update dependencies from https://github.com/dotnet/arcade build 20231024.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 9.0.0-beta.23524.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/cross/toolchain.cmake | 10 +++++----- global.json | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac84fcf4e..32b8625d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 https://github.com/dotnet/arcade-services diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 38e96724f..00288a300 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/13.1.0") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/13.1.0") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "armv6") set(CMAKE_SYSTEM_PROCESSOR armv6l) @@ -98,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -115,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") diff --git a/global.json b/global.json index af6ea16a3..a47ae0bfe 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23518.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23524.1" } } From 57f426fb8bb88e2944f2a05bcfd8c16260d043d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 Oct 2023 12:10:48 +0000 Subject: [PATCH 092/117] Update dependencies from https://github.com/dotnet/arcade build 20231025.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 9.0.0-beta.23525.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 4 ++-- global.json | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32b8625d4..8ee250453 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae https://github.com/dotnet/arcade-services diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fdd0cbb91..e8def7e6a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -158,7 +158,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { $env:DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we do not need all ASP.NET packages restored. - $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + $env:DOTNET_NOLOGO=1 # Disable telemetry on CI. if ($ci) { @@ -228,7 +228,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { Write-PipelinePrependPath -Path $dotnetRoot Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' - Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' + Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e8d478943..710e64df9 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -112,7 +112,7 @@ function InitializeDotNetCli { export DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we want to control all package sources - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_NOLOGO=1 # Disable telemetry on CI if [[ $ci == true ]]; then @@ -165,7 +165,7 @@ function InitializeDotNetCli { Write-PipelinePrependPath -path "$dotnet_root" Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" - Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" + Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" # return value _InitializeDotNetCli="$dotnet_root" diff --git a/global.json b/global.json index a47ae0bfe..844bc3e19 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23524.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23525.2" } } From 40b59c15b8ced7ab9aa1771197e720cf6475caaa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Oct 2023 12:09:24 +0000 Subject: [PATCH 093/117] Update dependencies from https://github.com/dotnet/arcade build 20231027.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 9.0.0-beta.23527.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 8ee250453..8efec5a94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 36d11a863c7ffc41e3730c806b0e98d32d1795ae + 30d512ae84149b306b6c160ed83dc433fc9f9cae - + https://github.com/dotnet/arcade - 36d11a863c7ffc41e3730c806b0e98d32d1795ae + 30d512ae84149b306b6c160ed83dc433fc9f9cae - + https://github.com/dotnet/arcade - 36d11a863c7ffc41e3730c806b0e98d32d1795ae + 30d512ae84149b306b6c160ed83dc433fc9f9cae - + https://github.com/dotnet/arcade - 36d11a863c7ffc41e3730c806b0e98d32d1795ae + 30d512ae84149b306b6c160ed83dc433fc9f9cae - + https://github.com/dotnet/arcade - 36d11a863c7ffc41e3730c806b0e98d32d1795ae + 30d512ae84149b306b6c160ed83dc433fc9f9cae https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 844bc3e19..da0aac6bf 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23525.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23527.1" } } From 839c93e76cc913d39c48453f4cfb90eb5bf8e9cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Oct 2023 12:08:22 +0000 Subject: [PATCH 094/117] Update dependencies from https://github.com/dotnet/arcade build 20231027.4 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 9.0.0-beta.23527.4 --- 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 8efec5a94..31151b5d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 30d512ae84149b306b6c160ed83dc433fc9f9cae + b2827fe94e3dd11be213dedacd6a57ace65d7522 - + https://github.com/dotnet/arcade - 30d512ae84149b306b6c160ed83dc433fc9f9cae + b2827fe94e3dd11be213dedacd6a57ace65d7522 - + https://github.com/dotnet/arcade - 30d512ae84149b306b6c160ed83dc433fc9f9cae + b2827fe94e3dd11be213dedacd6a57ace65d7522 - + https://github.com/dotnet/arcade - 30d512ae84149b306b6c160ed83dc433fc9f9cae + b2827fe94e3dd11be213dedacd6a57ace65d7522 - + https://github.com/dotnet/arcade - 30d512ae84149b306b6c160ed83dc433fc9f9cae + b2827fe94e3dd11be213dedacd6a57ace65d7522 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index da0aac6bf..ac6bc18dd 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23527.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23527.4" } } From 6249121459a2bf7d1cc6b9be4be7677d0a0d4892 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 29 Oct 2023 12:07:50 +0000 Subject: [PATCH 095/117] Update dependencies from https://github.com/dotnet/arcade build 20231028.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 9.0.0-beta.23528.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 31151b5d7..58028f90b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - b2827fe94e3dd11be213dedacd6a57ace65d7522 + bb2b4326ddf03d86c92bd125dba87e9d8df63463 - + https://github.com/dotnet/arcade - b2827fe94e3dd11be213dedacd6a57ace65d7522 + bb2b4326ddf03d86c92bd125dba87e9d8df63463 - + https://github.com/dotnet/arcade - b2827fe94e3dd11be213dedacd6a57ace65d7522 + bb2b4326ddf03d86c92bd125dba87e9d8df63463 - + https://github.com/dotnet/arcade - b2827fe94e3dd11be213dedacd6a57ace65d7522 + bb2b4326ddf03d86c92bd125dba87e9d8df63463 - + https://github.com/dotnet/arcade - b2827fe94e3dd11be213dedacd6a57ace65d7522 + bb2b4326ddf03d86c92bd125dba87e9d8df63463 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index ac6bc18dd..402723c53 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23527.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23528.2" } } From bbf26a629d8dfc87eb332d40b55737f4fa911dfe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 Oct 2023 12:07:58 +0000 Subject: [PATCH 096/117] Update dependencies from https://github.com/dotnet/arcade build 20231028.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 9.0.0-beta.23528.2 From 161aa3a4577a618d18cabb911066ffa9aff0751d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 31 Oct 2023 12:09:34 +0000 Subject: [PATCH 097/117] Update dependencies from https://github.com/dotnet/arcade build 20231031.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 9.0.0-beta.23531.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 58028f90b..ea2ca5dae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - bb2b4326ddf03d86c92bd125dba87e9d8df63463 + 0ebe09a5ce6665a5fe1df1c644d4f77189c4deba - + https://github.com/dotnet/arcade - bb2b4326ddf03d86c92bd125dba87e9d8df63463 + 0ebe09a5ce6665a5fe1df1c644d4f77189c4deba - + https://github.com/dotnet/arcade - bb2b4326ddf03d86c92bd125dba87e9d8df63463 + 0ebe09a5ce6665a5fe1df1c644d4f77189c4deba - + https://github.com/dotnet/arcade - bb2b4326ddf03d86c92bd125dba87e9d8df63463 + 0ebe09a5ce6665a5fe1df1c644d4f77189c4deba - + https://github.com/dotnet/arcade - bb2b4326ddf03d86c92bd125dba87e9d8df63463 + 0ebe09a5ce6665a5fe1df1c644d4f77189c4deba https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 402723c53..daf35b81a 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23528.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23531.1" } } From 91556931a813c06bc0505c6572cbf6298977824b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Nov 2023 12:10:15 +0000 Subject: [PATCH 098/117] Update dependencies from https://github.com/dotnet/arcade build 20231031.4 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 9.0.0-beta.23531.4 --- 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 ea2ca5dae..4fbb8bc0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 0ebe09a5ce6665a5fe1df1c644d4f77189c4deba + 16a344fc2ff2eecac5b03b88c96e99d7796e5125 - + https://github.com/dotnet/arcade - 0ebe09a5ce6665a5fe1df1c644d4f77189c4deba + 16a344fc2ff2eecac5b03b88c96e99d7796e5125 - + https://github.com/dotnet/arcade - 0ebe09a5ce6665a5fe1df1c644d4f77189c4deba + 16a344fc2ff2eecac5b03b88c96e99d7796e5125 - + https://github.com/dotnet/arcade - 0ebe09a5ce6665a5fe1df1c644d4f77189c4deba + 16a344fc2ff2eecac5b03b88c96e99d7796e5125 - + https://github.com/dotnet/arcade - 0ebe09a5ce6665a5fe1df1c644d4f77189c4deba + 16a344fc2ff2eecac5b03b88c96e99d7796e5125 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index daf35b81a..92e04014c 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23531.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23531.4" } } From 5a3e996f0254e60b2367ef1f867d487c24745ade Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Nov 2023 12:08:54 +0000 Subject: [PATCH 099/117] Update dependencies from https://github.com/dotnet/arcade build 20231101.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 9.0.0-beta.23551.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 4fbb8bc0b..9d09d550d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + aa96cf38432123dc5de1a2ad877e3ff6b079c928 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + aa96cf38432123dc5de1a2ad877e3ff6b079c928 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + aa96cf38432123dc5de1a2ad877e3ff6b079c928 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + aa96cf38432123dc5de1a2ad877e3ff6b079c928 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + aa96cf38432123dc5de1a2ad877e3ff6b079c928 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 92e04014c..0a4e8f7cc 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23531.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23551.1" } } From 7c69068b527f5ae40a3dc8801d69d72cb991966d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Nov 2023 12:09:11 +0000 Subject: [PATCH 100/117] Update dependencies from https://github.com/dotnet/arcade build 20231102.4 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 9.0.0-beta.23552.4 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/tools.sh | 7 ++++++- global.json | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d09d550d..1d05a5291 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - aa96cf38432123dc5de1a2ad877e3ff6b079c928 + 215ead44de53294bc1223b593a36bda5493df4ba - + https://github.com/dotnet/arcade - aa96cf38432123dc5de1a2ad877e3ff6b079c928 + 215ead44de53294bc1223b593a36bda5493df4ba - + https://github.com/dotnet/arcade - aa96cf38432123dc5de1a2ad877e3ff6b079c928 + 215ead44de53294bc1223b593a36bda5493df4ba - + https://github.com/dotnet/arcade - aa96cf38432123dc5de1a2ad877e3ff6b079c928 + 215ead44de53294bc1223b593a36bda5493df4ba - + https://github.com/dotnet/arcade - aa96cf38432123dc5de1a2ad877e3ff6b079c928 + 215ead44de53294bc1223b593a36bda5493df4ba https://github.com/dotnet/arcade-services diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 710e64df9..e7ec245bc 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -341,7 +341,12 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - _InitializeBuildToolFramework="net8.0" + # use override if it exists - commonly set by source-build + if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then + _InitializeBuildToolFramework="net8.0" + else + _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" + fi } # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 diff --git a/global.json b/global.json index 0a4e8f7cc..aabae6f46 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23551.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23552.4" } } From d3186cd882df1092eb5eded3619876f237e743d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Nov 2023 12:08:36 +0000 Subject: [PATCH 101/117] Update dependencies from https://github.com/dotnet/arcade build 20231103.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 9.0.0-beta.23553.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 1d05a5291..c5b3f4d9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 215ead44de53294bc1223b593a36bda5493df4ba + 1f067970472e5eb1877797bc4304dd13f284c7ba - + https://github.com/dotnet/arcade - 215ead44de53294bc1223b593a36bda5493df4ba + 1f067970472e5eb1877797bc4304dd13f284c7ba - + https://github.com/dotnet/arcade - 215ead44de53294bc1223b593a36bda5493df4ba + 1f067970472e5eb1877797bc4304dd13f284c7ba - + https://github.com/dotnet/arcade - 215ead44de53294bc1223b593a36bda5493df4ba + 1f067970472e5eb1877797bc4304dd13f284c7ba - + https://github.com/dotnet/arcade - 215ead44de53294bc1223b593a36bda5493df4ba + 1f067970472e5eb1877797bc4304dd13f284c7ba https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index aabae6f46..9f5554cfd 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23552.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23553.1" } } From 49658e9c23d39714246a4feb409f7518d02a08f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 Nov 2023 13:08:00 +0000 Subject: [PATCH 102/117] Update dependencies from https://github.com/dotnet/arcade build 20231103.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 9.0.0-beta.23553.1 From 26051b27a14eeaa157629ead9a0a1bc66709416f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Nov 2023 13:08:29 +0000 Subject: [PATCH 103/117] Update dependencies from https://github.com/dotnet/arcade build 20231103.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 9.0.0-beta.23553.1 From 26aa360786f2bef36330b62b2e8dfdededf32ec9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Nov 2023 13:10:05 +0000 Subject: [PATCH 104/117] Update dependencies from https://github.com/dotnet/arcade build 20231106.4 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 9.0.0-beta.23556.4 --- 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 c5b3f4d9c..672940c46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 1f067970472e5eb1877797bc4304dd13f284c7ba + 21c8b7373b7e4845f7df0ad15654529c1f41b66d - + https://github.com/dotnet/arcade - 1f067970472e5eb1877797bc4304dd13f284c7ba + 21c8b7373b7e4845f7df0ad15654529c1f41b66d - + https://github.com/dotnet/arcade - 1f067970472e5eb1877797bc4304dd13f284c7ba + 21c8b7373b7e4845f7df0ad15654529c1f41b66d - + https://github.com/dotnet/arcade - 1f067970472e5eb1877797bc4304dd13f284c7ba + 21c8b7373b7e4845f7df0ad15654529c1f41b66d - + https://github.com/dotnet/arcade - 1f067970472e5eb1877797bc4304dd13f284c7ba + 21c8b7373b7e4845f7df0ad15654529c1f41b66d https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 9f5554cfd..5e575aaee 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23553.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23556.4" } } From e3d402eeeb56dd61aff9c945b484dd26c2856c26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Nov 2023 13:11:17 +0000 Subject: [PATCH 105/117] Update dependencies from https://github.com/dotnet/arcade build 20231107.7 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 9.0.0-beta.23557.7 --- 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 672940c46..6099a9aed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 21c8b7373b7e4845f7df0ad15654529c1f41b66d + aa0317458d29ec79935ca04fa47d3a6f14a0944f - + https://github.com/dotnet/arcade - 21c8b7373b7e4845f7df0ad15654529c1f41b66d + aa0317458d29ec79935ca04fa47d3a6f14a0944f - + https://github.com/dotnet/arcade - 21c8b7373b7e4845f7df0ad15654529c1f41b66d + aa0317458d29ec79935ca04fa47d3a6f14a0944f - + https://github.com/dotnet/arcade - 21c8b7373b7e4845f7df0ad15654529c1f41b66d + aa0317458d29ec79935ca04fa47d3a6f14a0944f - + https://github.com/dotnet/arcade - 21c8b7373b7e4845f7df0ad15654529c1f41b66d + aa0317458d29ec79935ca04fa47d3a6f14a0944f https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 5e575aaee..4a568e6ac 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23556.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23557.7" } } From ebecdb75907e991c79946827198739dc31a05eba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Nov 2023 13:12:04 +0000 Subject: [PATCH 106/117] Update dependencies from https://github.com/dotnet/arcade build 20231108.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 9.0.0-beta.23558.3 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/tools.sh | 2 +- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6099a9aed..d7fd74e71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - aa0317458d29ec79935ca04fa47d3a6f14a0944f + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - aa0317458d29ec79935ca04fa47d3a6f14a0944f + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - aa0317458d29ec79935ca04fa47d3a6f14a0944f + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - aa0317458d29ec79935ca04fa47d3a6f14a0944f + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - aa0317458d29ec79935ca04fa47d3a6f14a0944f + f2ad2b48b7426e77e19902068b3aa38476073ab1 https://github.com/dotnet/arcade-services diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e7ec245bc..e98daf50c 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -310,7 +310,7 @@ function GetDotNetInstallScript { curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || { if command -v openssl &> /dev/null; then echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation" - echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443 + echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443 || true fi echo "Will now retry the same URL with verbose logging." with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || { diff --git a/global.json b/global.json index 4a568e6ac..2ff8877fb 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23557.7" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23558.3" } } From cfa57c035a701b746a7925f48b46c5634b6dbc6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Nov 2023 13:11:41 +0000 Subject: [PATCH 107/117] Update dependencies from https://github.com/dotnet/arcade build 20231109.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 9.0.0-beta.23559.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 d7fd74e71..2ad7f503c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - f2ad2b48b7426e77e19902068b3aa38476073ab1 + a6513a141bc5cb0d7d625399918fcbca1dc8a412 - + https://github.com/dotnet/arcade - f2ad2b48b7426e77e19902068b3aa38476073ab1 + a6513a141bc5cb0d7d625399918fcbca1dc8a412 - + https://github.com/dotnet/arcade - f2ad2b48b7426e77e19902068b3aa38476073ab1 + a6513a141bc5cb0d7d625399918fcbca1dc8a412 - + https://github.com/dotnet/arcade - f2ad2b48b7426e77e19902068b3aa38476073ab1 + a6513a141bc5cb0d7d625399918fcbca1dc8a412 - + https://github.com/dotnet/arcade - f2ad2b48b7426e77e19902068b3aa38476073ab1 + a6513a141bc5cb0d7d625399918fcbca1dc8a412 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 2ff8877fb..cd8169036 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23558.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23559.3" } } From a7a85aa8196004a07b2ef23fddf11cf74e942991 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Nov 2023 13:11:00 +0000 Subject: [PATCH 108/117] Update dependencies from https://github.com/dotnet/arcade build 20231110.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 9.0.0-beta.23560.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/cross/toolchain.cmake | 4 ++++ global.json | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ad7f503c..5aaa6f4aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - a6513a141bc5cb0d7d625399918fcbca1dc8a412 + 576b0a6fca70266087aa247d68896376ecec8c6e - + https://github.com/dotnet/arcade - a6513a141bc5cb0d7d625399918fcbca1dc8a412 + 576b0a6fca70266087aa247d68896376ecec8c6e - + https://github.com/dotnet/arcade - a6513a141bc5cb0d7d625399918fcbca1dc8a412 + 576b0a6fca70266087aa247d68896376ecec8c6e - + https://github.com/dotnet/arcade - a6513a141bc5cb0d7d625399918fcbca1dc8a412 + 576b0a6fca70266087aa247d68896376ecec8c6e - + https://github.com/dotnet/arcade - a6513a141bc5cb0d7d625399918fcbca1dc8a412 + 576b0a6fca70266087aa247d68896376ecec8c6e https://github.com/dotnet/arcade-services diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 00288a300..3762640fd 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -288,6 +288,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") endif() +elseif(TARGET_ARCH_NAME STREQUAL "s390x") + add_toolchain_linker_flag("--target=${TOOLCHAIN}") elseif(TARGET_ARCH_NAME STREQUAL "x86") if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) add_toolchain_linker_flag("--target=${TOOLCHAIN}") @@ -335,6 +337,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TARGET_ARCH_NAME STREQUAL "armel") add_compile_options(-mfloat-abi=softfp) endif() +elseif(TARGET_ARCH_NAME STREQUAL "s390x") + add_compile_options("--target=${TOOLCHAIN}") elseif(TARGET_ARCH_NAME STREQUAL "x86") if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) add_compile_options(--target=${TOOLCHAIN}) diff --git a/global.json b/global.json index cd8169036..14d5ac2b1 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23559.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23560.1" } } From 5de069fc67076fc6d2865eef5c3e24273572f766 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 12 Nov 2023 13:10:39 +0000 Subject: [PATCH 109/117] Update dependencies from https://github.com/dotnet/arcade build 20231110.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 9.0.0-beta.23560.1 From 6ce9dc48c837109bb32930533cbf1e05c4679bbd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Nov 2023 13:10:20 +0000 Subject: [PATCH 110/117] Update dependencies from https://github.com/dotnet/arcade build 20231110.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 9.0.0-beta.23560.1 From 720b48b0b038699f82f87efae813ee66d17e8e84 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Nov 2023 13:11:49 +0000 Subject: [PATCH 111/117] Update dependencies from https://github.com/dotnet/arcade build 20231113.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 9.0.0-beta.23563.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 5aaa6f4aa..5b0775f40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 576b0a6fca70266087aa247d68896376ecec8c6e + e3fde0b990dea6fbb8d06574a136cf2d4a12bf4e - + https://github.com/dotnet/arcade - 576b0a6fca70266087aa247d68896376ecec8c6e + e3fde0b990dea6fbb8d06574a136cf2d4a12bf4e - + https://github.com/dotnet/arcade - 576b0a6fca70266087aa247d68896376ecec8c6e + e3fde0b990dea6fbb8d06574a136cf2d4a12bf4e - + https://github.com/dotnet/arcade - 576b0a6fca70266087aa247d68896376ecec8c6e + e3fde0b990dea6fbb8d06574a136cf2d4a12bf4e - + https://github.com/dotnet/arcade - 576b0a6fca70266087aa247d68896376ecec8c6e + e3fde0b990dea6fbb8d06574a136cf2d4a12bf4e https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 14d5ac2b1..38e5cca24 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23560.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23563.1" } } From 5342c9535e0e3b054574ba1509352737b097fffe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Nov 2023 13:12:32 +0000 Subject: [PATCH 112/117] Update dependencies from https://github.com/dotnet/arcade build 20231114.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 9.0.0-beta.23564.3 --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b0775f40..c7a21cee0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - e3fde0b990dea6fbb8d06574a136cf2d4a12bf4e + b1e52f70fee51ea06ca106d07aec876c68b7d113 - + https://github.com/dotnet/arcade - e3fde0b990dea6fbb8d06574a136cf2d4a12bf4e + b1e52f70fee51ea06ca106d07aec876c68b7d113 - + https://github.com/dotnet/arcade - e3fde0b990dea6fbb8d06574a136cf2d4a12bf4e + b1e52f70fee51ea06ca106d07aec876c68b7d113 - + https://github.com/dotnet/arcade - e3fde0b990dea6fbb8d06574a136cf2d4a12bf4e + b1e52f70fee51ea06ca106d07aec876c68b7d113 - + https://github.com/dotnet/arcade - e3fde0b990dea6fbb8d06574a136cf2d4a12bf4e + b1e52f70fee51ea06ca106d07aec876c68b7d113 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 38e5cca24..3e5e8334a 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "allowPrerelease": true }, "tools": { - "dotnet": "8.0.100-rtm.23506.1", + "dotnet": "8.0.100", "runtimes": { "dotnet": [ "6.0.0" @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23563.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23564.3" } } From 6a28dcae6982d5ef3dd05acfc1e6c960faf1abf7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Nov 2023 13:12:52 +0000 Subject: [PATCH 113/117] Update dependencies from https://github.com/dotnet/arcade build 20231115.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 9.0.0-beta.23565.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 c7a21cee0..4272049f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - b1e52f70fee51ea06ca106d07aec876c68b7d113 + 0f16479e1811ef3b5c9fc251563c6181f9083c34 - + https://github.com/dotnet/arcade - b1e52f70fee51ea06ca106d07aec876c68b7d113 + 0f16479e1811ef3b5c9fc251563c6181f9083c34 - + https://github.com/dotnet/arcade - b1e52f70fee51ea06ca106d07aec876c68b7d113 + 0f16479e1811ef3b5c9fc251563c6181f9083c34 - + https://github.com/dotnet/arcade - b1e52f70fee51ea06ca106d07aec876c68b7d113 + 0f16479e1811ef3b5c9fc251563c6181f9083c34 - + https://github.com/dotnet/arcade - b1e52f70fee51ea06ca106d07aec876c68b7d113 + 0f16479e1811ef3b5c9fc251563c6181f9083c34 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 3e5e8334a..713954d35 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23564.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23565.1" } } From 1a400539352481ebd09f5a30814a5c0e50d894c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Nov 2023 13:10:44 +0000 Subject: [PATCH 114/117] Update dependencies from https://github.com/dotnet/arcade build 20231115.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 9.0.0-beta.23565.1 From 9ffacd48b10eb214f0d6c6015df7f5a3cb5bfc50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Nov 2023 13:12:04 +0000 Subject: [PATCH 115/117] Update dependencies from https://github.com/dotnet/arcade build 20231117.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 9.0.0-beta.23567.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 4272049f6..5b47227c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 0f16479e1811ef3b5c9fc251563c6181f9083c34 + b6801170e6ca8bf12bdff1f10d410c5e01660681 - + https://github.com/dotnet/arcade - 0f16479e1811ef3b5c9fc251563c6181f9083c34 + b6801170e6ca8bf12bdff1f10d410c5e01660681 - + https://github.com/dotnet/arcade - 0f16479e1811ef3b5c9fc251563c6181f9083c34 + b6801170e6ca8bf12bdff1f10d410c5e01660681 - + https://github.com/dotnet/arcade - 0f16479e1811ef3b5c9fc251563c6181f9083c34 + b6801170e6ca8bf12bdff1f10d410c5e01660681 - + https://github.com/dotnet/arcade - 0f16479e1811ef3b5c9fc251563c6181f9083c34 + b6801170e6ca8bf12bdff1f10d410c5e01660681 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 713954d35..8cce38e67 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23565.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23567.1" } } From b60dd8f564af49489f5439b95cd2ad0639fe1b7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 19 Nov 2023 13:09:33 +0000 Subject: [PATCH 116/117] Update dependencies from https://github.com/dotnet/arcade build 20231117.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 9.0.0-beta.23567.1 From 5714d520fe4d5abcd13804783120c320c072cb4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Nov 2023 13:09:11 +0000 Subject: [PATCH 117/117] Update dependencies from https://github.com/dotnet/arcade build 20231117.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 9.0.0-beta.23567.1