From 15e9067ed2bf538857a4621e52e9d85b903a4ef9 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Thu, 18 Nov 2021 16:18:18 +0000 Subject: [PATCH 01/43] 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 428271393..61b864352 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 75fd838e8..1717371dc 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 02/43] 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 b995dca0c..fec64c310 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 53cb1f886..9debf1131 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 7c1e724fc..1be54fa40 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 bae957621..000000000 --- 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 0d13c1cf5..000000000 --- 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 161b962b7..000000000 --- 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 89ccd630f..b83c642f3 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 9debf1131..cb2b6b725 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 1be54fa40..e48cdd810 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 04/43] 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 cb2b6b725..78ef906c4 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 e48cdd810..adde6a711 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 05/43] [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 78ef906c4..8a16964fe 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 adde6a711..7c7746fff 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) From 7d5dca7f858d9193781792e375845b52f960234c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 6 Dec 2021 16:37:28 -0600 Subject: [PATCH 06/43] Update release/6.0.1xx build machines (#12748) * Switch another leg to Ubuntu 18 * Switch to Ubuntu 18 * Also update source build queues to Ubuntu 18 Co-authored-by: Daniel Plaisted --- .vsts-ci.yml | 8 ++++---- .../common/templates/job/source-build-create-tarball.yml | 4 ++-- .../templates/job/source-build-run-tarball-build.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d801654bb..d91efec67 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -142,10 +142,10 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 timeoutInMinutes: 180 strategy: matrix: @@ -314,10 +314,10 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 timeoutInMinutes: 180 strategy: matrix: 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 428271393..c4f57e632 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 @@ -7,10 +7,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 variables: _BuildConfig: Release workspace: diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 6f36d7825..70d81e3d6 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -15,10 +15,10 @@ parameters: fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 poolInternal: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 poolPublic: name: NetCore1ESPool-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open tarballDir: $(Build.StagingDirectory)/tarball jobs: From a58ef7bebe7382b7460da6ea122a7150fef8128f Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 7 Dec 2021 10:31:37 -0800 Subject: [PATCH 07/43] Update branding to 6.0.102 (#12761) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7c1e724fc..08c5e0fae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From d3d3005612dc725a1287bcb9b6c73184766c529f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 21:39:04 +0000 Subject: [PATCH 08/43] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.3 (#12768) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 53cb1f886..cda4814a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/source-build-reference-packages - 897a9709eb370a92bce2391d77b03d06149cbb6c + 8e0f29bef4764af0fecece781ba606e4c61b352f From 974ce5fc153e8d0483b550035a5010de0bdaecc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 23:07:23 +0000 Subject: [PATCH 09/43] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.8 (#12770) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 cda4814a6..d0b34564f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/source-build-reference-packages - 8e0f29bef4764af0fecece781ba606e4c61b352f + 67a6ec56185bfec2a52e211b25335849bdb630af From 83418957c17f51a038263ed9fa914f90d2b82206 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 8 Dec 2021 11:27:42 -0600 Subject: [PATCH 10/43] Refactor build status section to expose public builds --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9e2556677..2b1e76a0f 100644 --- a/README.md +++ b/README.md @@ -58,9 +58,10 @@ This repo also contains code to help you build the entire .NET product end-to-en # Build status -|All legs| -|:------:| -|[![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/286)](https://dev.azure.com/dnceng/internal/_build?definitionId=286)| +Visibility|All legs| +|:------|:------| +|Public|[![Status](https://dev.azure.com/dnceng/public/_apis/build/status/176)](https://dev.azure.com/dnceng/public/_build?definitionId=176)| +|Microsoft Internal|[![Status](https://dev.azure.com/dnceng/internal/_apis/build/status/286)](https://dev.azure.com/dnceng/internal/_build?definitionId=286)| Installers and Binaries ----------------------- From d7fe077c1b3efb3149eae594c2447ae99e02b43c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Dec 2021 17:31:24 +0000 Subject: [PATCH 11/43] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211208.1 (#12771) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 d0b34564f..ac7bd9b9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/source-build-reference-packages - 67a6ec56185bfec2a52e211b25335849bdb630af + d18b3749457151f76d5f9fc4a1318d9be3bbfbff From 65bbb444f839ba116ca561390aa8725d0d198130 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Thu, 9 Dec 2021 13:37:17 -0600 Subject: [PATCH 12/43] Remove un-needed version properties (#12683) --- .../tarball/content/eng/Versions.props | 10 ---------- .../tarball/content/repos/aspnetcore.proj | 19 ------------------- 2 files changed, 29 deletions(-) diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index 4701139f6..1925782b6 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -1,15 +1,5 @@ - - - 6 - 0 - 0-preview.6 - 100-preview.6 - $(MajorVersion).$(MinorVersion).$(RuntimePatchVersion) - $(MajorVersion).$(MinorVersion).$(RuntimePatchVersion) - $(MajorVersion).$(MinorVersion).$(SdkPatchVersion) - 0.1.0 diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index ad9d77885..480f3c713 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -53,24 +53,5 @@ - - - - - - - - - - - From 5e966fbff45c727ffa14860822cd5137d8f9cd42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 18:40:48 +0000 Subject: [PATCH 13/43] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211213.1 (#12812) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 ac7bd9b9b..23a95fedf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/source-build-reference-packages - d18b3749457151f76d5f9fc4a1318d9be3bbfbff + e025965a8e463030d890739043b6e64b41a5de84 From 4de9f12e2e26942b8f065e433d518867ea371e05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 19:55:22 +0000 Subject: [PATCH 14/43] Update dependencies from https://github.com/dotnet/arcade build 20211209.4 (#12837) [release/6.0.1xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++-- eng/Versions.props | 2 +- eng/common/build.sh | 3 - eng/common/sdk-task.ps1 | 3 - eng/common/templates/job/onelocbuild.yml | 3 + eng/common/tools.ps1 | 78 +++++++++++------------- eng/common/tools.sh | 69 +++++++++++---------- global.json | 4 +- 8 files changed, 81 insertions(+), 93 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 23a95fedf..838762801 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - ee9b7f19853685805c612103282c8d9486c7db86 + 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/arcade - ee9b7f19853685805c612103282c8d9486c7db86 + 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/arcade - ee9b7f19853685805c612103282c8d9486c7db86 + 7421b55f46aff8373764016d942b23cbf87c75cb https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 08c5e0fae..57a550014 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21560.2 + 6.0.0-beta.21609.4 diff --git a/eng/common/build.sh b/eng/common/build.sh index bc07a1c68..a16e18b17 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -188,9 +188,6 @@ function InitializeCustomToolset { function Build { - if [[ "$ci" == true ]]; then - TryLogClientIpAddress - fi InitializeToolset InitializeCustomToolset diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 7ab9baac5..b1bca63ab 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -83,9 +83,6 @@ try { } if ($restore) { - if ($ci) { - Try-LogClientIpAddress - } Build 'Restore' } diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 2b55a567f..069098b0a 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -12,6 +12,7 @@ parameters: SourcesDirectory: $(Build.SourcesDirectory) CreatePr: true AutoCompletePr: false + ReusePr: true UseLfLineEndings: true UseCheckedInLocProjectJson: false LanguageSet: VS_Main_Languages @@ -64,6 +65,8 @@ jobs: ${{ if eq(parameters.CreatePr, true) }}: isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} packageSourceAuth: patAuth patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 444842899..f1e1cb539 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Disable telemetry on CI. if ($ci) { $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 - - # In case of network error, try to log the current IP for reference - Try-LogClientIpAddress } # Source Build uses DotNetCoreSdkDir variable @@ -301,31 +298,44 @@ function InstallDotNet([string] $dotnetRoot, if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } if ($noPath) { $installParameters.NoPath = $True } - try { - & $installScript @installParameters - } - catch { - if ($runtimeSourceFeed -or $runtimeSourceFeedKey) { - Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'" - if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + $variations = @() + $variations += @($installParameters) - if ($runtimeSourceFeedKey) { - $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) - $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) - $installParameters.FeedCredential = $decodedString - } + $dotnetBuilds = $installParameters.Clone() + $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $variations += @($dotnetBuilds) - try { - & $installScript @installParameters - } - catch { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'." - ExitWithExitCode 1 - } - } else { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location." - ExitWithExitCode 1 + if ($runtimeSourceFeed) { + $runtimeSource = $installParameters.Clone() + $runtimeSource.AzureFeed = $runtimeSourceFeed + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $runtimeSource.FeedCredential = $decodedString } + $variations += @($runtimeSource) + } + + $installSuccess = $false + foreach ($variation in $variations) { + if ($variation | Get-Member AzureFeed) { + $location = $variation.AzureFeed + } else { + $location = "public location"; + } + Write-Host "Attempting to install dotnet from $location." + try { + & $installScript @variation + $installSuccess = $true + break + } + catch { + Write-Host "Failed to install dotnet from $location." + } + } + if (-not $installSuccess) { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations." + ExitWithExitCode 1 } } @@ -882,24 +892,6 @@ if (!$disableConfigureToolsetImport) { } } -function Try-LogClientIpAddress() -{ - Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes" - try - { - $result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing - $lines = $result.Content.Split([Environment]::NewLine) - $socketIp = $lines | Select-String -Pattern "^Socket IP:.*" - Write-Host $socketIp - $clientIp = $lines | Select-String -Pattern "^Client IP:.*" - Write-Host $clientIp - } - catch - { - Write-Host "Unable to get this machine's effective IP address for logging: $_" - } -} - # # If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic. # diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6a4871ef7..e555c3426 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -188,28 +188,29 @@ function InstallDotNet { GetDotNetInstallScript "$root" local install_script=$_GetDotNetInstallScript - local archArg='' + local installParameters=(--version $version --install-dir "$root") + if [[ -n "${3:-}" ]] && [ "$3" != 'unset' ]; then - archArg="--architecture $3" + installParameters+=(--architecture $3) fi - local runtimeArg='' if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then - runtimeArg="--runtime $4" + installParameters+=(--runtime $4) fi - local skipNonVersionedFilesArg="" if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then - skipNonVersionedFilesArg="--skip-non-versioned-files" + installParameters+=(--skip-non-versioned-files) fi - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { - local exit_code=$? - echo "Failed to install dotnet SDK from public location (exit code '$exit_code')." - local runtimeSourceFeed='' - if [[ -n "${6:-}" ]]; then - runtimeSourceFeed="--azure-feed $6" - fi + local variations=() # list of variable names with parameter arrays in them - local runtimeSourceFeedKey='' + local public_location=("${installParameters[@]}") + variations+=(public_location) + + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + variations+=(dotnetbuilds) + + if [[ -n "${6:-}" ]]; then + variations+=(private_feed) + local private_feed=("${installParameters[@]}" --azure-feed $6) if [[ -n "${7:-}" ]]; then # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' # '-d'. To work around this, do a simple detection and switch the parameter @@ -219,22 +220,27 @@ function InstallDotNet { decodeArg="-d" fi decodedFeedKey=`echo $7 | base64 $decodeArg` - runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + private_feed+=(--feed-credential $decodedFeedKey) + fi + fi + + local installSuccess=0 + for variationName in "${variations[@]}"; do + local name="$variationName[@]" + local variation=("${!name}") + echo "Attempting to install dotnet from $variationName." + bash "$install_script" "${variation[@]}" && installSuccess=1 + if [[ "$installSuccess" -eq 1 ]]; then + break fi - if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { - local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." - ExitWithExitCode $exit_code - } - else - if [[ $exit_code != 0 ]]; then - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." - fi - ExitWithExitCode $exit_code - fi - } + echo "Failed to install dotnet from $variationName." + done + + if [[ "$installSuccess" -eq 0 ]]; then + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations." + ExitWithExitCode 1 + fi } function with_retries { @@ -399,13 +405,6 @@ function StopProcesses { return 0 } -function TryLogClientIpAddress () { - echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' - if command -v curl > /dev/null; then - curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true - fi -} - function MSBuild { local args=$@ if [[ "$pipelines_log" == true ]]; then diff --git a/global.json b/global.json index b785d4545..86e408bbe 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21560.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21560.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21609.4", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21609.4" } } From 4e9a0b6434223bfe07bc7c7fed51621414eef4c5 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 14 Dec 2021 17:29:29 -0500 Subject: [PATCH 15/43] [release/6.0.1xx] Add some additional distros to the CI matrix (#12141) --- .../job/source-build-create-tarball.yml | 17 +++++++- .../job/source-build-run-tarball-build.yml | 39 ++++++++++++++++--- .../steps/source-build-build-tarball.yml | 26 +++++++++++-- .../steps/source-build-publish-logs.yml | 25 ------------ src/SourceBuild/tarball/content/build.sh | 13 ++++--- src/SourceBuild/tarball/content/prep.sh | 2 +- src/SourceBuild/tarball/content/smoke-test.sh | 13 ++++--- 7 files changed, 88 insertions(+), 47 deletions(-) delete mode 100644 src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml 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 c4f57e632..ea2eb3ad7 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 @@ -53,7 +53,22 @@ jobs: /p:ArcadeBuildTarball=true displayName: Create Tarball - - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml + - task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + Contents: | + **/*.log + **/*.binlog + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: # Check if the tarball should be built now so the result can be used in the build tarball job condition. diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 70d81e3d6..47aa5bfb6 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -12,7 +12,11 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- + centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80 + centOS8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-source-build-20211118190102-9355e7b + debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b poolInternal: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 @@ -33,15 +37,33 @@ jobs: ${{ parameters.poolInternal }} strategy: matrix: - Fedora33-Online: + CentOS7-Online: + _BootstrapPrep: true _BuildArch: x64 - _Container: ${{ parameters.fedora33Container }} + _Container: ${{ parameters.centOS7Container }} _RunOnline: true - Fedora33-Offline: + CentOS7-Offline: + _BootstrapPrep: true _BuildArch: x64 - _Container: ${{ parameters.fedora33Container }} + _Container: ${{ parameters.centOS7Container }} _RunOnline: false - timeoutInMinutes: 240 + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + CentOS8-Offline: + _BootstrapPrep: true + _BuildArch: x64 + _Container: ${{ parameters.centOS8Container }} + _RunOnline: false + Fedora33-Offline: + _BootstrapPrep: false + _BuildArch: x64 + _Container: ${{ parameters.fedora33Container }} + _RunOnline: false + Ubuntu1804-Offline: + _BootstrapPrep: true + _BuildArch: x64 + _Container: ${{ parameters.ubuntu1804Container }} + _RunOnline: false + timeoutInMinutes: 300 workspace: clean: all @@ -55,7 +77,12 @@ jobs: prepScript: | set -x - docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball $(_Container) ./prep.sh + customPrepArgs= + if [ '$(_BootstrapPrep)' = 'true' ]; then + customPrepArgs='--bootstrap' + fi + + docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs} runOnline: $(_RunOnline) tarballDir: ${{ parameters.tarballDir }} tarballResourceId: ${{ parameters.tarballResourceId }} diff --git a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml index 30e55607d..8175b1a73 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml @@ -66,9 +66,29 @@ steps: docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} displayName: Run Tests - - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml - parameters: - sourceFolder: ${{ parameters.tarballDir }} + # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. + - script: | + set -x + + targetFolder=$(Build.StagingDirectory)/BuildLogs/ + mkdir -p ${targetFolder} + + cd "${{ parameters.tarballDir }}" + find artifacts/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find testing-smoke/logs -exec cp {} --parents -t ${targetFolder} \; + displayName: Prepare BuildLogs staging directory + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() - publish: '${{ parameters.tarballDir }}/artifacts/${{ parameters.buildArch}}/Release/' artifact: $(Agent.JobName)_Artifacts diff --git a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml deleted file mode 100644 index f26933bc9..000000000 --- a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml +++ /dev/null @@ -1,25 +0,0 @@ -# Gathers and publishes the build logs for a source-build - -parameters: - # Folder to scan for source-build logs from - sourceFolder: $(Build.SourcesDirectory) - -steps: -- task: CopyFiles@2 - displayName: Prepare BuildLogs staging directory - inputs: - SourceFolder: '${{ parameters.sourceFolder }}' - Contents: | - **/*.log - **/*.binlog - artifacts/prebuilt-report/* - TargetFolder: '$(Build.StagingDirectory)/BuildLogs' - CleanTargetFolder: true - continueOnError: true - condition: succeededOrFailed() - -- publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) - displayName: Publish BuildLogs - continueOnError: true - condition: succeededOrFailed() diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index f33b95575..8cca086c3 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/src/SourceBuild/tarball/content/build.sh @@ -156,11 +156,12 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 export NUGET_PACKAGES=$restoredPackagesDir/ -if [ "$alternateTarget" == "true" ]; then - "$CLI_ROOT/dotnet" $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll "$SCRIPT_ROOT/build.proj" /bl:source-build-test.binlog /clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@" -else - LogDateStamp=$(date +"%m%d%H%M%S") - $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog $SCRIPT_ROOT/tools-local/init-build.proj /t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" +LogDateStamp=$(date +"%m%d%H%M%S") - $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/Build_$LogDateStamp.binlog $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@" +if [ "$alternateTarget" == "true" ]; then + "$CLI_ROOT/dotnet" $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll "$SCRIPT_ROOT/build.proj" /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log /clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@" +else + $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log $SCRIPT_ROOT/tools-local/init-build.proj /t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + + $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/Build_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/Build_$LogDateStamp.log $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@" fi diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index 9e749fc2b..e3225d309 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -118,7 +118,7 @@ if [ "$buildBootstrap" == "true" ]; then fi # Run restore on project to initiate download of bootstrap packages - $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/" + $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/" # Remove working directory rm -rf $workingDir diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index c679af6f4..caa8017a8 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -55,7 +55,9 @@ excludeOnlineTests=false devCertsVersion="$DEV_CERTS_VERSION_DEFAULT" testingDir="$SCRIPT_ROOT/testing-smoke" cliDir="$testingDir/builtCli" -logFile="$testingDir/smoke-test.log" +logsDir="$testingDir/logs" +logFile="$logsDir/smoke-test.log" +omnisharpLogFile="$logsDir/omnisharp.log" restoredPackagesDir="$testingDir/packages" testingHome="$testingDir/home" archiveRestoredPackages=false @@ -206,7 +208,7 @@ function doCommand() { binlogHttpsPart="https" fi - binlogPrefix="$testingDir/${projectDir}_${binlogOnlinePart}_${binlogHttpsPart}_" + binlogPrefix="$logsDir/${projectDir}_${binlogOnlinePart}_${binlogHttpsPart}_" binlog="${binlogPrefix}$1.binlog" echo " running $1" | tee -a "$logFile" @@ -619,7 +621,7 @@ function runOmniSharpTests() { "${dotnetCmd}" new $project popd - ./omnisharp/run -s "$(readlink -f hello-$project)" > omnisharp.log & + ./omnisharp/run -s "$(readlink -f hello-$project)" > "$omnisharpLogFile" & sleep 5 @@ -632,9 +634,9 @@ function runOmniSharpTests() { kill "$(pgrep -f "$(pwd)")" - cat omnisharp.log + cat "$omnisharpLogFile" - if grep ERROR omnisharp.log; then + if grep ERROR "$omnisharpLogFile"; then echo "test failed" exit 1 else @@ -702,6 +704,7 @@ if [ -e "$testingDir" ]; then fi mkdir -p "$testingDir" +mkdir -p "$logsDir" cd "$testingDir" # Create blank Directory.Build files to avoid traversing to source-build infra. From cad6ba8de34ef431d1805cb12583a5e4bd1a578f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 22:34:55 +0000 Subject: [PATCH 16/43] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.1 (#12842) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 838762801..97b78b98a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/source-build-reference-packages - e025965a8e463030d890739043b6e64b41a5de84 + 9c7c56c0107adf3b5daecdd6ebb9fa6b043008fe From 9b9ab15577d36e372434a3f0decfee9e26fef7bc Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 14 Dec 2021 15:22:30 -0800 Subject: [PATCH 17/43] Update asp.net template versions (#12764) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 57a550014..8a6ebc018 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.12 + 5.0.13 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.21 + 3.1.22 3.2.1 4.8.0-rc2.19462.10 From 24110c35dba9e7808b08815504f370ac7b032e37 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 00:02:06 +0000 Subject: [PATCH 18/43] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.3 (#12845) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 97b78b98a..fd184c656 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/source-build-reference-packages - 9c7c56c0107adf3b5daecdd6ebb9fa6b043008fe + 371b3c7cb21a14ca703a6c6b966c4ce83d6902a2 From 0c8aa6d7a9eed0a3f39750257d02c8740ce12344 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 14 Dec 2021 19:23:15 -0600 Subject: [PATCH 19/43] Clean prebuilt baseline (#12816) * Remove prebuilt baseline * Make prebuilt baseline file optional --- .../content/tools-local/prebuilt-baseline.xml | 168 ------------------ .../ValidateUsageAgainstBaseline.cs | 18 +- 2 files changed, 13 insertions(+), 173 deletions(-) delete mode 100755 src/SourceBuild/tarball/content/tools-local/prebuilt-baseline.xml diff --git a/src/SourceBuild/tarball/content/tools-local/prebuilt-baseline.xml b/src/SourceBuild/tarball/content/tools-local/prebuilt-baseline.xml deleted file mode 100755 index da166e4f7..000000000 --- a/src/SourceBuild/tarball/content/tools-local/prebuilt-baseline.xml +++ /dev/null @@ -1,168 +0,0 @@ - - fedora.33-x64 - - src/arcade.a3377cccde8639089f99107e2ba5df2c8cbe6394/ - src/aspnetcore./ - src/clicommandlineparser.3198bf5660cad3dab85f5475bf1fda9688146e3f/ - src/command-line-api.5e855e911de7c56fe28400c4500e888fe2a3da8e/ - src/diagnostics.6f48c2ae749c29b687af0353e6c2a9590d7e3d22/ - src/fsharp./ - src/installer.c6ec4363003b18d8e587620baa36205b80ee3074/ - src/known-good-tests./ - src/known-good./ - src/linker.f2588193553431636b9853b0f87209fa395a72c5/ - src/msbuild./ - src/nuget.client./ - src/package-source-build/ - src/roslyn-analyzers./ - src/roslyn./ - src/runtime./ - src/runtime./ - src/sdk./ - src/source-build-reference-packages.36fb56afdf0ee2fb2e0833bdef98dfde12a0837b/ - src/source-build.3fb25b8db3bec654e37e71a5b2b7fde14444bc2f/ - src/sourcelink.4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc/ - src/symreader.1968a003d845d119a9d38ac4daaeea22897f7daf/ - src/templating.3bc0d90f3e450f3e4ebda128081d091fb42968e3/ - src/test-templates.6898c1c70c2d14e9725ddab6e1ebe8084c4d7e27/ - src/vstest./ - src/xdt.6a46e7c886cdf499ba3433f665ab417be814135e/ - src/xliff-tasks.71c811561ad4dcf46825a5077fbcc668ab74754f/ - Tools/ - tools-local/tasks/ - artifacts/obj/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs index d96dbf8d0..6c80f2756 100644 --- a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs +++ b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs @@ -17,9 +17,6 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport [Required] public string DataFile { get; set; } - [Required] - public string BaselineDataFile { get; set; } - [Required] public string OutputBaselineFile { get; set; } @@ -28,14 +25,25 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport public bool AllowTestProjectUsage { get; set; } + public string BaselineDataFile { get; set; } + public override bool Execute() { var used = UsageData.Parse(XElement.Parse(File.ReadAllText(DataFile))); - var baseline = UsageData.Parse(XElement.Parse(File.ReadAllText(BaselineDataFile))); + + IEnumerable baselineUsages; + if (File.Exists(BaselineDataFile)) + { + baselineUsages = UsageData.Parse(XElement.Parse(File.ReadAllText(BaselineDataFile))).Usages; + } + else + { + baselineUsages = Enumerable.Empty(); + } Comparison diff = Compare( used.Usages.Select(u => u.GetIdentityWithoutRid()).Distinct(), - baseline.Usages.Select(u => u.GetIdentityWithoutRid()).Distinct()); + baselineUsages.Select(u => u.GetIdentityWithoutRid()).Distinct()); var report = new XElement("BaselineComparison"); From 1b7269474c379a72c2281153193d43d8c6d7ed62 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 14 Dec 2021 19:23:41 -0600 Subject: [PATCH 20/43] Update build logic to handle checked in project.assets.json file in NuGet repo (#12810) --- src/SourceBuild/tarball/content/repos/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index f7bf1d2bd..05e685273 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -758,7 +758,7 @@ - + Date: Wed, 15 Dec 2021 20:42:26 +0000 Subject: [PATCH 21/43] Update dependencies from https://github.com/dotnet/sdk build 20211215.7 (#12849) [release/6.0.2xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44ae65f6c..591c4f94d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 4a935da067ee66f3d9bf5bdcda8dd3952e342ebb + d984207d8bc16a659e1d5303b744cf74518caa87 - + https://github.com/dotnet/sdk - 4a935da067ee66f3d9bf5bdcda8dd3952e342ebb + d984207d8bc16a659e1d5303b744cf74518caa87 diff --git a/eng/Versions.props b/eng/Versions.props index 4f5399580..b0dd2df6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21612.4 - 6.0.200-preview.21612.4 + 6.0.200-preview.21615.7 + 6.0.200-preview.21615.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f67f24dc204ac213bcf07f38c3e86460d6fbf05f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Dec 2021 15:16:48 +0000 Subject: [PATCH 22/43] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211216.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.21614.3 -> To Version 6.0.0-alpha.1.21616.1 --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index a6823f5e3..8f64eb5d7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,18 +7,18 @@ - - + + @@ -40,12 +40,12 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b4d393c7..9875748d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/source-build-reference-packages - 371b3c7cb21a14ca703a6c6b966c4ce83d6902a2 + 135c9120e2cf8ff7bfc5dbccbda89a5f0ba3ab6a From c10527b680a674d0d07ec1fd4b7895eb06712bb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 14:04:30 -0600 Subject: [PATCH 23/43] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211216.1 (#12855) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.21614.3 -> To Version 6.0.0-alpha.1.21616.1 Co-authored-by: dotnet-maestro[bot] --- 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 591c4f94d..f2d42e438 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/source-build-reference-packages - 371b3c7cb21a14ca703a6c6b966c4ce83d6902a2 + 135c9120e2cf8ff7bfc5dbccbda89a5f0ba3ab6a From 586476f7e5407c893a116fd83c202f2ed9b0613e Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 16 Dec 2021 18:45:17 -0600 Subject: [PATCH 24/43] Add logic to convert internal repo uris in version.details.xml (#12852) * Add logic to convert internal repo uris in version.details.xml * code review updates --- ...ourceBuildIntermediateNupkgDependencies.cs | 39 +++++++++++++++++++ .../tools/SourceBuildArcadeTarball.targets | 4 +- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs index 59f7eb499..9b6365dfc 100644 --- a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs +++ b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs @@ -3,6 +3,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; +using System; using System.Collections.Generic; using System.Linq; using System.Xml.Linq; @@ -21,6 +22,11 @@ namespace Microsoft.DotNet.SourceBuild.Tasks [Required] public string SourceBuildIntermediateNupkgPrefix { get; set; } + /// + /// Convert any internal repo references to the public GitHub repos. + /// + public bool ConvertInternalRepos { get; set; } + /// /// The intermediate nupkg RID to use if any RID-specific intermediate nupkgs are required. /// If this parameter isn't specified, RID-specific intermediate nupkgs can't be used and @@ -88,6 +94,11 @@ namespace Microsoft.DotNet.SourceBuild.Tasks string dependencyVersion = d.Attribute("Version")?.Value; string uri = d.Element(CreateQualifiedName("Uri"))?.Value; + if (ConvertInternalRepos) + { + uri = ConvertInternalRepo(uri); + } + string sha = d.Element(CreateQualifiedName("Sha"))?.Value; string sourceBuildRepoName = sourceBuildElement.Attribute("RepoName")?.Value; @@ -137,5 +148,33 @@ namespace Microsoft.DotNet.SourceBuild.Tasks return !Log.HasLoggedErrors; } + + private string ConvertInternalRepo(string uri) + { + if (uri.StartsWith("https://dev.azure.com", StringComparison.OrdinalIgnoreCase)) + { + string[] repoParts = uri.Substring(uri.LastIndexOf('/')).Split('-', 2); + + if (repoParts.Length != 2) + { + Log.LogError($"Repo '{uri}' does not end with the expected - format"); + return null; + } + + string org = repoParts[0]; + string repo = repoParts[1]; + + // The internal Nuget.Client repo has suffix which needs to be accounted for. + const string trustedSuffix = "-Trusted"; + if (uri.EndsWith(trustedSuffix, StringComparison.OrdinalIgnoreCase)) + { + repo = repo.Substring(0, repo.Length - trustedSuffix.Length); + } + + uri = $"https://github.com/{org}/{repo}"; + } + + return uri; + } } } diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 1717371dc..9a49c3499 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -19,6 +19,7 @@ $(TarballRootDir)src/ $(TarballRootDir)git-info/ quiet + true + SourceBuildIntermediateNupkgRid="$(SourceBuildIntermediateNupkgRid)" + ConvertInternalRepos="$(ConvertInternalRepos)"> From f14e4003491a0ce207c6345a626422cc6ce52178 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 17 Dec 2021 14:30:05 -0600 Subject: [PATCH 25/43] Exclude omnisharp tests from CentOS 7 CI (#12858) * Exclude omnisharp tests from CentOS 7 CI * Update src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml Co-authored-by: Chris Rummel Co-authored-by: Chris Rummel --- .../templates/job/source-build-run-tarball-build.yml | 6 ++++++ .../templates/steps/source-build-build-tarball.yml | 5 ++++- src/SourceBuild/tarball/content/smoke-test.sh | 9 ++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 47aa5bfb6..28648866d 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -41,27 +41,32 @@ jobs: _BootstrapPrep: true _BuildArch: x64 _Container: ${{ parameters.centOS7Container }} + _ExcludeOmniSharpTests: true _RunOnline: true CentOS7-Offline: _BootstrapPrep: true _BuildArch: x64 _Container: ${{ parameters.centOS7Container }} + _ExcludeOmniSharpTests: true _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: CentOS8-Offline: _BootstrapPrep: true _BuildArch: x64 _Container: ${{ parameters.centOS8Container }} + _ExcludeOmniSharpTests: false _RunOnline: false Fedora33-Offline: _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.fedora33Container }} + _ExcludeOmniSharpTests: false _RunOnline: false Ubuntu1804-Offline: _BootstrapPrep: true _BuildArch: x64 _Container: ${{ parameters.ubuntu1804Container }} + _ExcludeOmniSharpTests: false _RunOnline: false timeoutInMinutes: 300 workspace: @@ -74,6 +79,7 @@ jobs: parameters: buildArch: $(_BuildArch) container: $(_Container) + excludeOmniSharpTests: $(_ExcludeOmniSharpTests) prepScript: | set -x diff --git a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml index 8175b1a73..2891bdc13 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml @@ -10,6 +10,9 @@ parameters: # Container image to build within container: null + # Skip running the OmniSharp smoke-tests + excludeOmniSharpTests: false + # Script logic to prep the tarball for building prepScript: null @@ -63,7 +66,7 @@ steps: - script: | set -x - docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} + docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball -e excludeOmniSharpTests=${{ parameters.excludeOmniSharpTests}} ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} displayName: Run Tests # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index caa8017a8..a1c43673d 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -52,6 +52,7 @@ excludeWebNoHttpsTests=false excludeWebHttpsTests=false excludeLocalTests=false excludeOnlineTests=false +excludeOmniSharpTests=${excludeOmniSharpTests:-false} devCertsVersion="$DEV_CERTS_VERSION_DEFAULT" testingDir="$SCRIPT_ROOT/testing-smoke" cliDir="$testingDir/builtCli" @@ -81,6 +82,7 @@ function usage() { echo " --excludeWebHttpsTests don't run web project tests with https using dotnet-dev-certs" echo " --excludeLocalTests exclude tests that use local sources for nuget packages" echo " --excludeOnlineTests exclude test that use online sources for nuget packages" + echo " --excludeOmniSharpTests don't run the OmniSharp tests" echo " --devCertsVersion use dotnet-dev-certs instead of default $DEV_CERTS_VERSION_DEFAULT" echo " --prodConBlobFeedUrl override the prodcon blob feed specified in ProdConFeed.txt, removing it if empty" echo " --archiveRestoredPackages capture all restored packages to $archivedPackagesDir" @@ -139,6 +141,9 @@ while :; do --excludeonlinetests) excludeOnlineTests=true ;; + --excludeomnisharptests) + excludeOmniSharpTests=true + ;; --devcertsversion) shift devCertsVersion="$1" @@ -772,6 +777,8 @@ fi runXmlDocTests -runOmniSharpTests +if [ "$excludeOmniSharpTests" == "false" ]; then + runOmniSharpTests +fi echo "ALL TESTS PASSED!" From 58f9685dd51d3473c89aabfab15d8550aac62638 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Dec 2021 14:34:47 -0600 Subject: [PATCH 26/43] [release/6.0.2xx] Update dependencies from dotnet/sdk (#12857) * Update dependencies from https://github.com/dotnet/sdk build 20211216.6 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21615.7 -> To Version 6.0.200-preview.21616.6 Dependency coherency updates VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0-rtm.21523.1 -> To Version 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211216.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21615.7 -> To Version 6.0.200-preview.21616.8 Dependency coherency updates VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0-rtm.21523.1 -> To Version 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211216.10 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21615.7 -> To Version 6.0.200-preview.21616.10 Dependency coherency updates VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0-rtm.21523.1 -> To Version 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk * Add logic to convert internal repo uris in version.details.xml (#12852) * Add logic to convert internal repo uris in version.details.xml * code review updates * Remove source-build patches that we backported Co-authored-by: dotnet-maestro[bot] Co-authored-by: Michael Simons --- eng/Version.Details.xml | 110 +++++++++--------- eng/Versions.props | 38 +++--- ...ourceBuildIntermediateNupkgDependencies.cs | 39 +++++++ .../tools/SourceBuildArcadeTarball.targets | 4 +- ...-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 ----- 7 files changed, 116 insertions(+), 185 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/eng/Version.Details.xml b/eng/Version.Details.xml index f2d42e438..703ce0d88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,42 +5,42 @@ https://github.com/dotnet/windowsdesktop 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - - https://github.com/dotnet/windowsdesktop - 59fea7da1dbb6e48837fa726cc2760b154bce3d1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + ef15b555537a90da229ce6474658ae1a9916a932 https://github.com/dotnet/windowsdesktop 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - - https://github.com/dotnet/windowsdesktop - 59fea7da1dbb6e48837fa726cc2760b154bce3d1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + ef15b555537a90da229ce6474658ae1a9916a932 - - 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 @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 7c35333b66a97deaa23c519889de11069cf22504 + ea8a2ef77701415228776344a69a6aa521cea877 - + https://github.com/dotnet/templating - 7c35333b66a97deaa23c519889de11069cf22504 + ea8a2ef77701415228776344a69a6aa521cea877 - + https://github.com/dotnet/templating - 7d941613047c847c87dc8d243a54fd1a45a47de7 + ea8a2ef77701415228776344a69a6aa521cea877 - + https://github.com/dotnet/sdk - d984207d8bc16a659e1d5303b744cf74518caa87 + 7c856e62f9f505996e67729ce74a57eb70df7387 - + https://github.com/dotnet/sdk - d984207d8bc16a659e1d5303b744cf74518caa87 + 7c856e62f9f505996e67729ce74a57eb70df7387 - - 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 b0dd2df6f..42557f6a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.0-rtm.21523.1 + 6.0.1-servicing.21567.5 - 6.0.0-rtm.21523.1 + 6.0.1-servicing.21567.7 - 6.0.200-alpha.1.21609.4 + 6.0.200-preview.21616.2 @@ -44,43 +44,43 @@ - 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.200-preview.21615.7 - 6.0.200-preview.21615.7 + 6.0.200-preview.21616.10 + 6.0.200-preview.21616.10 $(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.1-servicing.21568.2 6.0.0-rtm.21523.1 - 6.0.0 + 6.0.1 6.0.0 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100 + 6.0.200-preview.21616.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) diff --git a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs index 59f7eb499..9b6365dfc 100644 --- a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs +++ b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs @@ -3,6 +3,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; +using System; using System.Collections.Generic; using System.Linq; using System.Xml.Linq; @@ -21,6 +22,11 @@ namespace Microsoft.DotNet.SourceBuild.Tasks [Required] public string SourceBuildIntermediateNupkgPrefix { get; set; } + /// + /// Convert any internal repo references to the public GitHub repos. + /// + public bool ConvertInternalRepos { get; set; } + /// /// The intermediate nupkg RID to use if any RID-specific intermediate nupkgs are required. /// If this parameter isn't specified, RID-specific intermediate nupkgs can't be used and @@ -88,6 +94,11 @@ namespace Microsoft.DotNet.SourceBuild.Tasks string dependencyVersion = d.Attribute("Version")?.Value; string uri = d.Element(CreateQualifiedName("Uri"))?.Value; + if (ConvertInternalRepos) + { + uri = ConvertInternalRepo(uri); + } + string sha = d.Element(CreateQualifiedName("Sha"))?.Value; string sourceBuildRepoName = sourceBuildElement.Attribute("RepoName")?.Value; @@ -137,5 +148,33 @@ namespace Microsoft.DotNet.SourceBuild.Tasks return !Log.HasLoggedErrors; } + + private string ConvertInternalRepo(string uri) + { + if (uri.StartsWith("https://dev.azure.com", StringComparison.OrdinalIgnoreCase)) + { + string[] repoParts = uri.Substring(uri.LastIndexOf('/')).Split('-', 2); + + if (repoParts.Length != 2) + { + Log.LogError($"Repo '{uri}' does not end with the expected - format"); + return null; + } + + string org = repoParts[0]; + string repo = repoParts[1]; + + // The internal Nuget.Client repo has suffix which needs to be accounted for. + const string trustedSuffix = "-Trusted"; + if (uri.EndsWith(trustedSuffix, StringComparison.OrdinalIgnoreCase)) + { + repo = repo.Substring(0, repo.Length - trustedSuffix.Length); + } + + uri = $"https://github.com/{org}/{repo}"; + } + + return uri; + } } } diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 75fd838e8..919d3c975 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -19,6 +19,7 @@ $(TarballRootDir)src/ $(TarballRootDir)git-info/ quiet + true + SourceBuildIntermediateNupkgRid="$(SourceBuildIntermediateNupkgRid)" + ConvertInternalRepos="$(ConvertInternalRepos)"> 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 bae957621..000000000 --- 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 0d13c1cf5..000000000 --- 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 161b962b7..000000000 --- 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 From 59f7c52dbf3ad0ae8a9781bc384e63b56ff3f330 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 13:21:17 +0000 Subject: [PATCH 27/43] Update dependencies from https://github.com/dotnet/sdk build 20211223.4 (#12888) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-preview.21616.2 to 6.0.200-preview.21623.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.200-preview.21616.2 to 6.0.200-preview.21623.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.200-preview.21616.2 to 6.0.200-preview.21623.1 (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 703ce0d88..b7d1c955c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - ea8a2ef77701415228776344a69a6aa521cea877 + 1e455242a81fe8b0bea9a17359c6274acb6f9b46 - + https://github.com/dotnet/templating - ea8a2ef77701415228776344a69a6aa521cea877 + 1e455242a81fe8b0bea9a17359c6274acb6f9b46 - + https://github.com/dotnet/templating - ea8a2ef77701415228776344a69a6aa521cea877 + 1e455242a81fe8b0bea9a17359c6274acb6f9b46 - + https://github.com/dotnet/sdk - 7c856e62f9f505996e67729ce74a57eb70df7387 + 0af8a986b81c5c75c196423b6af35ddfa5469245 - + https://github.com/dotnet/sdk - 7c856e62f9f505996e67729ce74a57eb70df7387 + 0af8a986b81c5c75c196423b6af35ddfa5469245 diff --git a/eng/Versions.props b/eng/Versions.props index 42557f6a2..39c795316 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-preview.21616.2 + 6.0.200-preview.21623.1 @@ -56,8 +56,8 @@ - 6.0.200-preview.21616.10 - 6.0.200-preview.21616.10 + 6.0.200-preview.21623.4 + 6.0.200-preview.21623.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.200-preview.21616.2 + 6.0.200-preview.21623.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From a305edd09aa090bb4f9bd7af0ac044311709f135 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 15:53:50 +0000 Subject: [PATCH 28/43] Update dependencies from https://github.com/dotnet/sdk build 20211223.6 (#12891) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-preview.21623.1 to 6.0.200-preview.21623.5 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.200-preview.21623.1 to 6.0.200-preview.21623.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.200-preview.21623.1 to 6.0.200-preview.21623.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 b7d1c955c..15e78c3b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 1e455242a81fe8b0bea9a17359c6274acb6f9b46 + 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/templating - 1e455242a81fe8b0bea9a17359c6274acb6f9b46 + 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/templating - 1e455242a81fe8b0bea9a17359c6274acb6f9b46 + 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/sdk - 0af8a986b81c5c75c196423b6af35ddfa5469245 + b8b6c7ac577a5f1234c0d9d166cb8c67815999c1 - + https://github.com/dotnet/sdk - 0af8a986b81c5c75c196423b6af35ddfa5469245 + b8b6c7ac577a5f1234c0d9d166cb8c67815999c1 diff --git a/eng/Versions.props b/eng/Versions.props index 39c795316..cf789f67d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-preview.21623.1 + 6.0.200-preview.21623.5 @@ -56,8 +56,8 @@ - 6.0.200-preview.21623.4 - 6.0.200-preview.21623.4 + 6.0.200-preview.21623.6 + 6.0.200-preview.21623.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.200-preview.21623.1 + 6.0.200-preview.21623.5 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From aacb4eecae75964427ff7fd29fb18ee9841cdbc4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:10:16 +0000 Subject: [PATCH 29/43] Update dependencies from https://github.com/dotnet/sdk build 20220103.6 (#12942) [release/6.0.2xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15e78c3b7..33de67ba7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/sdk - b8b6c7ac577a5f1234c0d9d166cb8c67815999c1 + db89b04faf130a5d2cc9e2a7c7a2bf2e7645b3b4 - + https://github.com/dotnet/sdk - b8b6c7ac577a5f1234c0d9d166cb8c67815999c1 + db89b04faf130a5d2cc9e2a7c7a2bf2e7645b3b4 diff --git a/eng/Versions.props b/eng/Versions.props index cf789f67d..715f73f35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21623.6 - 6.0.200-preview.21623.6 + 6.0.200-preview.22053.6 + 6.0.200-preview.22053.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 118f8629acc7cf637c3d74f6233ff1293350d7b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 23:06:13 +0000 Subject: [PATCH 30/43] Update dependencies from https://github.com/dotnet/sdk build 20220103.8 (#12944) [release/6.0.2xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33de67ba7..f438edd07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/sdk - db89b04faf130a5d2cc9e2a7c7a2bf2e7645b3b4 + 36012c2c2eb649c012cee7889883b1c7b591c857 - + https://github.com/dotnet/sdk - db89b04faf130a5d2cc9e2a7c7a2bf2e7645b3b4 + 36012c2c2eb649c012cee7889883b1c7b591c857 diff --git a/eng/Versions.props b/eng/Versions.props index 715f73f35..c8b1617f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22053.6 - 6.0.200-preview.22053.6 + 6.0.200-preview.22053.8 + 6.0.200-preview.22053.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 284e87c2680b1b29f9c07743bdd2d45b88a4bcd6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 23:43:59 +0000 Subject: [PATCH 31/43] Update dependencies from https://github.com/dotnet/sdk build 20220104.6 (#12958) [release/6.0.2xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f438edd07..3cc3e5b63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/sdk - 36012c2c2eb649c012cee7889883b1c7b591c857 + 9fc1d29347cb79e92febb70118aa95341b8a99a6 - + https://github.com/dotnet/sdk - 36012c2c2eb649c012cee7889883b1c7b591c857 + 9fc1d29347cb79e92febb70118aa95341b8a99a6 diff --git a/eng/Versions.props b/eng/Versions.props index c8b1617f7..c16643c54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22053.8 - 6.0.200-preview.22053.8 + 6.0.200-preview.22054.6 + 6.0.200-preview.22054.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 943ee4f9684b961da16b51888fa09aa66b69f6b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Jan 2022 19:24:27 +0000 Subject: [PATCH 32/43] Update dependencies from https://github.com/dotnet/sdk build 20220105.5 (#12967) [release/6.0.2xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3cc3e5b63..3e5d196ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/sdk - 9fc1d29347cb79e92febb70118aa95341b8a99a6 + 346cab24d92131ef957b1dd4b2fe14d6a976f27a - + https://github.com/dotnet/sdk - 9fc1d29347cb79e92febb70118aa95341b8a99a6 + 346cab24d92131ef957b1dd4b2fe14d6a976f27a diff --git a/eng/Versions.props b/eng/Versions.props index c16643c54..a403ec206 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22054.6 - 6.0.200-preview.22054.6 + 6.0.200-preview.22055.5 + 6.0.200-preview.22055.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 866997c44d706bf19c23b89ed095cd18af96438d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Jan 2022 21:08:52 +0000 Subject: [PATCH 33/43] Update dependencies from https://github.com/dotnet/sdk build 20220105.8 (#12970) [release/6.0.2xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e5d196ef..eb3014df9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/sdk - 346cab24d92131ef957b1dd4b2fe14d6a976f27a + 518f999e4a09d3ebf27d078290e02c1b82732b3a - + https://github.com/dotnet/sdk - 346cab24d92131ef957b1dd4b2fe14d6a976f27a + 518f999e4a09d3ebf27d078290e02c1b82732b3a diff --git a/eng/Versions.props b/eng/Versions.props index a403ec206..a03120501 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22055.5 - 6.0.200-preview.22055.5 + 6.0.200-preview.22055.8 + 6.0.200-preview.22055.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 38e5918eb34dc394fefac13e7e6a8aa4fb586cde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Jan 2022 00:05:10 +0000 Subject: [PATCH 34/43] Update dependencies from https://github.com/dotnet/sdk build 20220105.18 (#12974) [release/6.0.2xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb3014df9..88030d6ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/sdk - 518f999e4a09d3ebf27d078290e02c1b82732b3a + fc015c83cca4c3d41b6f1d49af9c90ebc6d7aaf6 - + https://github.com/dotnet/sdk - 518f999e4a09d3ebf27d078290e02c1b82732b3a + fc015c83cca4c3d41b6f1d49af9c90ebc6d7aaf6 diff --git a/eng/Versions.props b/eng/Versions.props index a03120501..77829c45c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22055.8 - 6.0.200-preview.22055.8 + 6.0.200-preview.22055.18 + 6.0.200-preview.22055.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a3c3a2bf3b30abfa5bb157d57e785c6070d976ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Jan 2022 00:58:59 +0000 Subject: [PATCH 35/43] Update dependencies from https://github.com/dotnet/sdk build 20220105.20 (#12975) [release/6.0.2xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88030d6ab..39ea9bbf2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/sdk - fc015c83cca4c3d41b6f1d49af9c90ebc6d7aaf6 + 1210366c0236df41b349b699499bb8edd790304b - + https://github.com/dotnet/sdk - fc015c83cca4c3d41b6f1d49af9c90ebc6d7aaf6 + 1210366c0236df41b349b699499bb8edd790304b diff --git a/eng/Versions.props b/eng/Versions.props index 77829c45c..2e77cd168 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22055.18 - 6.0.200-preview.22055.18 + 6.0.200-preview.22055.20 + 6.0.200-preview.22055.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6f088aab5a161001fe4df3f243080c5ed81e21d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Jan 2022 01:59:36 +0000 Subject: [PATCH 36/43] Update dependencies from https://github.com/dotnet/sdk build 20220105.21 (#12977) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.1-beta.21610.1 to 12.0.1-beta.21631.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21610.1 to 6.0.2-beta.21631.3 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.1.0-2.21609.7 to 4.1.0-3.22054.26 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.1.0-preview-21610-01 to 17.1.0-preview-22055-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39ea9bbf2..e8c223cac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/sdk - 1210366c0236df41b349b699499bb8edd790304b + f16e2d2c9919d04ae728ad1e6db69e82198b2abf - + https://github.com/dotnet/sdk - 1210366c0236df41b349b699499bb8edd790304b + f16e2d2c9919d04ae728ad1e6db69e82198b2abf @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - c12acdbfa5f76f811888d824bce5a87f7f68fdb8 + f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f - + https://github.com/dotnet/fsharp - c12acdbfa5f76f811888d824bce5a87f7f68fdb8 + f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - 818313426323d979747781a17c78860c833776da + f206c5d203c5562f814d3afa3c9e695250391c76 - + https://github.com/dotnet/msbuild - 96a618ca59610908eddc92bfd0198746c34f0ed5 + 797fd829a374a880f63fd4eea4ea6990404c48f4 diff --git a/eng/Versions.props b/eng/Versions.props index 2e77cd168..fbc38c51c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22055.20 - 6.0.200-preview.22055.20 + 6.0.200-preview.22055.21 + 6.0.200-preview.22055.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3e5cca8743e9cba967544280f1967f8f6346efda Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Jan 2022 02:50:30 +0000 Subject: [PATCH 37/43] Update dependencies from https://github.com/dotnet/sdk build 20220105.23 (#12979) [release/6.0.2xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8c223cac..0d13c6409 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/sdk - f16e2d2c9919d04ae728ad1e6db69e82198b2abf + 6ca80ba4d8c6f3087176440622bbdb90e78d3708 - + https://github.com/dotnet/sdk - f16e2d2c9919d04ae728ad1e6db69e82198b2abf + 6ca80ba4d8c6f3087176440622bbdb90e78d3708 diff --git a/eng/Versions.props b/eng/Versions.props index fbc38c51c..287138a80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22055.21 - 6.0.200-preview.22055.21 + 6.0.200-preview.22055.23 + 6.0.200-preview.22055.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b00ba9b79ef6069ade4da524b9604e5c5d95da9b Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 6 Jan 2022 17:46:04 -0800 Subject: [PATCH 38/43] Fix installertype path for patches --- src/redist/targets/GenerateMSIs.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index e0e948128..b10e2d1e8 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -167,7 +167,7 @@ '$(SdkMSIInstallerFile)' ^ '$(WixRoot)' ^ '$(ToolsetBrandName)' ^ - '$(VersionPrefix)' ^ + '$(CliProductBandVersion)00' ^ '$(MsiVersion)' ^ '$(SDKBundleVersion)' ^ '$(Version)' ^ From 351dbd3ecca181c38d2652c0738d5ca72a4b4cef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jan 2022 03:18:18 +0000 Subject: [PATCH 39/43] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220111.1 (#13007) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- NuGet.config | 6 ------ eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8f64eb5d7..6812f9b81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,9 +17,6 @@ - - - @@ -43,9 +40,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9875748d4..2c123d57d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/source-build-reference-packages - 135c9120e2cf8ff7bfc5dbccbda89a5f0ba3ab6a + 753383f8a8b0f5a7489c76252e6e383e47c97b2a From 5502a4441ed3cba8ae1c89f8134447d9307fdbf7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jan 2022 03:28:28 +0000 Subject: [PATCH 40/43] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220111.1 (#13006) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages --- 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 0d13c6409..631559986 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/source-build-reference-packages - 135c9120e2cf8ff7bfc5dbccbda89a5f0ba3ab6a + 753383f8a8b0f5a7489c76252e6e383e47c97b2a From 2d72e717b3ffe4e6094d153a9cc970da971ed753 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Jan 2022 15:49:16 +0000 Subject: [PATCH 41/43] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220113.1 (#13026) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages --- 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 631559986..5033e241e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/source-build-reference-packages - 753383f8a8b0f5a7489c76252e6e383e47c97b2a + f5bc8bd3d3a2738be1095b2ca4f928504acb4801 From fbda78a56756bb7a5e5f15bbbc1a0211e750c81a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Jan 2022 15:49:17 +0000 Subject: [PATCH 42/43] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220113.1 (#13025) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 2c123d57d..be14086c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/source-build-reference-packages - 753383f8a8b0f5a7489c76252e6e383e47c97b2a + f5bc8bd3d3a2738be1095b2ca4f928504acb4801 From 51a0225f8009bb309102e6766e6af4e6f8a952bb Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 14 Jan 2022 00:15:19 +0000 Subject: [PATCH 43/43] Tweak source-build tarball build logic to skip offline in PR --- .../job/source-build-run-tarball-build.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 5b00d9b70..70a63dc82 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -43,14 +43,13 @@ jobs: _Container: ${{ parameters.centOS7Container }} _ExcludeOmniSharpTests: true _RunOnline: true - CentOS7-Offline: - _BootstrapPrep: true - _BuildArch: x64 - _Container: ${{ parameters.centOS7Container }} - _ExcludeOmniSharpTests: true - _RunOnline: false - # Offline builds have prebuilts: https://github.com/dotnet/fsharp/issues/12499 ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + CentOS7-Offline: + _BootstrapPrep: true + _BuildArch: x64 + _Container: ${{ parameters.centOS7Container }} + _ExcludeOmniSharpTests: true + _RunOnline: false CentOS8-Offline: _BootstrapPrep: true _BuildArch: x64