From 15e9067ed2bf538857a4621e52e9d85b903a4ef9 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Thu, 18 Nov 2021 16:18:18 +0000 Subject: [PATCH 1/5] Support source-build tarball creation w/internal repos --- .../common/templates/job/source-build-create-tarball.yml | 9 +++++++-- .../Arcade/tools/SourceBuildArcadeTarball.targets | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 428271393d7d..61b8643521ac 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -12,7 +12,11 @@ jobs: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 variables: - _BuildConfig: Release + - name: _BuildConfig + value: Release + + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNet-Source-Build-All-Orgs-Source-Access workspace: clean: all @@ -50,7 +54,8 @@ jobs: $officialBuildArgs \ $internalRuntimeDownloadArgs \ /p:DotNetPublishUsingPipelines=true \ - /p:ArcadeBuildTarball=true + /p:ArcadeBuildTarball=true \ + /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw) displayName: Create Tarball - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 75fd838e8698..1717371dc879 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -123,6 +123,7 @@ $(TarballSourceDir)$(SourceDir)eng/ $(TarballRepoSourceEngDir)Version.Details.xml -q + $(RepoUri.Replace('https://dev.azure.com', 'https://dn-bot:$(AzDoPat)@dev.azure.com')) From c296e85e33db6a733ac21ba462cc6e4b5ece5d77 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Nov 2021 17:54:25 +0000 Subject: [PATCH 2/5] Merged PR 19846: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.0-rtm.21567.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.0-rtm.21567.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.0-rtm.21522.10 to 6.0.1-servicing.21567.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.0-rtm.21523.1 to 6.0.1-servicing.21567.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.0-rtm.21523.1 to 6.0.1-servicing.21567.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.0-rtm.21522.10 to 6.0.1-servicing.21567.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20211115.9 - **Date Produced**: November 15, 2021 7:50:53 PM UTC - **Commit**: 7aff324297b3853a1cb198f92ec20f6bae9e2de5 - **Branch**: r... --- NuGet.config | 17 ++- eng/Version.Details.xml | 110 +++++++++--------- eng/Versions.props | 34 +++--- ...-pack-prebuilt-usage-in-source-build.patch | 50 -------- ...ges-are-not-created-during-source-bu.patch | 29 ----- ...validation-in-source-build-for-relia.patch | 31 ----- src/redist/targets/BundledManifests.targets | 6 +- 7 files changed, 93 insertions(+), 184 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0006-Fix-AppHost-pack-prebuilt-usage-in-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/runtime/0002-DotNetHost-packages-are-not-created-during-source-bu.patch delete mode 100644 src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch diff --git a/NuGet.config b/NuGet.config index b995dca0cc33..fec64c310a78 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,19 @@ + + + @@ -34,5 +37,17 @@ - + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53cb1f886322..9debf1131de5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,45 +2,45 @@ - https://github.com/dotnet/windowsdesktop - 59fea7da1dbb6e48837fa726cc2760b154bce3d1 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + ac655f01d8c8bb323643ec87905920f9bcb88caa - - https://github.com/dotnet/windowsdesktop - 59fea7da1dbb6e48837fa726cc2760b154bce3d1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + ac655f01d8c8bb323643ec87905920f9bcb88caa - - https://github.com/dotnet/windowsdesktop - 59fea7da1dbb6e48837fa726cc2760b154bce3d1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + ac655f01d8c8bb323643ec87905920f9bcb88caa - https://github.com/dotnet/windowsdesktop - 59fea7da1dbb6e48837fa726cc2760b154bce3d1 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + ac655f01d8c8bb323643ec87905920f9bcb88caa - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 3a25a7f1cc446b60678ed25c9d829420d6321eba - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 3a25a7f1cc446b60678ed25c9d829420d6321eba - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 3a25a7f1cc446b60678ed25c9d829420d6321eba - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 3a25a7f1cc446b60678ed25c9d829420d6321eba - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 3a25a7f1cc446b60678ed25c9d829420d6321eba - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 3a25a7f1cc446b60678ed25c9d829420d6321eba @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 3a25a7f1cc446b60678ed25c9d829420d6321eba https://github.com/dotnet/aspnetcore @@ -60,22 +60,22 @@ https://github.com/dotnet/aspnetcore ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 - - https://github.com/dotnet/aspnetcore - ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4e7d976438b0fc17f435804e801d5d68d193ec33 - - https://github.com/dotnet/aspnetcore - ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4e7d976438b0fc17f435804e801d5d68d193ec33 - - https://github.com/dotnet/aspnetcore - ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4e7d976438b0fc17f435804e801d5d68d193ec33 - - https://github.com/dotnet/aspnetcore - ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4e7d976438b0fc17f435804e801d5d68d193ec33 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - - https://github.com/dotnet/sdk - 2c798cbf6bf259ce49d94d91bc665a95d42d7a7f + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 0de2b2e1c58d678cbb9885d1d00c7891d4f16f60 - - https://github.com/dotnet/sdk - 2c798cbf6bf259ce49d94d91bc665a95d42d7a7f + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 0de2b2e1c58d678cbb9885d1d00c7891d4f16f60 - - https://github.com/dotnet/winforms - d43e35d5224f12a335ff1a62d01e86b18a22d657 + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + 846205b4af05c7a200e1d203536fdc39994b9bd6 - - https://github.com/dotnet/wpf - 3f75a67c752a116de292affae29a22bbb5b71b18 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 0350d04790959e8ebdd3ceab0d34a40f811f019d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7c1e724fce29..1be54fa40b99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21523.1 + 6.0.1-servicing.21567.5 - 6.0.0-rtm.21523.1 + 6.0.1-servicing.21567.7 @@ -44,42 +44,42 @@ - 6.0.0 + 6.0.1 6.0.0 6.0.0-rtm.21526.8 - 6.0.0-rtm.21526.8 - 6.0.0-rtm.21526.8 - 6.0.0-rtm.21526.8 + 6.0.1-servicing.21567.14 + 6.0.1-servicing.21567.14 + 6.0.1-servicing.21567.14 0.2.0 - 6.0.100-rtm.21527.8 - 6.0.100-rtm.21527.8 + 6.0.101-servicing.21567.27 + 6.0.101-servicing.21567.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0 + 6.0.1 - 6.0.0-rtm.21522.10 - 6.0.0-rtm.21522.10 - 6.0.0 - 6.0.0 - 6.0.0 - 6.0.0 + 6.0.1-servicing.21567.5 + 6.0.1-servicing.21567.5 + 6.0.1 + 6.0.1 + 6.0.1 + 6.0.1 2.1.0 - 6.0.0-rtm.21523.1 - 6.0.0-rtm.21523.1 + 6.0.0-rtm.21567.8 + 6.0.0-rtm.21567.8 6.0.0 6.0.0 diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0006-Fix-AppHost-pack-prebuilt-usage-in-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0006-Fix-AppHost-pack-prebuilt-usage-in-source-build.patch deleted file mode 100644 index bae957621d01..000000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0006-Fix-AppHost-pack-prebuilt-usage-in-source-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Wed, 20 Oct 2021 16:17:54 -0500 -Subject: [PATCH] Fix AppHost pack prebuilt usage in source-build - -This avoids downloading a prebuilt apphost pack. - -Upstream PR: https://github.com/dotnet/aspnetcore/pull/37672 ---- - Directory.Build.props | 14 ++++++++++++-- - .../src/Microsoft.AspNetCore.App.Ref.csproj | 1 + - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 204df64da7..7280c12748 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -198,8 +198,18 @@ - - - $(RepoRoot).dotnet\ -- -- $(LocalDotNetRoot)packs\ -+ -+ $(LocalDotNetRoot)packs\ - - - -diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj -index 0cb7503c04..3a0832ee21 100644 ---- a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj -+++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj -@@ -211,6 +211,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - diff --git a/src/SourceBuild/tarball/patches/runtime/0002-DotNetHost-packages-are-not-created-during-source-bu.patch b/src/SourceBuild/tarball/patches/runtime/0002-DotNetHost-packages-are-not-created-during-source-bu.patch deleted file mode 100644 index 0d13c1cf5db1..000000000000 --- a/src/SourceBuild/tarball/patches/runtime/0002-DotNetHost-packages-are-not-created-during-source-bu.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Eric Erhardt -Date: Mon, 18 Oct 2021 15:47:39 -0500 -Subject: [PATCH] DotNetHost packages are not created during source-build - -The subset `host.pkg` is not producing the DotNetHost* NuGet packages. This is because the "Pack" target is getting invoked on the pkgprojs, but pkgprojs expect the "Build" target to be called. Since the "Pack" target is overriden in the Directory.Build.targets to be empty, no one is calling the "Build" target on the pkgprojs. - -In an official build, a later subset `packs.tests` comes through and builds `Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj`, which explicitly calls "Build" on the pkgprojs. So official builds still get these packages produced. - -In source-build, we are no longer building the `packs.tests` subset, so the packages are not produced. - -See also: -* https://github.com/dotnet/runtime/pull/60575 -* https://github.com/dotnet/runtime/pull/60577 ---- - src/installer/Directory.Build.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/installer/Directory.Build.targets b/src/installer/Directory.Build.targets -index c6e8cf1a140..dccb8277ba7 100644 ---- a/src/installer/Directory.Build.targets -+++ b/src/installer/Directory.Build.targets -@@ -15,5 +15,5 @@ - - - -- -+ - diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch b/src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch deleted file mode 100644 index 161b962b78c0..000000000000 --- a/src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Tue, 26 Oct 2021 13:24:57 -0500 -Subject: [PATCH] Disable package validation in source-build for reliability - -See comment in diff. - -Upstream PR: https://github.com/dotnet/runtime/pull/60881 ---- - eng/packaging.targets | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/eng/packaging.targets b/eng/packaging.targets -index ecf74672ac8..0a04191182d 100644 ---- a/eng/packaging.targets -+++ b/eng/packaging.targets -@@ -1,7 +1,13 @@ - - - -- true -+ -+ true - - true - $([MSBuild]::Subtract($(MajorVersion), 1)).0.0 diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 89ccd630fb9e..b83c642f37aa 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -51,7 +51,11 @@ - + + + + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9debf1131de5..cb2b6b72528b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,20 +2,20 @@ - https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac655f01d8c8bb323643ec87905920f9bcb88caa + https://github.com/dotnet/windowsdesktop + 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac655f01d8c8bb323643ec87905920f9bcb88caa + ef15b555537a90da229ce6474658ae1a9916a932 - - https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac655f01d8c8bb323643ec87905920f9bcb88caa + + https://github.com/dotnet/windowsdesktop + 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac655f01d8c8bb323643ec87905920f9bcb88caa + ef15b555537a90da229ce6474658ae1a9916a932 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0de2b2e1c58d678cbb9885d1d00c7891d4f16f60 + a35d9cf17ada1a09791d4f5e2b61e0a33bfb9475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0de2b2e1c58d678cbb9885d1d00c7891d4f16f60 + a35d9cf17ada1a09791d4f5e2b61e0a33bfb9475 diff --git a/eng/Versions.props b/eng/Versions.props index 1be54fa40b99..e48cdd810d3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.101-servicing.21567.27 - 6.0.101-servicing.21567.27 + 6.0.101-servicing.21568.7 + 6.0.101-servicing.21568.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-rtm.21567.8 - 6.0.0-rtm.21567.8 - 6.0.0 + 6.0.1-servicing.21568.2 + 6.0.0-rtm.21523.1 + 6.0.1 6.0.0 From 3f69c2f1a4287abaf99f7a09851b5e1751418c41 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Nov 2021 23:06:29 +0000 Subject: [PATCH 4/5] Merged PR 20001: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Net.Compilers.Toolset**: from 4.0.0-6.21526.21 to 4.0.1-1.21568.1 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20211118.11 - **Date Produced**: November 18, 2021 10:53:09 PM UTC - **Commit**: 95eaa4de1bbaafa9a1d95c913b1ef80138a9a34f - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.101-servicing.21568.7 to 6.0.101-servicing.21568.11][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.101-servicing.21568.7 to 6.0.101-servicing.21568.11][1] - **Microsoft.Net.Compilers.Toolset**: [from 4.0.0-6.21526.21 to 4.0.1-1.21568.1][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa35d9cf&targetVersion=GC95eaa4d&_a=files [2]: https://github.com/dotnet/roslyn/compare/c7d6f9f...6ab6601 [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb2b6b72528b..78ef906c4c95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a35d9cf17ada1a09791d4f5e2b61e0a33bfb9475 + 95eaa4de1bbaafa9a1d95c913b1ef80138a9a34f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a35d9cf17ada1a09791d4f5e2b61e0a33bfb9475 + 95eaa4de1bbaafa9a1d95c913b1ef80138a9a34f @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - c7d6f9fab845ffd943216da465022744e7d35f22 + 6ab6601178d9fba8c680b56934cd1742e0816bff diff --git a/eng/Versions.props b/eng/Versions.props index e48cdd810d3f..adde6a711ad1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.101-servicing.21568.7 - 6.0.101-servicing.21568.7 + 6.0.101-servicing.21568.11 + 6.0.101-servicing.21568.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ef49f6213a0256d5e8b10d9a573f8dd355bc8593 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 20 Nov 2021 06:07:47 +0000 Subject: [PATCH 5/5] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21568.1 to 4.0.1-1.21569.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78ef906c4c95..8a16964fe524 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95eaa4de1bbaafa9a1d95c913b1ef80138a9a34f + 36621631f5982fb9d23644aec68222015ba337a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95eaa4de1bbaafa9a1d95c913b1ef80138a9a34f + 36621631f5982fb9d23644aec68222015ba337a2 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 6ab6601178d9fba8c680b56934cd1742e0816bff + 52021b4b3a9dcfd7b955102adb2901524a62a371 diff --git a/eng/Versions.props b/eng/Versions.props index adde6a711ad1..7c7746fff846 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.101-servicing.21568.11 - 6.0.101-servicing.21568.11 + 6.0.101-servicing.21569.16 + 6.0.101-servicing.21569.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)