From 1e73c4c65d34d21962e47fbfa2bc4bd5a3dbba26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 14:00:37 +0000 Subject: [PATCH 01/58] Update dependencies from https://github.com/dotnet/arcade build 20240305.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24151.4 -> To Version 8.0.0-beta.24155.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 581707ce6..fc41ba2d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 + fb20e40883718b93d6d60eb0a2446e876ffa3d32 - + https://github.com/dotnet/arcade - cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 + fb20e40883718b93d6d60eb0a2446e876ffa3d32 - + https://github.com/dotnet/arcade - cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 + fb20e40883718b93d6d60eb0a2446e876ffa3d32 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 6dc32fcbb..d38db9beb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24151.4 + 8.0.0-beta.24155.2 diff --git a/global.json b/global.json index 363c757a5..ba0b41425 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24151.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24151.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24155.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24155.2" } } From 3951c40c5d9b51dacb7e704cf875c9224aa4f273 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 14:10:47 +0000 Subject: [PATCH 02/58] Update dependencies from https://github.com/dotnet/arcade-services build 20240307.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24155.3 -> To Version 1.1.0-beta.24157.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9e98e96a8..d0376f567 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24155.3", + "version": "1.1.0-beta.24157.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 581707ce6..e63f52ede 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 - + https://github.com/dotnet/arcade-services - 288b79e6f16a407054b6620f72685d460573ef45 + 049ed7fcb1a7038d20e160b798606c64f743058c - + https://github.com/dotnet/arcade-services - 288b79e6f16a407054b6620f72685d460573ef45 + 049ed7fcb1a7038d20e160b798606c64f743058c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6dc32fcbb..52f31ef17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24155.3 + 1.1.0-beta.24157.2 From ff479e32b8d80489f91c652c8b061c0018b4bae7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 15:27:00 +0000 Subject: [PATCH 03/58] Update dependencies from https://github.com/dotnet/sdk build 20240307.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24157.1 -> To Version 8.0.300-preview.24157.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 581707ce6..c041676ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - ed2df70e71b4af18a94bf21c99ac9d560dc5b99b + 9eda7b302f8ae230123bd0e0924d7094adf04c37 - + https://github.com/dotnet/sdk - ed2df70e71b4af18a94bf21c99ac9d560dc5b99b + 9eda7b302f8ae230123bd0e0924d7094adf04c37 - + https://github.com/dotnet/sdk - ed2df70e71b4af18a94bf21c99ac9d560dc5b99b + 9eda7b302f8ae230123bd0e0924d7094adf04c37 - + https://github.com/dotnet/sdk - ed2df70e71b4af18a94bf21c99ac9d560dc5b99b + 9eda7b302f8ae230123bd0e0924d7094adf04c37 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6dc32fcbb..632b1a913 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24157.1 - 8.0.300-preview.24157.1 - 8.0.300-preview.24157.1 + 8.0.300-preview.24157.3 + 8.0.300-preview.24157.3 + 8.0.300-preview.24157.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 800f432715b8f59c939acbc6cab7bfe2df33a938 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Mar 2024 06:24:46 +0000 Subject: [PATCH 04/58] Update dependencies from https://github.com/dotnet/sdk build 20240307.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24157.1 -> To Version 8.0.300-preview.24157.38 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 12.8.300-beta.24155.6 -> To Version 12.8.300-beta.24157.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c041676ad..72be87c5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 9eda7b302f8ae230123bd0e0924d7094adf04c37 + 74d2c416b20b35bff3e0b5c947295403ec32fef9 - + https://github.com/dotnet/sdk - 9eda7b302f8ae230123bd0e0924d7094adf04c37 + 74d2c416b20b35bff3e0b5c947295403ec32fef9 - + https://github.com/dotnet/sdk - 9eda7b302f8ae230123bd0e0924d7094adf04c37 + 74d2c416b20b35bff3e0b5c947295403ec32fef9 - + https://github.com/dotnet/sdk - 9eda7b302f8ae230123bd0e0924d7094adf04c37 + 74d2c416b20b35bff3e0b5c947295403ec32fef9 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 + d143cc18f506c455e4e4e86a78fccae2a0ee1acf - + https://github.com/dotnet/fsharp - 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 + d143cc18f506c455e4e4e86a78fccae2a0ee1acf @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 99fbf1bddce825ee6b146cf5591c143b216ed88b + d24b5bb8debd2e89df8db13c84694f2982cc41b1 https://github.com/dotnet/msbuild 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - 6009531090c927a8e61da9a0f97bdd5eb6f01a47 + e49fa71580778b8d9c3352ea5ed15ef204f0389f diff --git a/eng/Versions.props b/eng/Versions.props index 632b1a913..074cda2d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24157.3 - 8.0.300-preview.24157.3 - 8.0.300-preview.24157.3 + 8.0.300-preview.24157.38 + 8.0.300-preview.24157.38 + 8.0.300-preview.24157.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24155.13 + 4.10.0-3.24156.11 @@ -127,7 +127,7 @@ - 6.10.0-preview.2.52 + 6.10.0-preview.2.73 From 08959426b25c6af53581ebac2bf4263a605dea32 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 7 Mar 2024 23:50:49 -0800 Subject: [PATCH 05/58] [release/8.0.3xx] Add -pr version of pipeline --- .vsts-pr.yml | 361 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 361 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000..429c53be0 --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,361 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/* + +variables: +- name: _PublishUsingPipelines + value: false +- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}: + - name: PostBuildSign + value: false +- ${{ else }}: + - name: PostBuildSign + value: true +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: Codeql.Enabled + value: true + - group: DotNet-DotNetCli-Storage + - group: DotNet-Installer-SDLValidation-Params + - name: _PublishUsingPipelines + value: true + +- name: _InternalRuntimeDownloadArgs + value: '' + +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBuilds storage account read tokens + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) + +- template: /eng/common/templates/variables/pool-providers.yml + +stages: +- stage: Build + jobs: + # This job is for build retry configuration. + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2022preview.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022preview.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\buildConfiguration + artifact: buildConfiguration + displayName: Publish Build Config + + ## PR-only jobs + + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + + ## Windows + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Debug_x64 + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: true + + ## Linux + + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Ubuntu_22_04_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Fedora_39_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_CentOS_8_Stream_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Debian_11_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64' + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:BuildSdkDeb=true' + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm64_Debug + buildConfiguration: Debug + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + # Never run tests on arm64 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' + buildConfiguration: Debug + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: true + + # MacOS + + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: true + + ## Official/PGO instrumentation Builds + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + + ## Windows + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Linux + + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm_Release + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-arm' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm64_Release + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine' + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-musl-arm' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-musl-arm64' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' + buildConfiguration: Release + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Deb_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg' + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_Arm64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + + # MacOS + + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_arm64 + runtimeIdentifier: 'osx-arm64' + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Windows PGO Instrumentation builds + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Linux PGO Instrumentation builds + + - template: eng/build.yml + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + + - template: eng/build.yml + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + linuxPortable: true + runTests: false + + - template: /eng/common/templates/jobs/source-build.yml + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: Publish + dependsOn: + - Build + jobs: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + publishUsingPipelines: true + publishAssetsImmediately: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 From 3746f1b7476875d90f310c9c7a6c85120e4c5daf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:37:40 +0000 Subject: [PATCH 06/58] [release/8.0.3xx] Update dependencies from dotnet/sdk (#18925) [release/8.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9061d9f39..b9241c6e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 74d2c416b20b35bff3e0b5c947295403ec32fef9 + 33bf1fb49767c788ad8ee8754024fb4ea6c1323c - + https://github.com/dotnet/sdk - 74d2c416b20b35bff3e0b5c947295403ec32fef9 + 33bf1fb49767c788ad8ee8754024fb4ea6c1323c - + https://github.com/dotnet/sdk - 74d2c416b20b35bff3e0b5c947295403ec32fef9 + 33bf1fb49767c788ad8ee8754024fb4ea6c1323c - + https://github.com/dotnet/sdk - 74d2c416b20b35bff3e0b5c947295403ec32fef9 + 33bf1fb49767c788ad8ee8754024fb4ea6c1323c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3ab4a0071..c627a5562 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24157.38 - 8.0.300-preview.24157.38 - 8.0.300-preview.24157.38 + 8.0.300-preview.24158.5 + 8.0.300-preview.24158.5 + 8.0.300-preview.24158.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8846e045b9cc4d70311475e82d93248f32826c43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:38:48 +0000 Subject: [PATCH 07/58] [release/8.0.3xx] Update dependencies from dotnet/arcade (#18928) [release/8.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9241c6e5..2e3049e61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - fb20e40883718b93d6d60eb0a2446e876ffa3d32 + 1307d3e675219bf384f17764651f46767a07960b - + https://github.com/dotnet/arcade - fb20e40883718b93d6d60eb0a2446e876ffa3d32 + 1307d3e675219bf384f17764651f46767a07960b - + https://github.com/dotnet/arcade - fb20e40883718b93d6d60eb0a2446e876ffa3d32 + 1307d3e675219bf384f17764651f46767a07960b https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index c627a5562..f1eb553e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24155.2 + 8.0.0-beta.24156.1 diff --git a/global.json b/global.json index ba0b41425..60454d599 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24155.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24155.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24156.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24156.1" } } From 4cb7c4b6042011301285588c140f3372785a146c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:39:51 +0000 Subject: [PATCH 08/58] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#18929) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d0376f567..0c0eadbaf 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24157.2", + "version": "1.1.0-beta.24157.4", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e3049e61..cfe692e07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 1307d3e675219bf384f17764651f46767a07960b - + https://github.com/dotnet/arcade-services - 049ed7fcb1a7038d20e160b798606c64f743058c + 99db9f39d5eb1b0fd05c20ce5a3147a622972dfd - + https://github.com/dotnet/arcade-services - 049ed7fcb1a7038d20e160b798606c64f743058c + 99db9f39d5eb1b0fd05c20ce5a3147a622972dfd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f1eb553e0..9b335c42e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24157.2 + 1.1.0-beta.24157.4 From 811b43400caead41d1743c194aabd0e918f10965 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Mar 2024 23:20:23 +0000 Subject: [PATCH 09/58] Update dependencies from https://github.com/dotnet/sdk build 20240308.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24158.5 -> To Version 8.0.300-preview.24158.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 12.8.300-beta.24157.2 -> To Version 12.8.300-beta.24157.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfe692e07..9d11baff6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 33bf1fb49767c788ad8ee8754024fb4ea6c1323c + d09d757b92250229b11ab486946c8ad3ed818be9 - + https://github.com/dotnet/sdk - 33bf1fb49767c788ad8ee8754024fb4ea6c1323c + d09d757b92250229b11ab486946c8ad3ed818be9 - + https://github.com/dotnet/sdk - 33bf1fb49767c788ad8ee8754024fb4ea6c1323c + d09d757b92250229b11ab486946c8ad3ed818be9 - + https://github.com/dotnet/sdk - 33bf1fb49767c788ad8ee8754024fb4ea6c1323c + d09d757b92250229b11ab486946c8ad3ed818be9 https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - d143cc18f506c455e4e4e86a78fccae2a0ee1acf + 661d88ab1975665fbe8c580e7e2dab01bf264c27 - + https://github.com/dotnet/fsharp - d143cc18f506c455e4e4e86a78fccae2a0ee1acf + 661d88ab1975665fbe8c580e7e2dab01bf264c27 - + https://github.com/microsoft/vstest - 39c7dd12c7ec24d0552513e84d95476f2077ca33 + 316167369cea59e0ad6ece2a39d94a3a6d49cf12 diff --git a/eng/Versions.props b/eng/Versions.props index 9b335c42e..3b0a93a6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24158.5 - 8.0.300-preview.24158.5 - 8.0.300-preview.24158.5 + 8.0.300-preview.24158.7 + 8.0.300-preview.24158.7 + 8.0.300-preview.24158.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24126-02 + 17.10.0-preview-24158-02 8.0.0-alpha.1.22557.12 From e334e4f42c18e51ad78635cc49071afeb5314dc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Mar 2024 23:58:22 +0000 Subject: [PATCH 10/58] Update dependencies from https://github.com/dotnet/sdk build 20240308.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24158.5 -> To Version 8.0.300-preview.24158.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,NuGet.Build.Tasks From Version 12.8.300-beta.24157.2 -> To Version 12.8.300-beta.24157.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d11baff6..5ea216184 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - d09d757b92250229b11ab486946c8ad3ed818be9 + 114884c8584583b36402efbbfbe342edb652e4e9 - + https://github.com/dotnet/sdk - d09d757b92250229b11ab486946c8ad3ed818be9 + 114884c8584583b36402efbbfbe342edb652e4e9 - + https://github.com/dotnet/sdk - d09d757b92250229b11ab486946c8ad3ed818be9 + 114884c8584583b36402efbbfbe342edb652e4e9 - + https://github.com/dotnet/sdk - d09d757b92250229b11ab486946c8ad3ed818be9 + 114884c8584583b36402efbbfbe342edb652e4e9 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - e49fa71580778b8d9c3352ea5ed15ef204f0389f + 309f2e302dff9e6ba8a2f48ddf28133d68ff7eae diff --git a/eng/Versions.props b/eng/Versions.props index 3b0a93a6d..920e9ab51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24158.7 - 8.0.300-preview.24158.7 - 8.0.300-preview.24158.7 + 8.0.300-preview.24158.11 + 8.0.300-preview.24158.11 + 8.0.300-preview.24158.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.2.73 + 6.10.0-preview.2.76 From 554a285753c68b009408bc646d9ce05de803a18c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Mar 2024 13:55:01 +0000 Subject: [PATCH 11/58] Update dependencies from https://github.com/dotnet/arcade build 20240308.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24156.1 -> To Version 8.0.0-beta.24158.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +++++++++++++------------- global.json | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfe692e07..449afb2f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 1307d3e675219bf384f17764651f46767a07960b + 334436593593431d9dfe13538a8f745f31b3dd59 - + https://github.com/dotnet/arcade - 1307d3e675219bf384f17764651f46767a07960b + 334436593593431d9dfe13538a8f745f31b3dd59 - + https://github.com/dotnet/arcade - 1307d3e675219bf384f17764651f46767a07960b + 334436593593431d9dfe13538a8f745f31b3dd59 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 9b335c42e..91304b80e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24156.1 + 8.0.0-beta.24158.1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6c65e8192..efa2fd72b 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 # Add source entry to PackageSources -function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) @@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern else { Write-Host "Package source $SourceName already present." } - - AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd } # Add a credential node for the specified source -function AddCredential($creds, $source, $username, $password) { +function AddCredential($creds, $source, $username, $pwd) { # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("key", "ClearTextPassword") $sourceElement.AppendChild($passwordElement) | Out-Null } - $passwordElement.SetAttribute("value", $Password) + + $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." ForEach ($PackageSource in $maestroPrivateSources) { Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd } } @@ -144,13 +144,13 @@ if ($disabledSources -ne $null) { $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password # 3.1 uses a different feed url format so it's handled differently here $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - 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 + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + 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 -pwd $Password } $dotnetVersions = @('5','6','7','8') @@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } } -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/global.json b/global.json index 60454d599..2fd958041 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24156.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24156.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24158.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24158.1" } } From 5400dda0c8863a0f80164ebc4e9f0dd25e640743 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Mar 2024 14:00:32 +0000 Subject: [PATCH 12/58] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.3 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24059.4 -> To Version 8.0.0-alpha.1.24158.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfe692e07..e8beca7f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 7134e53b6b1210a1ce8838b12b8f6071e0a3433b + 7a9b99e457a2b9792a3c17ccaf95d80038725108 From f5679a5abb754b0ca3a7dbe018b2f778e3090fda Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Mar 2024 12:49:44 +0000 Subject: [PATCH 13/58] Update dependencies from https://github.com/dotnet/arcade build 20240308.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24156.1 -> To Version 8.0.0-beta.24158.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 4 ++++ eng/common/templates/job/job.yml | 4 ++++ global.json | 4 ++-- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 449afb2f4..b7af01576 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 334436593593431d9dfe13538a8f745f31b3dd59 + 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 - + https://github.com/dotnet/arcade - 334436593593431d9dfe13538a8f745f31b3dd59 + 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 - + https://github.com/dotnet/arcade - 334436593593431d9dfe13538a8f745f31b3dd59 + 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 91304b80e..597eb5de8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24158.1 + 8.0.0-beta.24158.4 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 9e7bebe9a..647e3f92e 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -15,6 +15,7 @@ parameters: timeoutInMinutes: '' variables: [] workspace: '' + templateContext: '' # Job base template specific parameters # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md @@ -68,6 +69,9 @@ jobs: ${{ if ne(parameters.timeoutInMinutes, '') }}: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + variables: - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e24ca2f46..8ec5c4f2d 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -15,6 +15,7 @@ parameters: timeoutInMinutes: '' variables: [] workspace: '' + templateContext: '' # Job base template specific parameters # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md @@ -68,6 +69,9 @@ jobs: ${{ if ne(parameters.timeoutInMinutes, '') }}: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + variables: - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE diff --git a/global.json b/global.json index 2fd958041..51b94e804 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24158.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24158.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24158.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24158.4" } } From 03967076f6e8b524ab76102135cee13c24a34f7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Mar 2024 12:55:40 +0000 Subject: [PATCH 14/58] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.3 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24059.4 -> To Version 8.0.0-alpha.1.24158.3 From 22740c816291c0e346cc796c12643c8bd893d837 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 02:53:15 +0000 Subject: [PATCH 15/58] Update dependencies from https://github.com/dotnet/sdk build 20240310.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24158.11 -> To Version 8.0.300-preview.24160.4 Dependency coherency updates NuGet.Build.Tasks From Version 6.10.0-preview.2.76 -> To Version 6.10.0-preview.2.78 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c14ef53f..44b395b7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 114884c8584583b36402efbbfbe342edb652e4e9 + f5790d85c82426fa0527c3f71cbb9e277d5630e4 - + https://github.com/dotnet/sdk - 114884c8584583b36402efbbfbe342edb652e4e9 + f5790d85c82426fa0527c3f71cbb9e277d5630e4 - + https://github.com/dotnet/sdk - 114884c8584583b36402efbbfbe342edb652e4e9 + f5790d85c82426fa0527c3f71cbb9e277d5630e4 - + https://github.com/dotnet/sdk - 114884c8584583b36402efbbfbe342edb652e4e9 + f5790d85c82426fa0527c3f71cbb9e277d5630e4 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - 309f2e302dff9e6ba8a2f48ddf28133d68ff7eae + 2fdd0d41e33c3354de2750fe154b56751a6682aa diff --git a/eng/Versions.props b/eng/Versions.props index a1b8a3ede..bd9ac4372 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24158.11 - 8.0.300-preview.24158.11 - 8.0.300-preview.24158.11 + 8.0.300-preview.24160.4 + 8.0.300-preview.24160.4 + 8.0.300-preview.24160.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.2.76 + 6.10.0-preview.2.78 From 9e7c27684add4019ea3516fa52454b691033a676 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 03:39:48 +0000 Subject: [PATCH 16/58] Update dependencies from https://github.com/dotnet/sdk build 20240310.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24158.11 -> To Version 8.0.300-preview.24160.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.10.0-3.24156.11 -> To Version 4.10.0-3.24158.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44b395b7d..6bd250ed5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - f5790d85c82426fa0527c3f71cbb9e277d5630e4 + 70abd290ddc5cbac9a18568dce4d56d0d0f85ced - + https://github.com/dotnet/sdk - f5790d85c82426fa0527c3f71cbb9e277d5630e4 + 70abd290ddc5cbac9a18568dce4d56d0d0f85ced - + https://github.com/dotnet/sdk - f5790d85c82426fa0527c3f71cbb9e277d5630e4 + 70abd290ddc5cbac9a18568dce4d56d0d0f85ced - + https://github.com/dotnet/sdk - f5790d85c82426fa0527c3f71cbb9e277d5630e4 + 70abd290ddc5cbac9a18568dce4d56d0d0f85ced https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - d24b5bb8debd2e89df8db13c84694f2982cc41b1 + 026c96327b02c5ce4d3208f821e02d2ffa825312 diff --git a/eng/Versions.props b/eng/Versions.props index bd9ac4372..93f3fc340 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24160.4 - 8.0.300-preview.24160.4 - 8.0.300-preview.24160.4 + 8.0.300-preview.24160.8 + 8.0.300-preview.24160.8 + 8.0.300-preview.24160.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24156.11 + 4.10.0-3.24158.5 From 5adee1f8f13d85380afcd378a9ce8ca5719a4028 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 06:26:37 +0000 Subject: [PATCH 17/58] Update dependencies from https://github.com/dotnet/sdk build 20240310.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24160.8 -> To Version 8.0.300-preview.24160.11 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.10.0-preview-24158-02 -> To Version 17.10.0-preview-24158-06 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bd250ed5..be996551e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 70abd290ddc5cbac9a18568dce4d56d0d0f85ced + 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 - + https://github.com/dotnet/sdk - 70abd290ddc5cbac9a18568dce4d56d0d0f85ced + 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 - + https://github.com/dotnet/sdk - 70abd290ddc5cbac9a18568dce4d56d0d0f85ced + 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 - + https://github.com/dotnet/sdk - 70abd290ddc5cbac9a18568dce4d56d0d0f85ced + 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 https://github.com/dotnet/test-templates @@ -141,7 +141,7 @@ 661d88ab1975665fbe8c580e7e2dab01bf264c27 - + https://github.com/microsoft/vstest 316167369cea59e0ad6ece2a39d94a3a6d49cf12 diff --git a/eng/Versions.props b/eng/Versions.props index 93f3fc340..c886d9070 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24160.8 - 8.0.300-preview.24160.8 - 8.0.300-preview.24160.8 + 8.0.300-preview.24160.11 + 8.0.300-preview.24160.11 + 8.0.300-preview.24160.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24158-02 + 17.10.0-preview-24158-06 8.0.0-alpha.1.22557.12 From 98f7abfc33173777d7d78222f84ef16048cb1cdd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 07:59:05 +0000 Subject: [PATCH 18/58] Update dependencies from https://github.com/dotnet/sdk build 20240311.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24160.8 -> To Version 8.0.300-preview.24161.1 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.10.0-preview-24158-02 -> To Version 17.10.0-preview-24158-06 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be996551e..b340382e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 + 8c5f20568edfe9d265cdf48c40f62007ef0f7215 - + https://github.com/dotnet/sdk - 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 + 8c5f20568edfe9d265cdf48c40f62007ef0f7215 - + https://github.com/dotnet/sdk - 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 + 8c5f20568edfe9d265cdf48c40f62007ef0f7215 - + https://github.com/dotnet/sdk - 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 + 8c5f20568edfe9d265cdf48c40f62007ef0f7215 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c886d9070..18f59255e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24160.11 - 8.0.300-preview.24160.11 - 8.0.300-preview.24160.11 + 8.0.300-preview.24161.1 + 8.0.300-preview.24161.1 + 8.0.300-preview.24161.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d0ff04c65dc1954ffed84d42eac9f3a3e7527976 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 12:44:26 +0000 Subject: [PATCH 19/58] Update dependencies from https://github.com/dotnet/arcade-services build 20240310.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24157.4 -> To Version 1.1.0-beta.24160.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0c0eadbaf..0ee817aa4 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24157.4", + "version": "1.1.0-beta.24160.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b340382e6..aae9e9254 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 - + https://github.com/dotnet/arcade-services - 99db9f39d5eb1b0fd05c20ce5a3147a622972dfd + a134ac1e0ea0b38cc4c45b6c48bc14f81e513d82 - + https://github.com/dotnet/arcade-services - 99db9f39d5eb1b0fd05c20ce5a3147a622972dfd + a134ac1e0ea0b38cc4c45b6c48bc14f81e513d82 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 18f59255e..fb6a5da54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24157.4 + 1.1.0-beta.24160.1 From 351e213e732ecf03b57ec1a55123725c5c360fbb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 21:20:43 +0000 Subject: [PATCH 20/58] Update dependencies from https://github.com/dotnet/sdk build 20240311.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.1 -> To Version 8.0.300-preview.24161.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24158.5 -> To Version 4.10.0-3.24161.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aae9e9254..e58fcdfac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 8c5f20568edfe9d265cdf48c40f62007ef0f7215 + c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c - + https://github.com/dotnet/sdk - 8c5f20568edfe9d265cdf48c40f62007ef0f7215 + c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c - + https://github.com/dotnet/sdk - 8c5f20568edfe9d265cdf48c40f62007ef0f7215 + c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c - + https://github.com/dotnet/sdk - 8c5f20568edfe9d265cdf48c40f62007ef0f7215 + c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 026c96327b02c5ce4d3208f821e02d2ffa825312 + 01b7c233fdda946c1a5628d4692ed827a07e33dd diff --git a/eng/Versions.props b/eng/Versions.props index fb6a5da54..53ae7132b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24161.1 - 8.0.300-preview.24161.1 - 8.0.300-preview.24161.1 + 8.0.300-preview.24161.10 + 8.0.300-preview.24161.10 + 8.0.300-preview.24161.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24158.5 + 4.10.0-3.24161.2 From bcece68b898b77f7afd18c9c2f60974c16e46cea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 02:53:12 +0000 Subject: [PATCH 21/58] Update dependencies from https://github.com/dotnet/sdk build 20240311.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.10 -> To Version 8.0.300-preview.24161.18 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e58fcdfac..d83188815 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c + 83d7cb1e63964c3b647b834ca59f8775fd34760e - + https://github.com/dotnet/sdk - c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c + 83d7cb1e63964c3b647b834ca59f8775fd34760e - + https://github.com/dotnet/sdk - c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c + 83d7cb1e63964c3b647b834ca59f8775fd34760e - + https://github.com/dotnet/sdk - c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c + 83d7cb1e63964c3b647b834ca59f8775fd34760e https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 53ae7132b..f51710b35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24161.10 - 8.0.300-preview.24161.10 - 8.0.300-preview.24161.10 + 8.0.300-preview.24161.18 + 8.0.300-preview.24161.18 + 8.0.300-preview.24161.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1ef7899704b2ba4c729c37f5a5bdaa0d2a748cfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 16:59:10 +0000 Subject: [PATCH 22/58] [release/8.0.3xx] Update dependencies from dotnet/arcade (#18983) [release/8.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d83188815..3df338fda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 + 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 - + https://github.com/dotnet/arcade - 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 + 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 - + https://github.com/dotnet/arcade - 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 + 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f51710b35..170c07ce2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24158.4 + 8.0.0-beta.24161.1 diff --git a/global.json b/global.json index 51b94e804..93a6e87ff 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24158.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24158.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24161.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24161.1" } } From 2b4d22dc5775ff687d7bc15b910516d760477f55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 16:59:57 +0000 Subject: [PATCH 23/58] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#18984) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0ee817aa4..2d9cfe519 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24160.1", + "version": "1.1.0-beta.24161.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3df338fda..bbabe5805 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 - + https://github.com/dotnet/arcade-services - a134ac1e0ea0b38cc4c45b6c48bc14f81e513d82 + d88cdaf3c0fe2dfb47d89eb6fc860597954d6a10 - + https://github.com/dotnet/arcade-services - a134ac1e0ea0b38cc4c45b6c48bc14f81e513d82 + d88cdaf3c0fe2dfb47d89eb6fc860597954d6a10 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 170c07ce2..927fa34db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24160.1 + 1.1.0-beta.24161.3 From bbdd0d1b091c2f704273ef6ea36b24ca1983d2d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:00:20 +0000 Subject: [PATCH 24/58] [release/8.0.3xx] Update dependencies from dotnet/source-build-externals (#18985) [release/8.0.3xx] Update dependencies from dotnet/source-build-externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbabe5805..796f64689 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 7a9b99e457a2b9792a3c17ccaf95d80038725108 + 00fb7841c80b44262646e57bcfbe90a1b7bc3151 From 76b780c23558d17e9be56edd0312b86a14b31ea2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 20:46:14 +0000 Subject: [PATCH 25/58] Update dependencies from https://github.com/dotnet/sdk build 20240312.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.18 -> To Version 8.0.300-preview.24162.17 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24161.2 -> To Version 4.10.0-3.24161.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 796f64689..208e4acb2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 83d7cb1e63964c3b647b834ca59f8775fd34760e + 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 - + https://github.com/dotnet/sdk - 83d7cb1e63964c3b647b834ca59f8775fd34760e + 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 - + https://github.com/dotnet/sdk - 83d7cb1e63964c3b647b834ca59f8775fd34760e + 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 - + https://github.com/dotnet/sdk - 83d7cb1e63964c3b647b834ca59f8775fd34760e + 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 01b7c233fdda946c1a5628d4692ed827a07e33dd + c3565da812d99adf841cb96a764a27d8a93e22ef diff --git a/eng/Versions.props b/eng/Versions.props index 927fa34db..9b1b6f3b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24161.18 - 8.0.300-preview.24161.18 - 8.0.300-preview.24161.18 + 8.0.300-preview.24162.17 + 8.0.300-preview.24162.17 + 8.0.300-preview.24162.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24161.2 + 4.10.0-3.24161.10 From 1e90afd832a1a4008737917bce71fcc21f2310b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 21:43:09 +0000 Subject: [PATCH 26/58] Update dependencies from https://github.com/dotnet/sdk build 20240312.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.18 -> To Version 8.0.300-preview.24162.33 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24161.2 -> To Version 4.10.0-3.24161.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 208e4acb2..2f290b1d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 + 1e4f16b8e573b7d4b19be30cab4dc5d2053875de - + https://github.com/dotnet/sdk - 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 + 1e4f16b8e573b7d4b19be30cab4dc5d2053875de - + https://github.com/dotnet/sdk - 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 + 1e4f16b8e573b7d4b19be30cab4dc5d2053875de - + https://github.com/dotnet/sdk - 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 + 1e4f16b8e573b7d4b19be30cab4dc5d2053875de https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9b1b6f3b7..2b2174bad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24162.17 - 8.0.300-preview.24162.17 - 8.0.300-preview.24162.17 + 8.0.300-preview.24162.33 + 8.0.300-preview.24162.33 + 8.0.300-preview.24162.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eb3dd11e4de8bc46b213ae20ebc315ae87014923 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 22:27:56 +0000 Subject: [PATCH 27/58] Update dependencies from https://github.com/dotnet/sdk build 20240312.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.18 -> To Version 8.0.300-preview.24162.40 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24157.6 -> To Version 12.8.300-beta.24161.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f290b1d4..4feed6bce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 1e4f16b8e573b7d4b19be30cab4dc5d2053875de + c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 - + https://github.com/dotnet/sdk - 1e4f16b8e573b7d4b19be30cab4dc5d2053875de + c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 - + https://github.com/dotnet/sdk - 1e4f16b8e573b7d4b19be30cab4dc5d2053875de + c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 - + https://github.com/dotnet/sdk - 1e4f16b8e573b7d4b19be30cab4dc5d2053875de + c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 661d88ab1975665fbe8c580e7e2dab01bf264c27 + 212eaf7fac2d837c51dc49e477a599ebea68338b - + https://github.com/dotnet/fsharp - 661d88ab1975665fbe8c580e7e2dab01bf264c27 + 212eaf7fac2d837c51dc49e477a599ebea68338b diff --git a/eng/Versions.props b/eng/Versions.props index 2b2174bad..779817287 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24162.33 - 8.0.300-preview.24162.33 - 8.0.300-preview.24162.33 + 8.0.300-preview.24162.40 + 8.0.300-preview.24162.40 + 8.0.300-preview.24162.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bc66c0beaee77f2ab1aa27674232338491850f2c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 23:36:46 +0000 Subject: [PATCH 28/58] Update dependencies from https://github.com/dotnet/sdk build 20240312.42 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.18 -> To Version 8.0.300-preview.24162.42 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24157.6 -> To Version 12.8.300-beta.24161.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4feed6bce..e504729b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 + a878c46bc4b96f3912903af71892cd9ccbbfcce6 - + https://github.com/dotnet/sdk - c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 + a878c46bc4b96f3912903af71892cd9ccbbfcce6 - + https://github.com/dotnet/sdk - c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 + a878c46bc4b96f3912903af71892cd9ccbbfcce6 - + https://github.com/dotnet/sdk - c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 + a878c46bc4b96f3912903af71892cd9ccbbfcce6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 779817287..b51a88cb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24162.40 - 8.0.300-preview.24162.40 - 8.0.300-preview.24162.40 + 8.0.300-preview.24162.42 + 8.0.300-preview.24162.42 + 8.0.300-preview.24162.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 372ba70df3b8b496fef20461d01b49972278719c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 00:49:58 +0000 Subject: [PATCH 29/58] Update dependencies from https://github.com/dotnet/sdk build 20240312.49 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.18 -> To Version 8.0.300-preview.24162.49 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24157.6 -> To Version 12.8.300-beta.24161.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e504729b0..509ae9ac5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - a878c46bc4b96f3912903af71892cd9ccbbfcce6 + a723fc24d8b0870cd61f04dd944588799209b00f - + https://github.com/dotnet/sdk - a878c46bc4b96f3912903af71892cd9ccbbfcce6 + a723fc24d8b0870cd61f04dd944588799209b00f - + https://github.com/dotnet/sdk - a878c46bc4b96f3912903af71892cd9ccbbfcce6 + a723fc24d8b0870cd61f04dd944588799209b00f - + https://github.com/dotnet/sdk - a878c46bc4b96f3912903af71892cd9ccbbfcce6 + a723fc24d8b0870cd61f04dd944588799209b00f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b51a88cb5..e5c83c629 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24162.42 - 8.0.300-preview.24162.42 - 8.0.300-preview.24162.42 + 8.0.300-preview.24162.49 + 8.0.300-preview.24162.49 + 8.0.300-preview.24162.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 52bb95a0a1b409f09aa669b0ad07665fea6180b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 07:06:34 +0000 Subject: [PATCH 30/58] Update dependencies from https://github.com/dotnet/sdk build 20240312.55 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24162.49 -> To Version 8.0.300-preview.24162.55 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 509ae9ac5..ec886562e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - a723fc24d8b0870cd61f04dd944588799209b00f + 74ac925497752d0a7449d7a9e42b12bd08d60001 - + https://github.com/dotnet/sdk - a723fc24d8b0870cd61f04dd944588799209b00f + 74ac925497752d0a7449d7a9e42b12bd08d60001 - + https://github.com/dotnet/sdk - a723fc24d8b0870cd61f04dd944588799209b00f + 74ac925497752d0a7449d7a9e42b12bd08d60001 - + https://github.com/dotnet/sdk - a723fc24d8b0870cd61f04dd944588799209b00f + 74ac925497752d0a7449d7a9e42b12bd08d60001 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index e5c83c629..71de2c721 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24162.49 - 8.0.300-preview.24162.49 - 8.0.300-preview.24162.49 + 8.0.300-preview.24162.55 + 8.0.300-preview.24162.55 + 8.0.300-preview.24162.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b27c880578dc595dead766f9b5a574c08ee448e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 12:37:16 +0000 Subject: [PATCH 31/58] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24161.1 -> To Version 8.0.0-beta.24161.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 18 +++++++++++------- global.json | 4 ++-- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec886562e..8b1b847a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 + cd10e5d3748676d70ae2b4d9c84f073eeb203cac - + https://github.com/dotnet/arcade - 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 + cd10e5d3748676d70ae2b4d9c84f073eeb203cac - + https://github.com/dotnet/arcade - 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 + cd10e5d3748676d70ae2b4d9c84f073eeb203cac https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 71de2c721..f42a39471 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24161.1 + 8.0.0-beta.24161.7 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 647e3f92e..a2709d105 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -206,9 +206,11 @@ jobs: continueOnError: true condition: always() - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - - publish: artifacts/log - artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} - displayName: Publish logs + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: 'artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' continueOnError: true condition: always() @@ -253,7 +255,9 @@ jobs: IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - - publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish build retry configuration - continueOnError: true + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + artifactName: 'BuildConfiguration' + displayName: 'Publish build retry configuration' + continueOnError: true \ No newline at end of file diff --git a/global.json b/global.json index 93a6e87ff..f156f9420 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24161.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24161.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24161.7", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24161.7" } } From 8bec184cd2e4e476adcde9323d0b11b8cc58b04b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 12:37:38 +0000 Subject: [PATCH 32/58] Update dependencies from https://github.com/dotnet/source-build-reference-packages build Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24061.1 -> To Version 8.0.0-alpha.1.24162.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec886562e..9bab52ba6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 453a37ef7ae6c335cd49b3b9ab7713c87faeb265 + c08ec59adcf8b56cd1b4de2090c320496566b5c6 From 6e01c1ac60fcd0263304fa951c83fdd13a712759 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 18:01:36 +0000 Subject: [PATCH 33/58] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24162.55 -> To Version 8.0.300-preview.24163.12 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16e7ae6ef..3c304d630 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 74ac925497752d0a7449d7a9e42b12bd08d60001 + 35c742da690af19799aad14468773d7de628ab17 - + https://github.com/dotnet/sdk - 74ac925497752d0a7449d7a9e42b12bd08d60001 + 35c742da690af19799aad14468773d7de628ab17 - + https://github.com/dotnet/sdk - 74ac925497752d0a7449d7a9e42b12bd08d60001 + 35c742da690af19799aad14468773d7de628ab17 - + https://github.com/dotnet/sdk - 74ac925497752d0a7449d7a9e42b12bd08d60001 + 35c742da690af19799aad14468773d7de628ab17 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f42a39471..48c1d9588 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24162.55 - 8.0.300-preview.24162.55 - 8.0.300-preview.24162.55 + 8.0.300-preview.24163.12 + 8.0.300-preview.24163.12 + 8.0.300-preview.24163.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From efde4c82ce48c6155b0959aaffbf75b5264570c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 19:22:33 +0000 Subject: [PATCH 34/58] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24162.55 -> To Version 8.0.300-preview.24163.22 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24161.10 -> To Version 4.10.0-3.24163.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c304d630..05ceb7b51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 35c742da690af19799aad14468773d7de628ab17 + 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 - + https://github.com/dotnet/sdk - 35c742da690af19799aad14468773d7de628ab17 + 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 - + https://github.com/dotnet/sdk - 35c742da690af19799aad14468773d7de628ab17 + 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 - + https://github.com/dotnet/sdk - 35c742da690af19799aad14468773d7de628ab17 + 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - c3565da812d99adf841cb96a764a27d8a93e22ef + 9be4c180382a6981a2738f2174f79c5cea967634 diff --git a/eng/Versions.props b/eng/Versions.props index 48c1d9588..367e69f17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24163.12 - 8.0.300-preview.24163.12 - 8.0.300-preview.24163.12 + 8.0.300-preview.24163.22 + 8.0.300-preview.24163.22 + 8.0.300-preview.24163.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24161.10 + 4.10.0-3.24163.2 From 0e12e8ec52a51d11fd2ef2c0a05d7978836239be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 21:25:26 +0000 Subject: [PATCH 35/58] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24162.55 -> To Version 8.0.300-preview.24163.27 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.10.0-3.24161.10 -> To Version 4.10.0-3.24163.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05ceb7b51..1b86999df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 + b1509b85f3fa791d491eae45d4e21450026dcd92 - + https://github.com/dotnet/sdk - 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 + b1509b85f3fa791d491eae45d4e21450026dcd92 - + https://github.com/dotnet/sdk - 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 + b1509b85f3fa791d491eae45d4e21450026dcd92 - + https://github.com/dotnet/sdk - 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 + b1509b85f3fa791d491eae45d4e21450026dcd92 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 9be4c180382a6981a2738f2174f79c5cea967634 - + https://github.com/dotnet/msbuild - 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 + 0326fd7c9e131c4c26bac3c0f72a43ef9fd2812c https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 367e69f17..0d63e0750 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24163.22 - 8.0.300-preview.24163.22 - 8.0.300-preview.24163.22 + 8.0.300-preview.24163.27 + 8.0.300-preview.24163.27 + 8.0.300-preview.24163.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7dab7e0eed9e73955ea63df479d1aa00f5c29553 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 12:34:16 +0000 Subject: [PATCH 36/58] Update dependencies from https://github.com/dotnet/source-build-reference-packages build Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24162.3 -> To Version 8.0.0-alpha.1.24163.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b86999df..b7e53f30e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - c08ec59adcf8b56cd1b4de2090c320496566b5c6 + 79827eed138fd2575a8b24820b4f385ee4ffb6e6 From dd24f3247fcb146d0f4e2b0ad1873246b874b406 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 12:38:17 +0000 Subject: [PATCH 37/58] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24161.3 -> To Version 1.1.0-beta.24163.7 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 2d9cfe519..98dfd99e6 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24161.3", + "version": "1.1.0-beta.24163.7", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b86999df..7ed1ad700 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade cd10e5d3748676d70ae2b4d9c84f073eeb203cac - + https://github.com/dotnet/arcade-services - d88cdaf3c0fe2dfb47d89eb6fc860597954d6a10 + ba165e6aa0bf16decf19e19292107458e12f89c3 - + https://github.com/dotnet/arcade-services - d88cdaf3c0fe2dfb47d89eb6fc860597954d6a10 + ba165e6aa0bf16decf19e19292107458e12f89c3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0d63e0750..ac6336264 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24161.3 + 1.1.0-beta.24163.7 From 1653b55f3479e223053ecb4fb0ca00de4920d126 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 18:22:41 +0000 Subject: [PATCH 38/58] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24163.27 -> To Version 8.0.300-preview.24164.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24161.10 -> To Version 12.8.300-beta.24163.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f008fa2d..7650459aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - b1509b85f3fa791d491eae45d4e21450026dcd92 + 3c9ce20b0168f65a6f374336fe75bddda5daa992 - + https://github.com/dotnet/sdk - b1509b85f3fa791d491eae45d4e21450026dcd92 + 3c9ce20b0168f65a6f374336fe75bddda5daa992 - + https://github.com/dotnet/sdk - b1509b85f3fa791d491eae45d4e21450026dcd92 + 3c9ce20b0168f65a6f374336fe75bddda5daa992 - + https://github.com/dotnet/sdk - b1509b85f3fa791d491eae45d4e21450026dcd92 + 3c9ce20b0168f65a6f374336fe75bddda5daa992 https://github.com/dotnet/test-templates @@ -132,27 +132,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 212eaf7fac2d837c51dc49e477a599ebea68338b + 2c03643199368f07a3326709fc68abcbfc482a06 - + https://github.com/dotnet/fsharp - 212eaf7fac2d837c51dc49e477a599ebea68338b + 2c03643199368f07a3326709fc68abcbfc482a06 - + https://github.com/microsoft/vstest - 316167369cea59e0ad6ece2a39d94a3a6d49cf12 + c609e2c022b0087b227436a4debf45525eed00e9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 9be4c180382a6981a2738f2174f79c5cea967634 + 26b809df38356d4fe1ee376f703dc8832a7ce461 diff --git a/eng/Versions.props b/eng/Versions.props index ac6336264..213b05e69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24163.27 - 8.0.300-preview.24163.27 - 8.0.300-preview.24163.27 + 8.0.300-preview.24164.6 + 8.0.300-preview.24164.6 + 8.0.300-preview.24164.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24163.2 + 4.10.0-3.24164.1 @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24158-06 + 17.10.0-preview-24163-01 8.0.0-alpha.1.22557.12 From d46b0b67d1fcfc6e4d375cf9316d63f2e707d5d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 19:54:20 +0000 Subject: [PATCH 39/58] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24163.27 -> To Version 8.0.300-preview.24164.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24161.10 -> To Version 12.8.300-beta.24163.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7650459aa..2c4cbd72c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 3c9ce20b0168f65a6f374336fe75bddda5daa992 + 3aaa5010a3834aa8504b83e46836f8fa41684fd8 - + https://github.com/dotnet/sdk - 3c9ce20b0168f65a6f374336fe75bddda5daa992 + 3aaa5010a3834aa8504b83e46836f8fa41684fd8 - + https://github.com/dotnet/sdk - 3c9ce20b0168f65a6f374336fe75bddda5daa992 + 3aaa5010a3834aa8504b83e46836f8fa41684fd8 - + https://github.com/dotnet/sdk - 3c9ce20b0168f65a6f374336fe75bddda5daa992 + 3aaa5010a3834aa8504b83e46836f8fa41684fd8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 213b05e69..ac87cef1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24164.6 - 8.0.300-preview.24164.6 - 8.0.300-preview.24164.6 + 8.0.300-preview.24164.18 + 8.0.300-preview.24164.18 + 8.0.300-preview.24164.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3f56159d2873152b31964505ce39ca789adba29c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Mar 2024 18:03:25 +0000 Subject: [PATCH 40/58] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24164.18 -> To Version 8.0.300-preview.24165.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24164.1 -> To Version 4.10.0-3.24164.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c4cbd72c..cb8e9dd89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 3aaa5010a3834aa8504b83e46836f8fa41684fd8 + c2d085dc4d5eb7117a4fb169a1d5210624cb2977 - + https://github.com/dotnet/sdk - 3aaa5010a3834aa8504b83e46836f8fa41684fd8 + c2d085dc4d5eb7117a4fb169a1d5210624cb2977 - + https://github.com/dotnet/sdk - 3aaa5010a3834aa8504b83e46836f8fa41684fd8 + c2d085dc4d5eb7117a4fb169a1d5210624cb2977 - + https://github.com/dotnet/sdk - 3aaa5010a3834aa8504b83e46836f8fa41684fd8 + c2d085dc4d5eb7117a4fb169a1d5210624cb2977 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 26b809df38356d4fe1ee376f703dc8832a7ce461 + 711e122c86db37658d2924f2499c775ce6007b68 diff --git a/eng/Versions.props b/eng/Versions.props index ac87cef1c..ecb2e1e48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24164.18 - 8.0.300-preview.24164.18 - 8.0.300-preview.24164.18 + 8.0.300-preview.24165.8 + 8.0.300-preview.24165.8 + 8.0.300-preview.24165.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24164.1 + 4.10.0-3.24164.3 From ada7faa3cb11c49337ece21565ea542585eb964d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Mar 2024 18:51:24 +0000 Subject: [PATCH 41/58] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24164.18 -> To Version 8.0.300-preview.24165.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24164.1 -> To Version 4.10.0-3.24164.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb8e9dd89..4aba38806 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c2d085dc4d5eb7117a4fb169a1d5210624cb2977 + 9927abb44564390c24941a631592034a47c9bbee - + https://github.com/dotnet/sdk - c2d085dc4d5eb7117a4fb169a1d5210624cb2977 + 9927abb44564390c24941a631592034a47c9bbee - + https://github.com/dotnet/sdk - c2d085dc4d5eb7117a4fb169a1d5210624cb2977 + 9927abb44564390c24941a631592034a47c9bbee - + https://github.com/dotnet/sdk - c2d085dc4d5eb7117a4fb169a1d5210624cb2977 + 9927abb44564390c24941a631592034a47c9bbee https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ecb2e1e48..5d81005dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24165.8 - 8.0.300-preview.24165.8 - 8.0.300-preview.24165.8 + 8.0.300-preview.24165.10 + 8.0.300-preview.24165.10 + 8.0.300-preview.24165.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4e61e7f95658c1f98a61fe155ec70897363f13ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Mar 2024 12:29:21 +0000 Subject: [PATCH 42/58] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24161.7 -> To Version 8.0.0-beta.24165.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates-official/job/publish-build-assets.yml | 10 ++++++---- global.json | 4 ++-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c4cbd72c..036e8565c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - cd10e5d3748676d70ae2b4d9c84f073eeb203cac + f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade - cd10e5d3748676d70ae2b4d9c84f073eeb203cac + f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade - cd10e5d3748676d70ae2b4d9c84f073eeb203cac + f311667e0587f19c3fa9553a909975662107a351 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index ac87cef1c..48bab6f2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24161.7 + 8.0.0-beta.24165.4 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index ea5104625..53138622f 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -94,14 +94,16 @@ jobs: inputs: targetType: inline script: | - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) - task: 1ES.PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' PublishLocation: Container ArtifactName: ReleaseConfigs diff --git a/global.json b/global.json index f156f9420..b967bd08e 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24161.7", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24161.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24165.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24165.4" } } From 729c284649ed495a0178604c7897b5c9e997fd50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Mar 2024 12:33:51 +0000 Subject: [PATCH 43/58] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24163.7 -> To Version 1.1.0-beta.24165.3 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 98dfd99e6..77356e8dd 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24163.7", + "version": "1.1.0-beta.24165.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c4cbd72c..8358ff18d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade cd10e5d3748676d70ae2b4d9c84f073eeb203cac - + https://github.com/dotnet/arcade-services - ba165e6aa0bf16decf19e19292107458e12f89c3 + f3aa3b006c333af65c49ee69dc0594132981a8d3 - + https://github.com/dotnet/arcade-services - ba165e6aa0bf16decf19e19292107458e12f89c3 + f3aa3b006c333af65c49ee69dc0594132981a8d3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ac87cef1c..15b12896d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24163.7 + 1.1.0-beta.24165.3 From 7bc0cb37ef9e7d97080a002dfede1002722af60d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Mar 2024 01:29:58 +0000 Subject: [PATCH 44/58] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24164.18 -> To Version 8.0.300-preview.24166.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24164.1 -> To Version 4.10.0-3.24164.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4aba38806..769566d6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 9927abb44564390c24941a631592034a47c9bbee + 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 - + https://github.com/dotnet/sdk - 9927abb44564390c24941a631592034a47c9bbee + 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 - + https://github.com/dotnet/sdk - 9927abb44564390c24941a631592034a47c9bbee + 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 - + https://github.com/dotnet/sdk - 9927abb44564390c24941a631592034a47c9bbee + 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5d81005dc..acb42c985 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24165.10 - 8.0.300-preview.24165.10 - 8.0.300-preview.24165.10 + 8.0.300-preview.24166.1 + 8.0.300-preview.24166.1 + 8.0.300-preview.24166.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d1e9a7fcd23e6bd4963155e73d656531e72a5915 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Mar 2024 12:21:54 +0000 Subject: [PATCH 45/58] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24161.7 -> To Version 8.0.0-beta.24165.4 From 15eb24360be3011af5ebd4b760fb83657a3d753d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Mar 2024 12:26:37 +0000 Subject: [PATCH 46/58] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24163.7 -> To Version 1.1.0-beta.24165.3 From 8b8ababc0e9deada13d260c5edfe365e90cbaf21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Mar 2024 02:46:26 +0000 Subject: [PATCH 47/58] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24166.1 -> To Version 8.0.300-preview.24167.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.10.0-3.24164.3 -> To Version 4.10.0-3.24165.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1747f48ae..d9b085261 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 + 291ad6b22643e23288f10c1751b3ece73fa19a15 - + https://github.com/dotnet/sdk - 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 + 291ad6b22643e23288f10c1751b3ece73fa19a15 - + https://github.com/dotnet/sdk - 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 + 291ad6b22643e23288f10c1751b3ece73fa19a15 - + https://github.com/dotnet/sdk - 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 + 291ad6b22643e23288f10c1751b3ece73fa19a15 https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 711e122c86db37658d2924f2499c775ce6007b68 + 93fb58100f90efe96051fe8531a008823f39c81b https://github.com/dotnet/msbuild 0326fd7c9e131c4c26bac3c0f72a43ef9fd2812c - + https://github.com/nuget/nuget.client - 2fdd0d41e33c3354de2750fe154b56751a6682aa + 1845d6bd450a7453d573035371c9fec43683d1ef diff --git a/eng/Versions.props b/eng/Versions.props index 3dc4b8ee1..14d5ebcad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24166.1 - 8.0.300-preview.24166.1 - 8.0.300-preview.24166.1 + 8.0.300-preview.24167.1 + 8.0.300-preview.24167.1 + 8.0.300-preview.24167.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24164.3 + 4.10.0-3.24165.5 @@ -127,7 +127,7 @@ - 6.10.0-preview.2.78 + 6.10.0-preview.2.81 From 3e5621b0dcbd355bc885a21e7af9a283c3cd5625 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Mar 2024 17:56:02 +0000 Subject: [PATCH 48/58] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24167.1 -> To Version 8.0.300-preview.24168.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24163.4 -> To Version 12.8.300-beta.24165.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9b085261..07e145263 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 291ad6b22643e23288f10c1751b3ece73fa19a15 + e33d9e61d2ccdc158b2d725c471fede831871d14 - + https://github.com/dotnet/sdk - 291ad6b22643e23288f10c1751b3ece73fa19a15 + e33d9e61d2ccdc158b2d725c471fede831871d14 - + https://github.com/dotnet/sdk - 291ad6b22643e23288f10c1751b3ece73fa19a15 + e33d9e61d2ccdc158b2d725c471fede831871d14 - + https://github.com/dotnet/sdk - 291ad6b22643e23288f10c1751b3ece73fa19a15 + e33d9e61d2ccdc158b2d725c471fede831871d14 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 2c03643199368f07a3326709fc68abcbfc482a06 + a0081443628b0c582abe66f83944519378d2a5dd - + https://github.com/dotnet/fsharp - 2c03643199368f07a3326709fc68abcbfc482a06 + a0081443628b0c582abe66f83944519378d2a5dd @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 93fb58100f90efe96051fe8531a008823f39c81b + 2348a50bb566b39305c474793b43edb5635db6f4 diff --git a/eng/Versions.props b/eng/Versions.props index 14d5ebcad..e98c9fbe9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24167.1 - 8.0.300-preview.24167.1 - 8.0.300-preview.24167.1 + 8.0.300-preview.24168.3 + 8.0.300-preview.24168.3 + 8.0.300-preview.24168.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24165.5 + 4.10.0-3.24168.1 From 104ed88ea2b93911b799a0723b2c1d7839c38dae Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 19 Mar 2024 00:13:16 -0700 Subject: [PATCH 49/58] Remove 2.1 template --- eng/Signing.props | 6 ------ eng/Versions.props | 6 ------ src/redist/targets/BundledTemplates.targets | 9 --------- 3 files changed, 21 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 0d49f78d1..852eea4b0 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -39,12 +39,6 @@ - - - - - - - 1.0.2-beta4.22406.1 1.0.2-beta4.22406.1 1.1.0-rc.22558.1 @@ -225,11 +224,6 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 3.0.3 - - 1.5.3 - 1.0.2-beta3 - $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 2.1.34 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 4ab2c37a7..6b145c6fc 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -94,14 +94,6 @@ - - - - - - - - @@ -114,7 +106,6 @@ - From ce007b0b84f404bebcaaddd1b3ed8e995f968594 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 19 Mar 2024 00:25:35 -0700 Subject: [PATCH 50/58] Remove 3.0 template --- eng/Versions.props | 9 --------- src/redist/targets/BundledTemplates.targets | 13 ------------- 2 files changed, 22 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3b8b6a607..bcd6f83cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,6 @@ - - 1.0.2-beta4.22406.1 1.1.0-rc.22558.1 1.1.0-rc.23410.2 @@ -217,13 +215,6 @@ $(MicrosoftDotNetCommonItemTemplates31PackageVersion) 3.1.32 3.2.1 - - 4.8.0-rc2.19462.10 - 3.0.0 - 1.6.5 - 2.0.0-preview8.19373.1 - $(MicrosoftDotNetCommonItemTemplates30PackageVersion) - 3.0.3 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 6b145c6fc..e05f12801 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -83,18 +83,6 @@ - - - - - - - - - - - - @@ -105,7 +93,6 @@ - From afa95c6d2a3f2941c8539c4393c46e957c046667 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 19 Mar 2024 00:58:01 -0700 Subject: [PATCH 51/58] Remove 3.1 template --- eng/Versions.props | 9 --------- src/redist/targets/BundledTemplates.targets | 15 --------------- 2 files changed, 24 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index bcd6f83cc..0b5575162 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,6 @@ - 1.1.0-rc.22558.1 1.1.0-rc.23410.2 1.1.0-rc.24059.1 1.1.0-rc.24059.1 @@ -207,14 +206,6 @@ $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) 5.0.17 - - 4.8.1-servicing.19605.5 - 3.1.2-servicing.20066.4 - 1.7.2 - 3.1.27 - $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - 3.1.32 - 3.2.1 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index e05f12801..477abf21b 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -69,20 +69,6 @@ - - - - - - - - - - - - - - @@ -92,7 +78,6 @@ - From 82afe53846016d915998308e442be99af8407ecb Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 19 Mar 2024 02:42:14 -0700 Subject: [PATCH 52/58] Remove 5.0 template --- eng/Versions.props | 12 ------------ src/redist/targets/BundledTemplates.targets | 13 ------------- 2 files changed, 25 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0b5575162..fb1c4ac14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,6 @@ - 1.1.0-rc.23410.2 1.1.0-rc.24059.1 1.1.0-rc.24059.1 1.1.0-rc.24059.1 @@ -156,14 +155,10 @@ - 5.0.403 6.0.302 7.0.100 - 5.0.17 6.0.14 7.0.3 - 5.0.17-servicing.22215.4 - 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 6.0.7-servicing.22322.2 7.0.0-rtm.22518.7 @@ -199,13 +194,6 @@ $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) 6.0.$(AspNetCoreTemplateFeature60) - - $(MicrosoftWinFormsProjectTemplates50PackageVersion) - $(MicrosoftWPFProjectTemplates50PackageVersion) - $(NUnit3DotNetNewTemplatePackageVersion) - $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.17 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 477abf21b..fab8b99fa 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -58,18 +58,6 @@ - - - - - - - - - - - - @@ -77,7 +65,6 @@ - From 26f84804757ec4080dce1d30894a41d5a6cb1d1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Mar 2024 12:30:21 +0000 Subject: [PATCH 53/58] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24165.3 -> To Version 1.1.0-beta.24168.5 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 77356e8dd..0cd5b7816 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24165.3", + "version": "1.1.0-beta.24168.5", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07e145263..87ece5126 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade-services - f3aa3b006c333af65c49ee69dc0594132981a8d3 + 55716bbf779395f1c33ea1eb1f688b5081223d49 - + https://github.com/dotnet/arcade-services - f3aa3b006c333af65c49ee69dc0594132981a8d3 + 55716bbf779395f1c33ea1eb1f688b5081223d49 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e98c9fbe9..28e78f35b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24165.3 + 1.1.0-beta.24168.5 From 2b78d126e7346e3598b998f18d6deec005ae2a72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Mar 2024 12:30:47 +0000 Subject: [PATCH 54/58] Update dependencies from https://github.com/dotnet/source-build-externals build Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24161.1 -> To Version 8.0.0-alpha.1.24168.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07e145263..d3a4ecc61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 00fb7841c80b44262646e57bcfbe90a1b7bc3151 + 0fac378047750fa8bd850a98b159560f9f7627c3 From 9cef9b814cfcdfffd4393324197da7590417eb50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Mar 2024 15:29:43 +0000 Subject: [PATCH 55/58] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24168.3 -> To Version 8.0.300-preview.24169.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07e145263..5ea221423 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - e33d9e61d2ccdc158b2d725c471fede831871d14 + 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d - + https://github.com/dotnet/sdk - e33d9e61d2ccdc158b2d725c471fede831871d14 + 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d - + https://github.com/dotnet/sdk - e33d9e61d2ccdc158b2d725c471fede831871d14 + 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d - + https://github.com/dotnet/sdk - e33d9e61d2ccdc158b2d725c471fede831871d14 + 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index e98c9fbe9..11bab9beb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24168.3 - 8.0.300-preview.24168.3 - 8.0.300-preview.24168.3 + 8.0.300-preview.24169.2 + 8.0.300-preview.24169.2 + 8.0.300-preview.24169.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5a6d696e84de785a0be25b1ffae27e63546d3d6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Mar 2024 17:03:38 +0000 Subject: [PATCH 56/58] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24168.3 -> To Version 8.0.300-preview.24169.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5e21ffe7..1a35c5f64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d + 449664383f57f4bd974ec2a6c522137850fbe17c - + https://github.com/dotnet/sdk - 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d + 449664383f57f4bd974ec2a6c522137850fbe17c - + https://github.com/dotnet/sdk - 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d + 449664383f57f4bd974ec2a6c522137850fbe17c - + https://github.com/dotnet/sdk - 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d + 449664383f57f4bd974ec2a6c522137850fbe17c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 1f7379d7a..96e1a0322 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24169.2 - 8.0.300-preview.24169.2 - 8.0.300-preview.24169.2 + 8.0.300-preview.24169.3 + 8.0.300-preview.24169.3 + 8.0.300-preview.24169.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 30c9885d8943158806dd1667a8831eeae121d3ed Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 19 Mar 2024 14:30:57 -0700 Subject: [PATCH 57/58] We shouldn't need the eol feed either so trying to remove it --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 76d6c5c5e..1b9167e7c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,6 @@ - From 3f9cf68649a0a0a73ba518ccff86192b2e150775 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Mar 2024 21:36:26 +0000 Subject: [PATCH 58/58] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24169.3 -> To Version 8.0.300-preview.24169.27 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a35c5f64..edde09e2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 449664383f57f4bd974ec2a6c522137850fbe17c + 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee - + https://github.com/dotnet/sdk - 449664383f57f4bd974ec2a6c522137850fbe17c + 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee - + https://github.com/dotnet/sdk - 449664383f57f4bd974ec2a6c522137850fbe17c + 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee - + https://github.com/dotnet/sdk - 449664383f57f4bd974ec2a6c522137850fbe17c + 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 96e1a0322..f0f5c97d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24169.3 - 8.0.300-preview.24169.3 - 8.0.300-preview.24169.3 + 8.0.300-preview.24169.27 + 8.0.300-preview.24169.27 + 8.0.300-preview.24169.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)