From b81468cf6d2c53e076d194c59d1acd3145961b19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 May 2024 12:06:45 +0000 Subject: [PATCH 01/14] Update dependencies from https://github.com/dotnet/arcade build 20240506.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24256.2 --- eng/Version.Details.xml | 84 +++++++++---------- eng/Versions.props | 32 +++---- .../job/source-index-stage1.yml | 40 ++++++--- .../core-templates/post-build/post-build.yml | 40 ++++++--- eng/common/native/init-distro-rid.sh | 18 +--- global.json | 6 +- 6 files changed, 119 insertions(+), 101 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27ba1dc00c7ff5..07975af5a9178c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 53a781a352194650f998d3056a514571937b26e5 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + 9fc042c22b0e538c7f1b412127b265ca2fc77334 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 19bbef019e1736..02da688f5d1d25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.5.24256.1 - 9.0.0-beta.24253.1 - 9.0.0-beta.24253.1 - 9.0.0-beta.24253.1 - 9.0.0-beta.24253.1 - 2.6.7-beta.24253.1 - 9.0.0-beta.24253.1 - 2.6.7-beta.24253.1 - 9.0.0-beta.24253.1 - 9.0.0-beta.24253.1 - 9.0.0-beta.24253.1 - 9.0.0-beta.24253.1 - 9.0.0-beta.24253.1 - 9.0.0-beta.24253.1 - 9.0.0-beta.24253.1 - 9.0.0-beta.24253.1 - 9.0.0-beta.24253.1 + 9.0.0-beta.24256.2 + 9.0.0-beta.24256.2 + 9.0.0-beta.24256.2 + 9.0.0-beta.24256.2 + 2.6.7-beta.24256.2 + 9.0.0-beta.24256.2 + 2.6.7-beta.24256.2 + 9.0.0-beta.24256.2 + 9.0.0-beta.24256.2 + 9.0.0-beta.24256.2 + 9.0.0-beta.24256.2 + 9.0.0-beta.24256.2 + 9.0.0-beta.24256.2 + 9.0.0-beta.24256.2 + 9.0.0-beta.24256.2 + 9.0.0-beta.24256.2 1.4.0 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 9c6e5ae3c3e45a..f1938eec102033 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20240129.2 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -15,14 +16,14 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables - template: /eng/common/core-templates/variables/pool-providers.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} @@ -54,8 +55,8 @@ jobs: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -67,7 +68,24 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) - displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + + - script: | + echo "Client ID: $(ARM_CLIENT_ID)" + echo "ID Token: $(ARM_ID_TOKEN)" + echo "Tenant ID: $(ARM_TENANT_ID)" + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 + displayName: Upload stage1 artifacts to source index \ No newline at end of file diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index ed1e6692f739b2..865bc1ecb4f0f6 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -115,9 +115,13 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows + ${{ if eq(parameters.is1ESPipeline, true) }}: + name: $(DncEngInternalBuildPool) + image: windows.vs2022.amd64 + os: windows + ${{ else }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -156,9 +160,13 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows + ${{ if eq(parameters.is1ESPipeline, true) }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + ${{ else }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -216,9 +224,13 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows + ${{ if eq(parameters.is1ESPipeline, true) }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + ${{ else }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -273,9 +285,13 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 - os: windows + ${{ if eq(parameters.is1ESPipeline, true) }}: + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 + os: windows + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh index 228be0b1598629..83ea7aab0e081c 100644 --- a/eng/common/native/init-distro-rid.sh +++ b/eng/common/native/init-distro-rid.sh @@ -20,10 +20,6 @@ getNonPortableDistroRid() # shellcheck disable=SC1091 if [ -e "${rootfsDir}/etc/os-release" ]; then . "${rootfsDir}/etc/os-release" - if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ] || [ "${ID}" = "ol" ]; then - VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros - fi - if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then nonPortableRid="${ID}.${VERSION_ID}-${targetArch}" else @@ -48,19 +44,7 @@ getNonPortableDistroRid() 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" | cut -c9-10) - nonPortableRid="omnios.$__omnios_major_version-${targetArch}" - ;; - joyent_*) - __smartos_major_version=$(echo "$__uname_version" | cut -c9-10) - nonPortableRid="smartos.$__smartos_major_version-${targetArch}" - ;; - *) - nonPortableRid="illumos-${targetArch}" - ;; - esac + nonPortableRid="illumos-${targetArch}" elif [ "$targetOs" = "solaris" ]; then __uname_version=$(uname -v) __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1) diff --git a/global.json b/global.json index 3fb631e1624de6..33328b6d442770 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.3.24204.13" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24253.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24253.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24253.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24256.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24256.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24256.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24256.1" From c011bb7d252b5cd26c7552a957c3d6643b18b244 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 May 2024 12:06:54 +0000 Subject: [PATCH 02/14] Update dependencies from https://github.com/dotnet/arcade build 20240508.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24258.1 --- eng/Version.Details.xml | 84 ++++++++++----------- eng/Versions.props | 32 ++++---- eng/common/cross/build-rootfs.sh | 122 ++++++++++++++++++++++++++----- global.json | 6 +- 4 files changed, 163 insertions(+), 81 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07975af5a9178c..a88e3a7c769850 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 53a781a352194650f998d3056a514571937b26e5 - + https://github.com/dotnet/arcade - 9fc042c22b0e538c7f1b412127b265ca2fc77334 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 02da688f5d1d25..a392a21dd7cd05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.5.24256.1 - 9.0.0-beta.24256.2 - 9.0.0-beta.24256.2 - 9.0.0-beta.24256.2 - 9.0.0-beta.24256.2 - 2.6.7-beta.24256.2 - 9.0.0-beta.24256.2 - 2.6.7-beta.24256.2 - 9.0.0-beta.24256.2 - 9.0.0-beta.24256.2 - 9.0.0-beta.24256.2 - 9.0.0-beta.24256.2 - 9.0.0-beta.24256.2 - 9.0.0-beta.24256.2 - 9.0.0-beta.24256.2 - 9.0.0-beta.24256.2 - 9.0.0-beta.24256.2 + 9.0.0-beta.24258.1 + 9.0.0-beta.24258.1 + 9.0.0-beta.24258.1 + 9.0.0-beta.24258.1 + 2.6.7-beta.24258.1 + 9.0.0-beta.24258.1 + 2.6.7-beta.24258.1 + 9.0.0-beta.24258.1 + 9.0.0-beta.24258.1 + 9.0.0-beta.24258.1 + 9.0.0-beta.24258.1 + 9.0.0-beta.24258.1 + 9.0.0-beta.24258.1 + 9.0.0-beta.24258.1 + 9.0.0-beta.24258.1 + 9.0.0-beta.24258.1 1.4.0 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index ed1bfeda3c9513..a8e35df7cee14d 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -451,13 +451,32 @@ fi mkdir -p "$__RootfsDir" __RootfsDir="$( cd "$__RootfsDir" && pwd )" +__hasWget= +ensureDownloadTool() +{ + if command -v wget &> /dev/null; then + __hasWget=1 + elif command -v curl &> /dev/null; then + __hasWget=0 + else + >&2 echo "ERROR: either wget or curl is required by this script." + exit 1 + fi +} + if [[ "$__CodeName" == "alpine" ]]; then __ApkToolsVersion=2.12.11 __ApkToolsDir="$(mktemp -d)" __ApkKeysDir="$(mktemp -d)" - arch="$(uname -m)" - wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" -P "$__ApkToolsDir" + + ensureDownloadTool + + if [[ "$__hasWget" == 1 ]]; then + wget -P "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" + else + curl -SLO --create-dirs --output-dir "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" + fi if [[ "$arch" == "x86_64" ]]; then __ApkToolsSHA512SUM="53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33" elif [[ "$arch" == "aarch64" ]]; then @@ -520,12 +539,23 @@ if [[ "$__CodeName" == "alpine" ]]; then elif [[ "$__CodeName" == "freebsd" ]]; then mkdir -p "$__RootfsDir"/usr/local/etc JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} - wget -O - "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version + + ensureDownloadTool + + if [[ "$__hasWget" == 1 ]]; then + wget -O- "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version + else + curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version + fi echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf mkdir -p "$__RootfsDir"/tmp # get and build package manager - wget -O - "https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz" | tar -C "$__RootfsDir"/tmp -zxf - + if [[ "$__hasWget" == 1 ]]; then + wget -O- "https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz" | tar -C "$__RootfsDir"/tmp -zxf - + else + curl -SL "https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz" | tar -C "$__RootfsDir"/tmp -zxf - + fi cd "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}" # needed for install to succeed mkdir -p "$__RootfsDir"/host/etc @@ -539,15 +569,30 @@ elif [[ "$__CodeName" == "illumos" ]]; then mkdir "$__RootfsDir/tmp" pushd "$__RootfsDir/tmp" JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} + + ensureDownloadTool + echo "Downloading sysroot." - wget -O - https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf - + if [[ "$__hasWget" == 1 ]]; then + wget -O- https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf - + else + curl -SL https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf - + fi echo "Building binutils. Please wait.." - wget -O - https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - + if [[ "$__hasWget" == 1 ]]; then + wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - + else + curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - + fi mkdir build-binutils && cd build-binutils ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" make -j "$JOBS" && make install && cd .. echo "Building gcc. Please wait.." - wget -O - https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - + if [[ "$__hasWget" == 1 ]]; then + wget -O- https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - + else + curl -SL https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - + fi CFLAGS="-fPIC" CXXFLAGS="-fPIC" CXXFLAGS_FOR_TARGET="-fPIC" @@ -564,7 +609,11 @@ elif [[ "$__CodeName" == "illumos" ]]; then fi BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All" echo "Downloading manifest" - wget "$BaseUrl" + if [[ "$__hasWget" == 1 ]]; then + wget "$BaseUrl" + else + curl -SLO "$BaseUrl" + fi echo "Downloading dependencies." read -ra array <<<"$__IllumosPackages" for package in "${array[@]}"; do @@ -572,7 +621,11 @@ elif [[ "$__CodeName" == "illumos" ]]; then # find last occurrence of package in listing and extract its name package="$(sed -En '/.*href="('"$package"'-[0-9].*).tgz".*/h;$!d;g;s//\1/p' All)" echo "Resolved name '$package'" - wget "$BaseUrl"/"$package".tgz + if [[ "$__hasWget" == 1 ]]; then + wget "$BaseUrl"/"$package".tgz + else + curl -SLO "$BaseUrl"/"$package".tgz + fi ar -x "$package".tgz tar --skip-old-files -xzf "$package".tmp.tg* -C "$__RootfsDir" 2>/dev/null done @@ -581,10 +634,17 @@ elif [[ "$__CodeName" == "illumos" ]]; then rm -rf "$__RootfsDir"/{tmp,+*} mkdir -p "$__RootfsDir"/usr/include/net mkdir -p "$__RootfsDir"/usr/include/netpacket - wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h - wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h - wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h - wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h + if [[ "$__hasWget" == 1 ]]; then + wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h + wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h + wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h + wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h + else + curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h + curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h + curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h + curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h + fi elif [[ "$__CodeName" == "haiku" ]]; then JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} @@ -594,9 +654,16 @@ elif [[ "$__CodeName" == "haiku" ]]; then mkdir "$__RootfsDir/tmp/download" + ensureDownloadTool + echo "Downloading Haiku package tool" git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 "$__RootfsDir/tmp/script" - wget -O "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)" + if [[ "$__hasWget" == 1 ]]; then + wget -O "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)" + else + curl -SLo "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)" + fi + unzip -o "$__RootfsDir/tmp/download/hosttools.zip" -d "$__RootfsDir/tmp/bin" DepotBaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg" @@ -609,14 +676,25 @@ elif [[ "$__CodeName" == "haiku" ]]; then echo "Downloading $package..." # API documented here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L60 # The schema here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L598 - hpkgDownloadUrl="$(wget -qO- --post-data='{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \ - --header='Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" - wget -P "$__RootfsDir/tmp/download" "$hpkgDownloadUrl" + if [[ "$__hasWget" == 1 ]]; then + hpkgDownloadUrl="$(wget -qO- --post-data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \ + --header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" + wget -P "$__RootfsDir/tmp/download" "$hpkgDownloadUrl" + else + hpkgDownloadUrl="$(curl -sSL -XPOST --data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \ + --header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" + curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$hpkgDownloadUrl" + fi done for package in haiku haiku_devel; do echo "Downloading $package..." - hpkgVersion="$(wget -qO- $HpkgBaseUrl | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" - wget -P "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" + if [[ "$__hasWget" == 1 ]]; then + hpkgVersion="$(wget -qO- "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" + wget -P "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" + else + hpkgVersion="$(curl -sSL "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" + curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" + fi done # Set up the sysroot @@ -629,7 +707,11 @@ elif [[ "$__CodeName" == "haiku" ]]; then # Download buildtools echo "Downloading Haiku buildtools" - wget -O "$__RootfsDir/tmp/download/buildtools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --buildtools --arch=$__HaikuArch)" + if [[ "$__hasWget" == 1 ]]; then + wget -O "$__RootfsDir/tmp/download/buildtools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --buildtools --arch=$__HaikuArch)" + else + curl -SLo "$__RootfsDir/tmp/download/buildtools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --buildtools --arch=$__HaikuArch)" + fi unzip -o "$__RootfsDir/tmp/download/buildtools.zip" -d "$__RootfsDir" # Cleaning up temporary files diff --git a/global.json b/global.json index 33328b6d442770..75584f4ff9b14c 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.3.24204.13" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24256.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24256.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24256.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24258.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24258.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24258.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24256.1" From 2b7a0ed2d0890677edaff824feb5d2d2191e470d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 May 2024 12:04:17 +0000 Subject: [PATCH 03/14] Update dependencies from https://github.com/dotnet/arcade build 20240508.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24258.1 From 9ed4de2ddf85c6d5a80a43f5cf170241b34baef5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 May 2024 12:05:19 +0000 Subject: [PATCH 04/14] Update dependencies from https://github.com/dotnet/arcade build 20240508.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24258.1 From e68acba8af6d9f6625216d743ea64237b7bc0a2b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 May 2024 12:07:39 +0000 Subject: [PATCH 05/14] Update dependencies from https://github.com/dotnet/arcade build 20240510.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24260.2 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- global.json | 6 +-- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a88e3a7c769850..97121cb4ccce0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 53a781a352194650f998d3056a514571937b26e5 - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index a392a21dd7cd05..cb764ef363a370 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.5.24256.1 - 9.0.0-beta.24258.1 - 9.0.0-beta.24258.1 - 9.0.0-beta.24258.1 - 9.0.0-beta.24258.1 - 2.6.7-beta.24258.1 - 9.0.0-beta.24258.1 - 2.6.7-beta.24258.1 - 9.0.0-beta.24258.1 - 9.0.0-beta.24258.1 - 9.0.0-beta.24258.1 - 9.0.0-beta.24258.1 - 9.0.0-beta.24258.1 - 9.0.0-beta.24258.1 - 9.0.0-beta.24258.1 - 9.0.0-beta.24258.1 - 9.0.0-beta.24258.1 + 9.0.0-beta.24260.2 + 9.0.0-beta.24260.2 + 9.0.0-beta.24260.2 + 9.0.0-beta.24260.2 + 2.6.7-beta.24260.2 + 9.0.0-beta.24260.2 + 2.6.7-beta.24260.2 + 9.0.0-beta.24260.2 + 9.0.0-beta.24260.2 + 9.0.0-beta.24260.2 + 9.0.0-beta.24260.2 + 9.0.0-beta.24260.2 + 9.0.0-beta.24260.2 + 9.0.0-beta.24260.2 + 9.0.0-beta.24260.2 + 9.0.0-beta.24260.2 1.4.0 diff --git a/global.json b/global.json index 75584f4ff9b14c..e73cf2d5cd2bf9 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.3.24204.13" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24258.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24258.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24258.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24260.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24260.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24260.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24256.1" From a27c6e962ceccdff62a50f66964f9a21059ade72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 12 May 2024 12:07:39 +0000 Subject: [PATCH 06/14] Update dependencies from https://github.com/dotnet/arcade build 20240510.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24260.2 From fe566bba96798a18fd322b1c762b9c8465bd50ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 May 2024 12:05:18 +0000 Subject: [PATCH 07/14] Update dependencies from https://github.com/dotnet/arcade build 20240510.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24260.2 From d7f4bcadb2000cc44a814a2b168ea1276e0364ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 May 2024 12:05:02 +0000 Subject: [PATCH 08/14] Update dependencies from https://github.com/dotnet/arcade build 20240510.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24260.2 From 54e2827f8db8a1f3cf954e6df76ae6f3dc55f723 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 May 2024 12:04:54 +0000 Subject: [PATCH 09/14] Update dependencies from https://github.com/dotnet/arcade build 20240510.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24260.2 From 0aa96032846d71beac3c78f11d7c2d2aed348cfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 May 2024 12:08:43 +0000 Subject: [PATCH 10/14] Update dependencies from https://github.com/dotnet/arcade build 20240515.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24265.1 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- global.json | 6 +-- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97121cb4ccce0a..2908ffc757c90e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 53a781a352194650f998d3056a514571937b26e5 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index cb764ef363a370..af0fd025c2db86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.5.24256.1 - 9.0.0-beta.24260.2 - 9.0.0-beta.24260.2 - 9.0.0-beta.24260.2 - 9.0.0-beta.24260.2 - 2.6.7-beta.24260.2 - 9.0.0-beta.24260.2 - 2.6.7-beta.24260.2 - 9.0.0-beta.24260.2 - 9.0.0-beta.24260.2 - 9.0.0-beta.24260.2 - 9.0.0-beta.24260.2 - 9.0.0-beta.24260.2 - 9.0.0-beta.24260.2 - 9.0.0-beta.24260.2 - 9.0.0-beta.24260.2 - 9.0.0-beta.24260.2 + 9.0.0-beta.24265.1 + 9.0.0-beta.24265.1 + 9.0.0-beta.24265.1 + 9.0.0-beta.24265.1 + 2.6.7-beta.24265.1 + 9.0.0-beta.24265.1 + 2.6.7-beta.24265.1 + 9.0.0-beta.24265.1 + 9.0.0-beta.24265.1 + 9.0.0-beta.24265.1 + 9.0.0-beta.24265.1 + 9.0.0-beta.24265.1 + 9.0.0-beta.24265.1 + 9.0.0-beta.24265.1 + 9.0.0-beta.24265.1 + 9.0.0-beta.24265.1 1.4.0 diff --git a/global.json b/global.json index e73cf2d5cd2bf9..8b838e68c833ca 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.3.24204.13" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24260.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24260.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24260.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24265.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24265.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24265.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24256.1" From a5b31890fb716f2211534e44e00ea4003d00a255 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 May 2024 12:07:47 +0000 Subject: [PATCH 11/14] Update dependencies from https://github.com/dotnet/arcade build 20240516.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24266.1 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- global.json | 6 +-- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2908ffc757c90e..8db62469f6f81d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 53a781a352194650f998d3056a514571937b26e5 - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index af0fd025c2db86..d63b439541b6e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.5.24256.1 - 9.0.0-beta.24265.1 - 9.0.0-beta.24265.1 - 9.0.0-beta.24265.1 - 9.0.0-beta.24265.1 - 2.6.7-beta.24265.1 - 9.0.0-beta.24265.1 - 2.6.7-beta.24265.1 - 9.0.0-beta.24265.1 - 9.0.0-beta.24265.1 - 9.0.0-beta.24265.1 - 9.0.0-beta.24265.1 - 9.0.0-beta.24265.1 - 9.0.0-beta.24265.1 - 9.0.0-beta.24265.1 - 9.0.0-beta.24265.1 - 9.0.0-beta.24265.1 + 9.0.0-beta.24266.1 + 9.0.0-beta.24266.1 + 9.0.0-beta.24266.1 + 9.0.0-beta.24266.1 + 2.6.7-beta.24266.1 + 9.0.0-beta.24266.1 + 2.6.7-beta.24266.1 + 9.0.0-beta.24266.1 + 9.0.0-beta.24266.1 + 9.0.0-beta.24266.1 + 9.0.0-beta.24266.1 + 9.0.0-beta.24266.1 + 9.0.0-beta.24266.1 + 9.0.0-beta.24266.1 + 9.0.0-beta.24266.1 + 9.0.0-beta.24266.1 1.4.0 diff --git a/global.json b/global.json index 8b838e68c833ca..86a574275b81c5 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.3.24204.13" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24265.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24265.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24265.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24266.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24266.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24266.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24256.1" From ae1985752be5d52e09f18770a0073d1f5e2a2d32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 May 2024 12:05:58 +0000 Subject: [PATCH 12/14] Update dependencies from https://github.com/dotnet/arcade build 20240516.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24266.1 From ae8b41840edcddf5c226200c2d676a7a1737a8df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 19 May 2024 12:03:34 +0000 Subject: [PATCH 13/14] Update dependencies from https://github.com/dotnet/arcade build 20240516.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24266.1 From b705f738bbbfd7353a7e79d78d2bf2727946c7a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 May 2024 12:03:28 +0000 Subject: [PATCH 14/14] Update dependencies from https://github.com/dotnet/arcade build 20240516.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24253.1 -> To Version 9.0.0-beta.24266.1