From 42257c06e2dfe89af03a5e15b4181aeb7d9727b9 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 27 Oct 2021 14:28:48 -0700 Subject: [PATCH 001/178] Update branding for 6.0.2xx --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a1d77f37f..3a5fbcb6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,10 +7,10 @@ 6 0 - 1 + 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + servicing $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 161470b83ecc0d7311ce756c93191e19d802dbd9 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 27 Oct 2021 14:45:09 -0700 Subject: [PATCH 002/178] Set StabilizePackageVersion to false --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3a5fbcb6f..33b333364 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,7 +14,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release From a157e0ab4279c192e8980a6c20dc51c49d4be8c0 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 29 Oct 2021 16:05:17 -0700 Subject: [PATCH 003/178] Set ulimit --- run-build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/run-build.sh b/run-build.sh index 7b98aedc0..99a408cf2 100755 --- a/run-build.sh +++ b/run-build.sh @@ -25,6 +25,9 @@ CUSTOM_BUILD_ARGS= # Set nuget package cache under the repo [ -z $NUGET_PACKAGES ] && export NUGET_PACKAGES="$REPOROOT/.nuget/packages" +# Set max number of files open, helps avoid errors during NuGet restore +ulimit -n 16384 + args=( ) while [[ $# > 0 ]]; do From 82334c7ef0439ecebfab3f344cc34f562acc8a05 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 1 Nov 2021 11:21:40 -0700 Subject: [PATCH 004/178] Run build under sudo so that we can set ulimit --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 7ff647c40..5eb32b4c7 100755 --- a/build.sh +++ b/build.sh @@ -53,5 +53,5 @@ dockerbuild() if [ ! -z "$BUILD_IN_DOCKER" ]; then dockerbuild $args else - $DIR/run-build.sh $args + sudo $DIR/run-build.sh $args fi From cf3fff796a40b796f01c5ebae988e23d4c4db691 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 1 Nov 2021 14:00:59 -0700 Subject: [PATCH 005/178] Switch prerelease label to preview --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 33b333364..8b6a478c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - servicing + preview $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 892222071f73062f969f4f6ed1df8f759b9327b7 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Wed, 3 Nov 2021 15:12:59 +0100 Subject: [PATCH 006/178] GetRuntimeInformation.targets: determine PortableProductMonikerRid based on HostOSName and Architecture. --- src/redist/targets/GetRuntimeInformation.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 5133c3a38..01f704c7d 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -28,6 +28,8 @@ '$(Rid)' == 'linux-musl-x64' ">$(Rid) $(OSName)-$(Architecture) + $(HostOSName)-$(Architecture) + dotnet-sdk-internal$(PgoTerm) dotnet-sdk$(PgoTerm) From e5cb4120c2f1b7f0483db0692810cf05fa8b5f8b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 4 Nov 2021 11:36:49 -0700 Subject: [PATCH 007/178] Update bundle.thm --- src/redist/targets/packaging/windows/clisdk/bundle.thm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.thm b/src/redist/targets/packaging/windows/clisdk/bundle.thm index 89cf63055..568f89f7e 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.thm +++ b/src/redist/targets/packaging/windows/clisdk/bundle.thm @@ -40,8 +40,8 @@ #(loc.FilesInUseLabel) - - + + From dbb47fa43aaf9c3f8605a7ba0a8d0787227a9122 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 5 Nov 2021 16:06:27 -0700 Subject: [PATCH 008/178] Update bundle.thm --- src/redist/targets/packaging/windows/clisdk/bundle.thm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.thm b/src/redist/targets/packaging/windows/clisdk/bundle.thm index 568f89f7e..ebe591ccc 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.thm +++ b/src/redist/targets/packaging/windows/clisdk/bundle.thm @@ -40,8 +40,8 @@ #(loc.FilesInUseLabel) - - + + From 2747a16e30c5c3a70762ef9f1a977a880137035a Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 10 Nov 2021 14:45:09 -0800 Subject: [PATCH 009/178] [release/6.0.2xx] update Asp.Net templates (#12598) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8b6a478c8..7e8888edf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.11 + 5.0.12 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.20 + 3.1.21 3.2.1 4.8.0-rc2.19462.10 From 7667cec39ead40fc45b31349d794d99d70acac75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 23:16:51 +0000 Subject: [PATCH 010/178] [release/6.0.2xx] Update dependencies from dotnet/arcade (#12631) [release/6.0.2xx] Update dependencies from dotnet/arcade --- NuGet.config | 22 ------------------- eng/Version.Details.xml | 12 +++++----- eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- .../templates/job/source-index-stage1.yml | 2 +- eng/common/templates/jobs/jobs.yml | 4 ++-- global.json | 6 ++--- 8 files changed, 15 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index de42f9ad5..b995dca0c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,38 +7,16 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dfe53685..5711c22d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + ee9b7f19853685805c612103282c8d9486c7db86 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7e8888edf..18ed2689e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21519.3 + 6.0.0-beta.21560.2 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 69eb67849..4882dd931 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -62,7 +62,7 @@ jobs: pool: # To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019. ${{ if eq(parameters.extractArchiveArtifacts, 'false') }}: - name: Hosted VS2017 + vmImage: windows-2019 ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}: vmImage: windows-2019 steps: diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index e8bc77d2e..2b55a567f 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 1cc0c29e4..d8990549e 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 condition: '' dependsOn: '' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index a1f8fce96..90015a7e5 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -83,7 +83,7 @@ jobs: - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} @@ -96,4 +96,4 @@ jobs: dependsOn: - Asset_Registry_Publish pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 diff --git a/global.json b/global.json index 4f5a20ba8..b785d4545 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-rc.2.21426.20", + "dotnet": "6.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21519.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21519.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21560.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21560.2" } } From 8c09aecb906fb500a0df08af1972fbf952c174cb Mon Sep 17 00:00:00 2001 From: Alex Perovich Date: Mon, 15 Nov 2021 08:37:15 -0800 Subject: [PATCH 011/178] Port #12374 to release/6.0.2xx (#12635) Add downloading of runtime assets from dotnetbuilds --- .vsts-ci.yml | 2 ++ .../tarball/content/repos/installer.proj | 7 ++--- src/redist/targets/GenerateLayout.targets | 31 +++++++++++-------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 5d0247741..d801654bb 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -36,9 +36,11 @@ variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNet-MSRC-Storage + - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) + /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) stages: - stage: build diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj index a3a2f394c..712d7cd14 100644 --- a/src/SourceBuild/tarball/content/repos/installer.proj +++ b/src/SourceBuild/tarball/content/repos/installer.proj @@ -31,11 +31,8 @@ $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 $(BuildCommandArgs) /p:CoreSetupRid=$(TargetRid) - - $(BuildCommandArgs) /p:CoreSetupBlobRootUrl=file:%2F%2F$(SourceBuiltAssetsDir) - - - $(BuildCommandArgs) /p:DotnetToolsetBlobRootUrl=file:%2F%2F$(SourceBuiltAssetsDir) + + $(BuildCommandArgs) /p:PublicBaseURL=file:%2F%2F$(SourceBuiltAssetsDir) $(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=false diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index f2cc4113b..3917efa60 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -34,9 +34,7 @@ true https://dotnetclimsrc.blob.core.windows.net/dotnet/ - https://dotnetcli.blob.core.windows.net/dotnet/ - https://dotnetcli.blob.core.windows.net/dotnet/ - https://dotnetcli.blob.core.windows.net/dotnet/ + https://dotnetcli.blob.core.windows.net/dotnet/ $(HostRid) $(OSName)-$(Architecture) @@ -104,11 +102,11 @@ - $(CoreSetupBlobRootUrl)Runtime/ - $(CoreSetupBlobRootUrl) - $(CoreSetupBlobRootUrl)aspnetcore/Runtime/ - $(CoreSetupBlobRootUrl) - $(CoreSetupBlobRootUrl)WindowsDesktop/ + $(PublicBaseURL)Runtime/ + $(PublicBaseURL) + $(PublicBaseURL)aspnetcore/Runtime/ + $(PublicBaseURL) + $(PublicBaseURL)WindowsDesktop/ $(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimePackageVersion) $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) @@ -245,8 +243,8 @@ - $(DotnetToolsetBlobRootUrl)Sdk/$(MicrosoftDotnetToolsetInternalPackageVersion) - $(DotnetToolsetBlobRootUrl) + $(PublicBaseURL)Sdk/$(MicrosoftDotnetToolsetInternalPackageVersion) + $(PublicBaseURL) dotnet-toolset-internal-$(MicrosoftDotnetToolsetInternalPackageVersion).zip sdk/$(Version) @@ -344,9 +342,7 @@ Replaces the public base url with the private one. --> %(BaseUrl) - $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(CoreSetupBlobRootUrl)', '$(InternalBaseURL)')) - $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(DotnetExtensionsBlobRootUrl)', '$(InternalBaseURL)')) - $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(DotnetToolsetBlobRootUrl)', '$(InternalBaseURL)')) + $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(PublicBaseURL)', '$(InternalBaseURL)')) - 6.0.0-beta.21560.2 + 6.0.0-beta.21562.1 diff --git a/global.json b/global.json index b785d4545..e6d26905e 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.21562.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21562.1" } } From 4078d7d02383c83bbcd4e20e4fdd0e51a1885006 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 12:29:44 -0800 Subject: [PATCH 013/178] Merge pull request #12613 from dotnet/darc-release/6.0.2xx-1b244fc7-ac70-4eca-9fcf-17a28ef743e0 [release/6.0.2xx] Update dependencies from dotnet/sdk --- NuGet.config | 2 - eng/Version.Details.xml | 28 +-- eng/Versions.props | 6 +- .../0001-Fix-MicrosoftExtensionsVersion.patch | 2 +- ...on-downlevel-frameworks-during-sourc.patch | 167 ------------------ ...built-jnm2.ReferenceAssemblies.net35.patch | 36 ---- ...nnedApiAnalyzers-during-source-build.patch | 29 --- ...y-on-MS.VS.Setup.Configuration.Inter.patch | 6 +- ...ed-source-build-patches-and-re-patch.patch | 2 +- ...vstest.console-netcoreapp2.1-support.patch | 26 --- ...r-win-runtime-identifier-in-source-b.patch | 40 ----- 11 files changed, 22 insertions(+), 322 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0001-Remove-prebuilt-jnm2.ReferenceAssemblies.net35.patch delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch delete mode 100644 src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch diff --git a/NuGet.config b/NuGet.config index b995dca0c..ae8794e04 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,8 +31,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd5552022..899992b3f 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 - 2c798cbf6bf259ce49d94d91bc665a95d42d7a7f + af3b7d0f15282afee493e61c10b0bb170317de8d - + https://github.com/dotnet/sdk - 2c798cbf6bf259ce49d94d91bc665a95d42d7a7f + af3b7d0f15282afee493e61c10b0bb170317de8d @@ -121,18 +121,18 @@ https://github.com/dotnet/wpf 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 6d626ff0752a77d339f609b4d361787dc9ca93a5 + 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 - + https://github.com/dotnet/fsharp - 6d626ff0752a77d339f609b4d361787dc9ca93a5 + 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 - + https://github.com/microsoft/vstest - 68bd10d3aee862a9fbb0bac8b3d474bc323024f3 + a413f44a4cba32e6c428cdad33a1b7f7789e7648 @@ -146,14 +146,14 @@ c7d6f9fab845ffd943216da465022744e7d35f22 - + https://github.com/dotnet/msbuild - c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 + 233c037aa97b18982d34d26976e87c677bb013e8 - + https://github.com/nuget/nuget.client - 078701b97eeef2283c1f4605032b5bcf55a80653 + a998efecd431ec8a41536b5ac0152c16f1e2e646 diff --git a/eng/Versions.props b/eng/Versions.props index 132835bb7..be955ff74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21527.8 - 6.0.100-rtm.21527.8 + 6.0.200-preview.21565.34 + 6.0.200-preview.21565.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0 + 17.1.0-preview-20211115-01 diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch index 7d5d03116..7c19d6a40 100644 --- a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch +++ b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch @@ -51,7 +51,7 @@ index b1990aa..f6ddbbd 100644 3.3.2 + 5.0.0 - 4.0.0-6.21526.21 + 4.0.0-6.21515.3 diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs index c361f84..fd8015c 100644 diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch b/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch deleted file mode 100644 index d9a483852..000000000 --- a/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Tue, 19 Oct 2021 16:11:51 -0500 -Subject: [PATCH] Disable apphost on downlevel frameworks during source-build - -During source-build, disable apphost build for 'fsi' and 'fsc', and -'fsyacc', 'fslex', and 'AssemblyCheck' during the bootstrap build. - -Creating an apphost for a net5.0 project while building with a net6.0 -SDK downloads the apphost pack as a prebuilt. Stopping the projects from -creating the apphost removes the prebuilt for source-build. - -To make disabling the apphost work in the bootstrapping build, add a -check to eng/build.sh to skip the bootstrap build if we're currently -running the "outer" source-build. That gives source-build the ability to -run bootstrapping on its own terms. Now, when eng/SourceBuild.props runs -bootstrapping, it can pass the DotNetBuildFromSource property through -the environment so it takes effect. - -See: https://github.com/dotnet/fsharp/issues/12282 - -PR: https://github.com/dotnet/fsharp/pull/12286 ---- - eng/SourceBuild.props | 2 +- - eng/build.sh | 51 ++++++++++--------- - .../AssemblyCheck/AssemblyCheck.fsproj | 1 + - src/buildtools/fslex/fslex.fsproj | 1 + - src/buildtools/fsyacc/fsyacc.fsproj | 1 + - src/fsharp/fsc/fsc.fsproj | 1 + - src/fsharp/fsi/fsi.fsproj | 1 + - 7 files changed, 34 insertions(+), 24 deletions(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 22c929f28..903ee00d3 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -41,7 +41,7 @@ - -+ EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true" /> - - - -diff --git a/eng/build.sh b/eng/build.sh -index 9a2aa0083..6af422237 100755 ---- a/eng/build.sh -+++ b/eng/build.sh -@@ -240,29 +240,34 @@ function BuildSolution { - node_reuse=false - - # build bootstrap tools -- bootstrap_config=Proto -- bootstrap_dir=$artifacts_dir/Bootstrap -- if [[ "$force_bootstrap" == true ]]; then -- rm -fr $bootstrap_dir -- fi -- if [ ! -f "$bootstrap_dir/fslex.dll" ]; then -- BuildMessage="Error building tools" -- MSBuild "$repo_root/src/buildtools/buildtools.proj" \ -- /restore \ -- /p:Configuration=$bootstrap_config -- -- mkdir -p "$bootstrap_dir" -- cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex -- cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc -- fi -- if [ ! -f "$bootstrap_dir/fsc.exe" ]; then -- BuildMessage="Error building bootstrap" -- MSBuild "$repo_root/proto.proj" \ -- /restore \ -- /p:Configuration=$bootstrap_config \ -- -- -- cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc -+ # source_build=true means we are currently in the outer/wrapper source-build, -+ # and building bootstrap needs to wait. The source-build targets will run this -+ # script again without setting source_build=true when it is done setting up -+ # the build environment. See 'eng/SourceBuild.props'. -+ if [[ "$source_build" != true ]]; then -+ bootstrap_config=Proto -+ bootstrap_dir=$artifacts_dir/Bootstrap -+ if [[ "$force_bootstrap" == true ]]; then -+ rm -fr $bootstrap_dir -+ fi -+ if [ ! -f "$bootstrap_dir/fslex.dll" ]; then -+ BuildMessage="Error building tools" -+ MSBuild "$repo_root/src/buildtools/buildtools.proj" \ -+ /restore \ -+ /p:Configuration=$bootstrap_config -+ -+ mkdir -p "$bootstrap_dir" -+ cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex -+ cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc -+ fi -+ if [ ! -f "$bootstrap_dir/fsc.exe" ]; then -+ BuildMessage="Error building bootstrap" -+ MSBuild "$repo_root/proto.proj" \ -+ /restore \ -+ /p:Configuration=$bootstrap_config -+ -+ cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc -+ fi - fi - - if [[ "$skip_build" != true ]]; then -diff --git a/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj -index 464b6ef78..5c78bbe6d 100644 ---- a/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj -+++ b/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj -@@ -4,6 +4,7 @@ - Exe - net5.0 - true -+ false - - - -diff --git a/src/buildtools/fslex/fslex.fsproj b/src/buildtools/fslex/fslex.fsproj -index 1959ce59c..3d63bf6bf 100644 ---- a/src/buildtools/fslex/fslex.fsproj -+++ b/src/buildtools/fslex/fslex.fsproj -@@ -5,6 +5,7 @@ - net5.0 - INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) - true -+ false - - - -diff --git a/src/buildtools/fsyacc/fsyacc.fsproj b/src/buildtools/fsyacc/fsyacc.fsproj -index 5d1b7141f..63b63c5de 100644 ---- a/src/buildtools/fsyacc/fsyacc.fsproj -+++ b/src/buildtools/fsyacc/fsyacc.fsproj -@@ -5,6 +5,7 @@ - net5.0 - INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) - true -+ false - - - -diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj -index 7fa31fc21..04025c297 100644 ---- a/src/fsharp/fsc/fsc.fsproj -+++ b/src/fsharp/fsc/fsc.fsproj -@@ -12,6 +12,7 @@ - $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 - true - true -+ false - - - -diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj -index 9fd9b1333..eace6c166 100644 ---- a/src/fsharp/fsi/fsi.fsproj -+++ b/src/fsharp/fsi/fsi.fsproj -@@ -13,6 +13,7 @@ - fsi.res - true - true -+ false - - - diff --git a/src/SourceBuild/tarball/patches/msbuild/0001-Remove-prebuilt-jnm2.ReferenceAssemblies.net35.patch b/src/SourceBuild/tarball/patches/msbuild/0001-Remove-prebuilt-jnm2.ReferenceAssemblies.net35.patch deleted file mode 100644 index 93717db90..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0001-Remove-prebuilt-jnm2.ReferenceAssemblies.net35.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Mon, 11 Oct 2021 17:09:14 -0500 -Subject: [PATCH] Remove prebuilt jnm2.ReferenceAssemblies.net35 - -This prebuilt package filled a gap in the official 1.0 version of the .NET -Framework reference assembly packages. The gap has been fixed in later versions -of the official packages. Removal fixes a prebuilt dependency by letting the -repo use the official version of the packges, which are produced by SBRP. -https://github.com/dotnet/msbuild/issues/6935 ---- - src/StringTools/StringTools.csproj | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/StringTools/StringTools.csproj b/src/StringTools/StringTools.csproj -index fef9909..93a4634 100644 ---- a/src/StringTools/StringTools.csproj -+++ b/src/StringTools/StringTools.csproj -@@ -20,17 +20,12 @@ - - - Microsoft.NET.StringTools.net35 -- -- true - - - - - - -- -- -- - - - diff --git a/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch b/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch deleted file mode 100644 index b5b0a84f6..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Tue, 12 Oct 2021 18:14:59 -0500 -Subject: [PATCH] Disable BannedApiAnalyzers during source-build - -BannedApiAnalyzers has some intentional old dependencies and it's not feasible -to build it during source-build. Remove this usage to remove a prebuilt. -https://github.com/dotnet/msbuild/issues/6961 ---- - eng/Packages.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Packages.props b/eng/Packages.props -index 0f478634f..3cc09a008 100644 ---- a/eng/Packages.props -+++ b/eng/Packages.props -@@ -45,11 +45,11 @@ - - - -+ - - - - -- - - - diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index 6ca89df7d..80f65c174 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -16,12 +16,12 @@ Background Issue: https://github.com/dotnet/source-build/issues/2542 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/eng/Packages.props b/eng/Packages.props -index 2de607c5d..1668addc9 100644 +index 494c9c0..7689042 100644 --- a/eng/Packages.props +++ b/eng/Packages.props @@ -46,9 +46,6 @@ + - - - @@ -34,7 +34,7 @@ index d08e337c5..3b173aee5 100644 --- a/src/Build/Microsoft.Build.csproj +++ b/src/Build/Microsoft.Build.csproj @@ -38,8 +38,10 @@ - + - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch index 34d37ba0b..36ce5217c 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch @@ -69,7 +69,7 @@ index c11557248..0e7dd7861 100644 @@ -33,7 +34,7 @@ - + - diff --git a/src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch b/src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch deleted file mode 100644 index aa1e198cc..000000000 --- a/src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 752ab8ab199bd1d99353658cb676a6612508333b Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 8 Sep 2021 21:31:01 +0000 -Subject: [PATCH] Drop vstest.console netcoreapp2.1 support - -Workaround for https://github.com/microsoft/vstest/issues/3044 ---- - src/vstest.console/vstest.console.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj -index 1343e6d9..7c555591 100644 ---- a/src/vstest.console/vstest.console.csproj -+++ b/src/vstest.console/vstest.console.csproj -@@ -8,7 +8,7 @@ - - vstest.console - netcoreapp2.1;net451 -- netcoreapp2.1;net6.0 -+ net6.0 - true - Exe - false --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch b/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch deleted file mode 100644 index bd4c13409..000000000 --- a/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 071dfef93e5431a415bd9298f2ed8aaf9a22524f Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Mon, 11 Oct 2021 19:35:15 +0000 -Subject: [PATCH] Don't publish for win runtime identifier in source-build - -See https://github.com/microsoft/vstest/pull/3096 ---- - src/testhost.x86/testhost.x86.csproj | 2 +- - src/testhost/testhost.csproj | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj -index 7eb5cd15..09856522 100644 ---- a/src/testhost.x86/testhost.x86.csproj -+++ b/src/testhost.x86/testhost.x86.csproj -@@ -19,7 +19,7 @@ - app.manifest - - -- win7-x86 -+ win7-x86 - false - $(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86 - -diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj -index a780e4e9..ba0fd259 100644 ---- a/src/testhost/testhost.csproj -+++ b/src/testhost/testhost.csproj -@@ -16,7 +16,7 @@ - app.manifest - - -- win7-x64 -+ win7-x64 - false - $(AssemblyName).$(TargetFramework) - --- -2.31.1 - From 365be33db40fc736e2308c7e66781a16c80f3f39 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Nov 2021 01:23:21 +0000 Subject: [PATCH 014/178] Update dependencies from https://github.com/dotnet/sdk build 20211116.12 (#12688) [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 899992b3f..3d5e4b0fb 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 - af3b7d0f15282afee493e61c10b0bb170317de8d + b65a2ba4560e2703f24f9a27413e702f3c2af956 - + https://github.com/dotnet/sdk - af3b7d0f15282afee493e61c10b0bb170317de8d + b65a2ba4560e2703f24f9a27413e702f3c2af956 diff --git a/eng/Versions.props b/eng/Versions.props index be955ff74..1ca8df7c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21565.34 - 6.0.200-preview.21565.34 + 6.0.200-preview.21566.12 + 6.0.200-preview.21566.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b3e2d06a4ea6f2af29d7c2f276414704eb956e00 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Wed, 17 Nov 2021 14:09:53 -0800 Subject: [PATCH 015/178] Update Windows SDK projection --- eng/ManualVersions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 57ae4fd2d..953d16ee6 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,10 +9,10 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.21 - 10.0.18362.21 - 10.0.19041.21 - 10.0.20348.21 - 10.0.22000.21 + 10.0.17763.22 + 10.0.18362.22 + 10.0.19041.22 + 10.0.20348.22 + 10.0.22000.22 From ce56d32622b9811a21413d2c50156eb633c91784 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 17 Nov 2021 16:45:06 -0800 Subject: [PATCH 016/178] Exclude ASP.NET runtime packs from Android --- src/redist/targets/GenerateBundledVersions.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 89eddb755..676485110 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -370,6 +370,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" + RuntimePackExcludedRuntimeIdentifiers="android" /> Date: Thu, 18 Nov 2021 03:48:49 +0000 Subject: [PATCH 017/178] [release/6.0.2xx] Update dependencies from dotnet/sdk (#12689) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211115-01 to 17.1.0-preview-20211116-03 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.1.0-preview-21565-02 to 17.1.0-preview-21567-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d5e4b0fb..456608e04 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 - b65a2ba4560e2703f24f9a27413e702f3c2af956 + 49c0c89b19b334ee999ba43116db1ec3ed725732 - + https://github.com/dotnet/sdk - b65a2ba4560e2703f24f9a27413e702f3c2af956 + 49c0c89b19b334ee999ba43116db1ec3ed725732 @@ -130,9 +130,9 @@ 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 - + https://github.com/microsoft/vstest - a413f44a4cba32e6c428cdad33a1b7f7789e7648 + 011aeee4d491580dfe11477b89696829061a2d9c @@ -146,9 +146,9 @@ c7d6f9fab845ffd943216da465022744e7d35f22 - + https://github.com/dotnet/msbuild - 233c037aa97b18982d34d26976e87c677bb013e8 + 7434b575d12157ef98aeaad3b86c8f235f551c41 diff --git a/eng/Versions.props b/eng/Versions.props index 1ca8df7c7..0a9c98b8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21566.12 - 6.0.200-preview.21566.12 + 6.0.200-preview.21567.21 + 6.0.200-preview.21567.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211115-01 + 17.1.0-preview-20211116-03 From c3572a50e211746338d588eb1b52a1e125f451cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 00:13:35 +0000 Subject: [PATCH 018/178] Update dependencies from https://github.com/dotnet/sdk build 20211118.12 (#12712) [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 456608e04..62af050ee 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 - 49c0c89b19b334ee999ba43116db1ec3ed725732 + 287f35ebd0e934f8a1769dbe4ef648089e8430c8 - + https://github.com/dotnet/sdk - 49c0c89b19b334ee999ba43116db1ec3ed725732 + 287f35ebd0e934f8a1769dbe4ef648089e8430c8 diff --git a/eng/Versions.props b/eng/Versions.props index 0a9c98b8f..889865a1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21567.21 - 6.0.200-preview.21567.21 + 6.0.200-preview.21568.12 + 6.0.200-preview.21568.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bbc6079a4c6b2cee3b27080ef17d34dfacddb8da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 01:46:35 +0000 Subject: [PATCH 019/178] Update dependencies from https://github.com/dotnet/sdk build 20211118.17 (#12714) [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 62af050ee..6094e8a68 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 - 287f35ebd0e934f8a1769dbe4ef648089e8430c8 + 07a4696dba016ed0d06805f9ed8ad9c2537c7df5 - + https://github.com/dotnet/sdk - 287f35ebd0e934f8a1769dbe4ef648089e8430c8 + 07a4696dba016ed0d06805f9ed8ad9c2537c7df5 diff --git a/eng/Versions.props b/eng/Versions.props index 889865a1c..310913eef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21568.12 - 6.0.200-preview.21568.12 + 6.0.200-preview.21568.17 + 6.0.200-preview.21568.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 636ee9cff9e5f832dac3dfb5f2a9b92c00018ce7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 03:38:17 +0000 Subject: [PATCH 020/178] Update dependencies from https://github.com/dotnet/sdk build 20211118.19 (#12715) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211116-03 to 17.1.0-preview-20211117-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6094e8a68..16c5809e1 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 - 07a4696dba016ed0d06805f9ed8ad9c2537c7df5 + a780470224c8082961d12608542c32c848564fcf - + https://github.com/dotnet/sdk - 07a4696dba016ed0d06805f9ed8ad9c2537c7df5 + a780470224c8082961d12608542c32c848564fcf @@ -130,9 +130,9 @@ 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 - + https://github.com/microsoft/vstest - 011aeee4d491580dfe11477b89696829061a2d9c + a75faf902a1a5adeb6efbf8e392795c8f7e7f94c diff --git a/eng/Versions.props b/eng/Versions.props index 310913eef..f91639b76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21568.17 - 6.0.200-preview.21568.17 + 6.0.200-preview.21568.19 + 6.0.200-preview.21568.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211116-03 + 17.1.0-preview-20211117-01 From 0f7cff6396b5c4dcebd3970749789d2de343e4fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 07:14:44 +0000 Subject: [PATCH 021/178] Update dependencies from https://github.com/dotnet/sdk build 20211121.3 (#12720) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21523.2 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211117-01 to 17.1.0-preview-20211119-03 (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 16c5809e1..8fd1c83bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 7d941613047c847c87dc8d243a54fd1a45a47de7 + f1a2b70faf2ff4d95a82bc68433ee934e51b4cde - + https://github.com/dotnet/templating - 7d941613047c847c87dc8d243a54fd1a45a47de7 + f1a2b70faf2ff4d95a82bc68433ee934e51b4cde https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - a780470224c8082961d12608542c32c848564fcf + cfe580de7c4d4c78f3ad364bfe48a3411dd51326 - + https://github.com/dotnet/sdk - a780470224c8082961d12608542c32c848564fcf + cfe580de7c4d4c78f3ad364bfe48a3411dd51326 @@ -130,9 +130,9 @@ 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 - + https://github.com/microsoft/vstest - a75faf902a1a5adeb6efbf8e392795c8f7e7f94c + d9060f58f36e67fd65527c585a0a0fdaf56e954e diff --git a/eng/Versions.props b/eng/Versions.props index f91639b76..1f6088c03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100 + 6.0.200-alpha.1.21568.2 @@ -56,8 +56,8 @@ - 6.0.200-preview.21568.19 - 6.0.200-preview.21568.19 + 6.0.200-preview.21571.3 + 6.0.200-preview.21571.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211117-01 + 17.1.0-preview-20211119-03 From 93918d953f0b9cbd225f2385c0708d3f3ef37cf7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 20:07:54 +0000 Subject: [PATCH 022/178] Update dependencies from https://github.com/dotnet/sdk build 20211122.10 (#12721) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fd1c83bb..0edf85451 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - f1a2b70faf2ff4d95a82bc68433ee934e51b4cde + 3cdf2180028076da6f06f4da4b8767e33da92157 - + https://github.com/dotnet/templating - f1a2b70faf2ff4d95a82bc68433ee934e51b4cde + 3cdf2180028076da6f06f4da4b8767e33da92157 https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - cfe580de7c4d4c78f3ad364bfe48a3411dd51326 + aa3f5cfbb4897828544599893dcb1fefef4f74d0 - + https://github.com/dotnet/sdk - cfe580de7c4d4c78f3ad364bfe48a3411dd51326 + aa3f5cfbb4897828544599893dcb1fefef4f74d0 diff --git a/eng/Versions.props b/eng/Versions.props index 1f6088c03..06c630afa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-alpha.1.21568.2 + 6.0.200-alpha.1.21572.3 @@ -56,8 +56,8 @@ - 6.0.200-preview.21571.3 - 6.0.200-preview.21571.3 + 6.0.200-preview.21572.10 + 6.0.200-preview.21572.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0b0e761068f634647dc2d122cf0478660b978004 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:05:13 +0000 Subject: [PATCH 023/178] Update dependencies from https://github.com/dotnet/sdk build 20211123.1 (#12723) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.1-beta.21565.6 to 12.0.1-beta.21572.8 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21565.6 to 6.0.2-beta.21572.8 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0edf85451..357748a4b 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 - aa3f5cfbb4897828544599893dcb1fefef4f74d0 + b2ad8b7ad25ce266dc7ace1a08e4e4a5d3e3ff2c - + https://github.com/dotnet/sdk - aa3f5cfbb4897828544599893dcb1fefef4f74d0 + b2ad8b7ad25ce266dc7ace1a08e4e4a5d3e3ff2c @@ -121,13 +121,13 @@ https://github.com/dotnet/wpf 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 + 44e285721013feeedfa140298ea9f172a0c6fd70 - + https://github.com/dotnet/fsharp - 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 + 44e285721013feeedfa140298ea9f172a0c6fd70 diff --git a/eng/Versions.props b/eng/Versions.props index 06c630afa..46e02f8b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21572.10 - 6.0.200-preview.21572.10 + 6.0.200-preview.21573.1 + 6.0.200-preview.21573.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 79f2c912848c4677b55f2328e199e9662aefe129 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:56:03 +0000 Subject: [PATCH 024/178] Update dependencies from https://github.com/dotnet/sdk build 20211123.2 (#12724) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211119-03 to 17.1.0-preview-20211122-02 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.1.0-preview-21567-01 to 17.1.0-preview-21572-15 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 357748a4b..74a8c330a 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 - b2ad8b7ad25ce266dc7ace1a08e4e4a5d3e3ff2c + 448f9bdeb40789a50405eb4249db0ccd1a764b04 - + https://github.com/dotnet/sdk - b2ad8b7ad25ce266dc7ace1a08e4e4a5d3e3ff2c + 448f9bdeb40789a50405eb4249db0ccd1a764b04 @@ -130,9 +130,9 @@ 44e285721013feeedfa140298ea9f172a0c6fd70 - + https://github.com/microsoft/vstest - d9060f58f36e67fd65527c585a0a0fdaf56e954e + 253c1efaa0adfcbc9b4b31de736d5fe2cbf27582 @@ -146,9 +146,9 @@ c7d6f9fab845ffd943216da465022744e7d35f22 - + https://github.com/dotnet/msbuild - 7434b575d12157ef98aeaad3b86c8f235f551c41 + 513f59ce49ffd8adc333dabf70501ad68630348d diff --git a/eng/Versions.props b/eng/Versions.props index 46e02f8b4..eb6240de7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21573.1 - 6.0.200-preview.21573.1 + 6.0.200-preview.21573.2 + 6.0.200-preview.21573.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211119-03 + 17.1.0-preview-20211122-02 From a2bb0dde82022f7308b0204539c534e731e2f486 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 17:57:30 +0000 Subject: [PATCH 025/178] Update dependencies from https://github.com/dotnet/sdk build 20211123.4 (#12726) [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 74a8c330a..c857dc480 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 - 448f9bdeb40789a50405eb4249db0ccd1a764b04 + 6d13c6babe527bcfbaca00f340581a1b1a72087c - + https://github.com/dotnet/sdk - 448f9bdeb40789a50405eb4249db0ccd1a764b04 + 6d13c6babe527bcfbaca00f340581a1b1a72087c diff --git a/eng/Versions.props b/eng/Versions.props index eb6240de7..b1f55cf0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21573.2 - 6.0.200-preview.21573.2 + 6.0.200-preview.21573.4 + 6.0.200-preview.21573.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2ee0e6d76e7f886c62b2a5594d7b8400855c703c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 29 Nov 2021 08:43:14 -0600 Subject: [PATCH 026/178] source-build patches needed to get 6.0.2xx building (#12718) * source-build patches needed to get 6.0.2xx building * Patch to address msbuild prebuilts * Remove conflicting backported patch * Additional patches * Additional vstest patch * Workaround dev-cert issue in smoke-tests --- src/SourceBuild/tarball/content/smoke-test.sh | 5 +- ...2-Update-system-command-line-version.patch | 164 ++++++++++++++++++ ...tem.Threading.Tasks.DataFlow-version.patch | 28 +++ ...oject-target-frameworks-for-source-b.patch | 41 +++++ 4 files changed, 236 insertions(+), 2 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch create mode 100644 src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index fc034fecc..b3815b840 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -6,7 +6,7 @@ TARBALL_PREFIX=dotnet-sdk- VERSION_PREFIX=6.0 # See https://github.com/dotnet/source-build/issues/579, this version # needs to be compatible with the runtime produced from source-build -DEV_CERTS_VERSION_DEFAULT=6.0.0-preview.6.21355.2 +DEV_CERTS_VERSION_DEFAULT=6.0.0-rtm.21573.1 __ROOT_REPO=$(sed 's/\r$//' "$SCRIPT_ROOT/artifacts/obj/rootrepo.txt") # remove CR if mounted repo on Windows drive executingUserHome=${HOME:-} @@ -49,7 +49,8 @@ configuration="Release" excludeNonWebTests=false excludeWebTests=false excludeWebNoHttpsTests=false -excludeWebHttpsTests=false +# Re-enable once https://github.com/dotnet/sdk/issues/22734 is fixed. +excludeWebHttpsTests=true excludeLocalTests=false excludeOnlineTests=false devCertsVersion="$DEV_CERTS_VERSION_DEFAULT" diff --git a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch new file mode 100644 index 000000000..4d5554a71 --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch @@ -0,0 +1,164 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Fri, 19 Nov 2021 13:50:52 -0600 +Subject: [PATCH] Update system-command-line version + +Backported with https://github.com/dotnet/format/pull/1436 +--- + eng/Version.Details.xml | 8 ++++---- + eng/Versions.props | 4 ++-- + src/Commands/FormatAnalyzersCommand.cs | 4 ++-- + src/Commands/FormatCommandCommon.cs | 12 ++++++------ + src/Commands/FormatStyleCommand.cs | 4 ++-- + src/Commands/RootFormatCommand.cs | 4 ++-- + 6 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index 48b181b..68c0b43 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -5,13 +5,13 @@ + https://github.com/dotnet/roslyn + 95b7a0198f8c805b367f17e4639020ec21c16705 + +- ++ + https://github.com/dotnet/command-line-api +- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 ++ 09a24a79ef01a0c70655919ee3c59bb54a8574df + +- ++ + https://github.com/dotnet/command-line-api +- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 ++ 09a24a79ef01a0c70655919ee3c59bb54a8574df + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 2758207..6a02917 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -18,8 +18,8 @@ + + 4.0.0-6.21515.3 + +- 2.0.0-beta1.21473.1 +- 0.3.0-alpha.21473.1 ++ 2.0.0-beta1.21525.1 ++ 0.3.0-alpha.21525.1 + + @@ -130,9 +130,9 @@ 44e285721013feeedfa140298ea9f172a0c6fd70 - + https://github.com/microsoft/vstest - 253c1efaa0adfcbc9b4b31de736d5fe2cbf27582 + 7f3499467c833d54d1e100d33d2ee54455112bd2 @@ -141,19 +141,19 @@ linker - + https://github.com/dotnet/roslyn - c7d6f9fab845ffd943216da465022744e7d35f22 + 1073bc6ce7a0eb08968656e10042970d2f7b3b1d - + https://github.com/dotnet/msbuild - 513f59ce49ffd8adc333dabf70501ad68630348d + 23940013c60c33c183e52547ce6ca535b6689d4c - + https://github.com/nuget/nuget.client - a998efecd431ec8a41536b5ac0152c16f1e2e646 + c14b85a00c03933c708c7d38fefeda9898a21488 diff --git a/eng/Versions.props b/eng/Versions.props index b1f55cf0c..54c72d104 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21573.4 - 6.0.200-preview.21573.4 + 6.0.200-preview.21601.7 + 6.0.200-preview.21601.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211122-02 + 17.1.0-preview-20211130-04 diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index 80f65c174..b82c812ab 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -7,28 +7,13 @@ Removes prebuilts. Background Issue: https://github.com/dotnet/source-build/issues/2542 --- - eng/Packages.props | 3 --- src/Build/Microsoft.Build.csproj | 4 +++- src/Directory.BeforeCommon.targets | 2 +- src/Samples/Directory.Build.props | 1 + src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++- src/Utilities/Microsoft.Build.Utilities.csproj | 2 +- - 6 files changed, 9 insertions(+), 7 deletions(-) + 5 files changed, 9 insertions(+), 4 deletions(-) -diff --git a/eng/Packages.props b/eng/Packages.props -index 494c9c0..7689042 100644 ---- a/eng/Packages.props -+++ b/eng/Packages.props -@@ -46,9 +46,6 @@ - - - -- -- -- - - - diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj index d08e337c5..3b173aee5 100644 --- a/src/Build/Microsoft.Build.csproj diff --git a/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch b/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch deleted file mode 100644 index 8e3884438..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1a415d2019d74bcf009134326d1c25798589de64 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Tue, 19 Oct 2021 11:39:32 -0500 -Subject: [PATCH] Apply arcade-powered source-build patches (#55823) - -Don't include desktop artifacts that don't exist in source-build. -Source-build doesn't have these artifacts available, even when we eventually will -build desktop TFMs, because Roslyn is one of the first builds in source-build. -Instead Roslyn is picking up reference packages that don't have the `lib` directory -which is causing a build failure. This disables the attempt to grab these desktop -artifacts so source-build just skips them instead. - -Backported to roslyn with https://github.com/dotnet/roslyn/pull/55823 ---- - .../DesktopCompilerArtifacts.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets -index c8b87ab6958..107ff051b51 100644 ---- a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets -+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets -@@ -20,7 +20,7 @@ - VS training data to the assemblies they produce. - --> - -- -+ - - - --- -2.31.1 - diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch index f94119820..0afe8be53 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch @@ -22,7 +22,7 @@ index 3970bb4e9ea..e96beb550d2 100644 @@ -6,6 +6,7 @@ Exe CSharpInteractive - netcoreapp3.1;net472 + net6.0;net472 + false @@ -34,7 +34,7 @@ index 5bbdf7f03a7..5f732d71534 100644 @@ -6,6 +6,7 @@ Exe Sub Main - netcoreapp3.1;net472 + net6.0;net472 + false From b6a61fcd0d0a4a4acbe90e546be67cc53799088d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 6 Dec 2021 17:17:53 -0600 Subject: [PATCH 031/178] source-build changes to support release/6.0.2xx (#12750) * Update dotnet version used by source-build * Additional source-build patches * Bring in msbuild patch for committed changes that haven't flown --- src/SourceBuild/tarball/content/global.json | 2 +- .../0007-WebHost-delegate-nullability.patch | 43 +++++++++++++++++++ ...y-on-MS.VS.Setup.Configuration.Inter.patch | 31 ++++++++++++- ...PublicApiAnalyzers-in-sourcebuild-71.patch | 26 +++++++++++ 4 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch create mode 100644 src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 0007b6c6e..39f48573d 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100" + "dotnet": "6.0.200-preview.21603.2" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch new file mode 100644 index 000000000..426502e86 --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch @@ -0,0 +1,43 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Mon, 6 Dec 2021 18:39:25 +0000 +Subject: [PATCH] WebHost delegate nullability + +Addresses the following errors: + + src/Hosting/Hosting/src/Internal/WebHost.cs(83,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func' (possibly because of nullability attributes). + src/Hosting/Hosting/src/Internal/WebHost.cs(86,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func' (possibly because of nullability attributes). + src/Hosting/Hosting/src/Internal/WebHost.cs(88,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func' (possibly because of nullability attributes). + +Cherry-pick of WebHost only changes made under https://github.com/dotnet/aspnetcore/commit/13a460820e90c8f3e90eb4fdbbb3de671389bf0c#diff-6ef451f2ae3e04d73dde362bdf9de6b101aef95e3a4f5190e5c96967d683aef9 +--- + src/Hosting/Hosting/src/Internal/WebHost.cs | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/src/Hosting/Hosting/src/Internal/WebHost.cs b/src/Hosting/Hosting/src/Internal/WebHost.cs +index ca52bd1f40..643d03e8af 100644 +--- a/src/Hosting/Hosting/src/Internal/WebHost.cs ++++ b/src/Hosting/Hosting/src/Internal/WebHost.cs +@@ -79,16 +79,14 @@ namespace Microsoft.AspNetCore.Hosting + _hostingServiceProvider = hostingServiceProvider; + _applicationServiceCollection.AddSingleton(); + // There's no way to to register multiple service types per definition. See https://github.com/aspnet/DependencyInjection/issues/360 +-#pragma warning disable CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint. +- _applicationServiceCollection.AddSingleton(services +- => services.GetService() as IHostApplicationLifetime); ++ _applicationServiceCollection.AddSingleton(services ++ => services.GetService()!); + #pragma warning disable CS0618 // Type or member is obsolete +- _applicationServiceCollection.AddSingleton(services +- => services.GetService() as AspNetCore.Hosting.IApplicationLifetime); +- _applicationServiceCollection.AddSingleton(services +- => services.GetService() as Extensions.Hosting.IApplicationLifetime); ++ _applicationServiceCollection.AddSingleton(services ++ => services.GetService()!); ++ _applicationServiceCollection.AddSingleton(services ++ => services.GetService()!); + #pragma warning restore CS0618 // Type or member is obsolete +-#pragma warning restore CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint. + _applicationServiceCollection.AddSingleton(); + } + diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index b82c812ab..1c6710555 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -7,13 +7,29 @@ Removes prebuilts. Background Issue: https://github.com/dotnet/source-build/issues/2542 --- + eng/dependabot/Packages.props | 3 --- src/Build/Microsoft.Build.csproj | 4 +++- src/Directory.BeforeCommon.targets | 2 +- + src/Framework/Microsoft.Build.Framework.csproj | 2 +- src/Samples/Directory.Build.props | 1 + src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++- src/Utilities/Microsoft.Build.Utilities.csproj | 2 +- - 5 files changed, 9 insertions(+), 4 deletions(-) + 7 files changed, 10 insertions(+), 8 deletions(-) +diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props +index a1f21de26..ff74d6e7f 100644 +--- a/eng/dependabot/Packages.props ++++ b/eng/dependabot/Packages.props +@@ -22,9 +22,6 @@ + + + +- +- +- + + + diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj index d08e337c5..3b173aee5 100644 --- a/src/Build/Microsoft.Build.csproj @@ -43,6 +59,19 @@ index 913c97b12..320bffa56 100644 $(DefineConstants);FEATURE_MSCOREE +diff --git a/src/Framework/Microsoft.Build.Framework.csproj b/src/Framework/Microsoft.Build.Framework.csproj +index df7556447..c7edff611 100644 +--- a/src/Framework/Microsoft.Build.Framework.csproj ++++ b/src/Framework/Microsoft.Build.Framework.csproj +@@ -31,7 +31,7 @@ + + + +- ++ + + + diff --git a/src/Samples/Directory.Build.props b/src/Samples/Directory.Build.props index 6b9d6cd9f..317ef14a6 100644 --- a/src/Samples/Directory.Build.props diff --git a/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch b/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch new file mode 100644 index 000000000..a0133a35f --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Rainer Sigwald +Date: Fri, 3 Dec 2021 14:24:03 -0600 +Subject: [PATCH] Don't reference PublicApiAnalyzers in sourcebuild (#7118) + +This package is only super relevant at PR-build time so it should +be fine to drop it from source-build scenarios. Fixes #7115. + +Patch created from https://github.com/dotnet/msbuild/pull/7118 +--- + src/Directory.Build.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets +index 2a840bfd7..bff6cc905 100644 +--- a/src/Directory.Build.targets ++++ b/src/Directory.Build.targets +@@ -85,7 +85,7 @@ + + + +- ++ + + + From d1d94727f546bb23dba80fc6e19ac8632388ab4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 23:21:16 +0000 Subject: [PATCH 032/178] Update dependencies from https://github.com/dotnet/sdk build 20211206.5 (#12749) [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 fa0fcb268..47a49d499 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 - 69a5d503ce8a54af2a58fc37c0adf3d3794f0801 + 31172387ab7b4bffff0291e42757d56a4750b90d - + https://github.com/dotnet/sdk - 69a5d503ce8a54af2a58fc37c0adf3d3794f0801 + 31172387ab7b4bffff0291e42757d56a4750b90d diff --git a/eng/Versions.props b/eng/Versions.props index 54c72d104..05a50313b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21601.7 - 6.0.200-preview.21601.7 + 6.0.200-preview.21606.5 + 6.0.200-preview.21606.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 438991aeba710f86640bd695e44cf894301a65f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 01:46:04 +0000 Subject: [PATCH 033/178] Update dependencies from https://github.com/dotnet/sdk build 20211206.10 (#12752) [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 47a49d499..9934f87a1 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 - 31172387ab7b4bffff0291e42757d56a4750b90d + 5381a5ba97dbea698e271e0cc4852a094a78672d - + https://github.com/dotnet/sdk - 31172387ab7b4bffff0291e42757d56a4750b90d + 5381a5ba97dbea698e271e0cc4852a094a78672d diff --git a/eng/Versions.props b/eng/Versions.props index 05a50313b..1f41437c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21606.5 - 6.0.200-preview.21606.5 + 6.0.200-preview.21606.10 + 6.0.200-preview.21606.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b10c4644eaf0a101d7e74161f3e2d60e70bffb04 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 6 Dec 2021 20:50:23 -0600 Subject: [PATCH 034/178] Re-enable web https smoke tests (#12739) --- src/SourceBuild/tarball/content/smoke-test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index f39c285b4..f32e4fa3b 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -49,8 +49,7 @@ configuration="Release" excludeNonWebTests=false excludeWebTests=false excludeWebNoHttpsTests=false -# Re-enable once https://github.com/dotnet/sdk/issues/22734 is fixed. -excludeWebHttpsTests=true +excludeWebHttpsTests=false excludeLocalTests=false excludeOnlineTests=false devCertsVersion="$DEV_CERTS_VERSION_DEFAULT" From c56d85f7de09f796b000ef5a0c2f82e14296995e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 06:48:30 +0000 Subject: [PATCH 035/178] Update dependencies from https://github.com/dotnet/sdk build 20211206.13 (#12753) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.1-beta.21572.8 to 12.0.1-beta.21606.4 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21572.8 to 6.0.2-beta.21606.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9934f87a1..a72311e30 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 - 5381a5ba97dbea698e271e0cc4852a094a78672d + b943ebcc5c7a8c693688b1234f7f7f089210c91d - + https://github.com/dotnet/sdk - 5381a5ba97dbea698e271e0cc4852a094a78672d + b943ebcc5c7a8c693688b1234f7f7f089210c91d @@ -121,13 +121,13 @@ https://github.com/dotnet/wpf 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 44e285721013feeedfa140298ea9f172a0c6fd70 + 770a64e596a066ea068ac1e00f2824a06ba9ba8e - + https://github.com/dotnet/fsharp - 44e285721013feeedfa140298ea9f172a0c6fd70 + 770a64e596a066ea068ac1e00f2824a06ba9ba8e diff --git a/eng/Versions.props b/eng/Versions.props index 1f41437c6..ea5a46cc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21606.10 - 6.0.200-preview.21606.10 + 6.0.200-preview.21606.13 + 6.0.200-preview.21606.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 567091840a4a5b74473debcc7d5d14a33d1edc20 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 14:35:36 +0000 Subject: [PATCH 036/178] Update dependencies from https://github.com/dotnet/sdk build 20211207.2 (#12755) [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 a72311e30..fce0214d0 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 - b943ebcc5c7a8c693688b1234f7f7f089210c91d + 213c586f6f93d8698db1ac43abde854991e95d28 - + https://github.com/dotnet/sdk - b943ebcc5c7a8c693688b1234f7f7f089210c91d + 213c586f6f93d8698db1ac43abde854991e95d28 diff --git a/eng/Versions.props b/eng/Versions.props index ea5a46cc6..c2c8dd95d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21606.13 - 6.0.200-preview.21606.13 + 6.0.200-preview.21607.2 + 6.0.200-preview.21607.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26f2b4eb6c2cd3a3c229dbd7589ff6fc924cd681 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 16:06:45 +0000 Subject: [PATCH 037/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211111.1 (#12756) [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 fce0214d0..5d68bea6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - fc184172bf8144f7c91a7bc0226b7d90c5821576 + 897a9709eb370a92bce2391d77b03d06149cbb6c From 6d5146068a318a55828d41413d68d19b48e42eb9 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:03:27 +0000 Subject: [PATCH 038/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.3 (#12767) [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 5d68bea6c..61235a858 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - 897a9709eb370a92bce2391d77b03d06149cbb6c + 8e0f29bef4764af0fecece781ba606e4c61b352f From b0cb972aeb4c539edf2ddcbb5b3fe0f1ef0133b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Dec 2021 02:24:22 +0000 Subject: [PATCH 039/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.8 (#12769) [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 61235a858..c0f487fc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - 8e0f29bef4764af0fecece781ba606e4c61b352f + 67a6ec56185bfec2a52e211b25335849bdb630af From 38a612150c53bbadffce67143067cabeab6e2f9c 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:00:56 +0000 Subject: [PATCH 040/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211208.1 (#12772) [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 c0f487fc3..49d9fe91d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - 67a6ec56185bfec2a52e211b25335849bdb630af + d18b3749457151f76d5f9fc4a1318d9be3bbfbff From d3ff42d64f3f8199c283c68ae5fbbf62296b0f3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 07:17:36 -0800 Subject: [PATCH 041/178] [release/6.0.2xx] Update dependencies from dotnet/sdk (#12757) * Update dependencies from https://github.com/dotnet/sdk build 20211207.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.3 Dependency coherency updates Microsoft.Build From Version 17.1.0-preview-21579-05 -> To Version 17.1.0-preview-21607-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211207.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.5 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 17.1.0-preview-20211130-04 -> To Version 17.1.0-preview-20211203-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211207.32 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.32 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 17.1.0-preview-20211130-04 -> To Version 17.1.0-preview-20211203-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211207.34 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.34 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211208.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21608.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211208.7 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21608.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk * Resolve source-build patch conflicts * Update dependencies from https://github.com/dotnet/sdk build 20211209.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21609.3 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211209.16 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21609.16 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211210.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.2 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211210.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.3 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk * Disable tarball build in PR validation * Update dependencies from https://github.com/dotnet/sdk build 20211210.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.4 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 40 +++++++++---------- eng/Versions.props | 8 ++-- .../job/source-build-run-tarball-build.yml | 10 +++-- .../0001-Fix-MicrosoftExtensionsVersion.patch | 2 +- ...2-Update-system-command-line-version.patch | 4 +- ...y-on-MS.VS.Setup.Configuration.Inter.patch | 4 +- ...PublicApiAnalyzers-in-sourcebuild-71.patch | 26 ------------ 7 files changed, 35 insertions(+), 59 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49d9fe91d..ecd08b399 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 3cdf2180028076da6f06f4da4b8767e33da92157 + 7c35333b66a97deaa23c519889de11069cf22504 - + https://github.com/dotnet/templating - 3cdf2180028076da6f06f4da4b8767e33da92157 + 7c35333b66a97deaa23c519889de11069cf22504 https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 213c586f6f93d8698db1ac43abde854991e95d28 + ded89e318e54c0eb08ffa58db96482c1db6bff87 - + https://github.com/dotnet/sdk - 213c586f6f93d8698db1ac43abde854991e95d28 + ded89e318e54c0eb08ffa58db96482c1db6bff87 @@ -121,18 +121,18 @@ https://github.com/dotnet/wpf 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 770a64e596a066ea068ac1e00f2824a06ba9ba8e + 81a4ff1db24cf67d52a543da99b7abf7e73276f6 - + https://github.com/dotnet/fsharp - 770a64e596a066ea068ac1e00f2824a06ba9ba8e + 81a4ff1db24cf67d52a543da99b7abf7e73276f6 - + https://github.com/microsoft/vstest - 7f3499467c833d54d1e100d33d2ee54455112bd2 + 61da6f27702b8330c99da8fa9f5c82722971cd73 @@ -141,19 +141,19 @@ linker - + https://github.com/dotnet/roslyn - 1073bc6ce7a0eb08968656e10042970d2f7b3b1d + 818313426323d979747781a17c78860c833776da - + https://github.com/dotnet/msbuild - 23940013c60c33c183e52547ce6ca535b6689d4c + 96a618ca59610908eddc92bfd0198746c34f0ed5 - + https://github.com/nuget/nuget.client - c14b85a00c03933c708c7d38fefeda9898a21488 + 9187a50daec29061772a2057490697c6c0e4c354 diff --git a/eng/Versions.props b/eng/Versions.props index c2c8dd95d..28a619f3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-alpha.1.21572.3 + 6.0.200-alpha.1.21609.2 @@ -56,8 +56,8 @@ - 6.0.200-preview.21607.2 - 6.0.200-preview.21607.2 + 6.0.200-preview.21610.4 + 6.0.200-preview.21610.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211130-04 + 17.2.0-preview-20211209-03 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..11259ab58 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 @@ -37,10 +37,12 @@ jobs: _BuildArch: x64 _Container: ${{ parameters.fedora33Container }} _RunOnline: true - Fedora33-Offline: - _BuildArch: x64 - _Container: ${{ parameters.fedora33Container }} - _RunOnline: false + # Offline builds have prebuilts: https://github.com/dotnet/fsharp/issues/12499 + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + Fedora33-Offline: + _BuildArch: x64 + _Container: ${{ parameters.fedora33Container }} + _RunOnline: false timeoutInMinutes: 240 workspace: clean: all diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch index 7c19d6a40..7d5d03116 100644 --- a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch +++ b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch @@ -51,7 +51,7 @@ index b1990aa..f6ddbbd 100644 3.3.2 + 5.0.0 - 4.0.0-6.21515.3 + 4.0.0-6.21526.21 diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs index c361f84..fd8015c 100644 diff --git a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch index 4d5554a71..68917950e 100644 --- a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch +++ b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch @@ -19,7 +19,7 @@ index 48b181b..68c0b43 100644 +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/roslyn - 95b7a0198f8c805b367f17e4639020ec21c16705 + c7d6f9fab845ffd943216da465022744e7d35f22 - + @@ -41,7 +41,7 @@ index 2758207..6a02917 100644 +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 4.0.0-6.21515.3 + 4.0.0-6.21526.21 - 2.0.0-beta1.21473.1 - 0.3.0-alpha.21473.1 diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index 1c6710555..9a55fed1b 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -23,11 +23,11 @@ index a1f21de26..ff74d6e7f 100644 @@ -22,9 +22,6 @@ - + - - - - + diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj diff --git a/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch b/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch deleted file mode 100644 index a0133a35f..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Rainer Sigwald -Date: Fri, 3 Dec 2021 14:24:03 -0600 -Subject: [PATCH] Don't reference PublicApiAnalyzers in sourcebuild (#7118) - -This package is only super relevant at PR-build time so it should -be fine to drop it from source-build scenarios. Fixes #7115. - -Patch created from https://github.com/dotnet/msbuild/pull/7118 ---- - src/Directory.Build.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets -index 2a840bfd7..bff6cc905 100644 ---- a/src/Directory.Build.targets -+++ b/src/Directory.Build.targets -@@ -85,7 +85,7 @@ - - - -- -+ - - - From 948cabe984382b53e75e58c0c249345ba9694cfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 18:59:46 +0000 Subject: [PATCH 042/178] Update dependencies from https://github.com/dotnet/sdk build 20211210.7 (#12788) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.1-beta.21608.2 to 12.0.1-beta.21610.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21608.2 to 6.0.2-beta.21610.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecd08b399..8565b8b75 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 - ded89e318e54c0eb08ffa58db96482c1db6bff87 + 4dfc89293465357eaf757e5e4cd461680a3ceaed - + https://github.com/dotnet/sdk - ded89e318e54c0eb08ffa58db96482c1db6bff87 + 4dfc89293465357eaf757e5e4cd461680a3ceaed @@ -121,13 +121,13 @@ https://github.com/dotnet/wpf 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 81a4ff1db24cf67d52a543da99b7abf7e73276f6 + c12acdbfa5f76f811888d824bce5a87f7f68fdb8 - + https://github.com/dotnet/fsharp - 81a4ff1db24cf67d52a543da99b7abf7e73276f6 + c12acdbfa5f76f811888d824bce5a87f7f68fdb8 diff --git a/eng/Versions.props b/eng/Versions.props index 28a619f3b..436e8cfa6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.4 - 6.0.200-preview.21610.4 + 6.0.200-preview.21610.7 + 6.0.200-preview.21610.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 70187fdee018dd4a04d6ff644d2ec1f81f6da7b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 20:06:34 +0000 Subject: [PATCH 043/178] Update dependencies from https://github.com/dotnet/sdk build 20211210.9 (#12792) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20211209-03 to 17.2.0-preview-20211210-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8565b8b75..68a7a36fa 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 - 4dfc89293465357eaf757e5e4cd461680a3ceaed + d268cbed4a4eb3ab84a76bd796ac2a5bd59e451f - + https://github.com/dotnet/sdk - 4dfc89293465357eaf757e5e4cd461680a3ceaed + d268cbed4a4eb3ab84a76bd796ac2a5bd59e451f @@ -130,9 +130,9 @@ c12acdbfa5f76f811888d824bce5a87f7f68fdb8 - + https://github.com/microsoft/vstest - 61da6f27702b8330c99da8fa9f5c82722971cd73 + a809880e02d8a9986e3ba1daeeeb5078fbb96be5 diff --git a/eng/Versions.props b/eng/Versions.props index 436e8cfa6..cac842119 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.7 - 6.0.200-preview.21610.7 + 6.0.200-preview.21610.9 + 6.0.200-preview.21610.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211209-03 + 17.2.0-preview-20211210-01 From 19990a7cb8d1d8ef6d0b46cfed9fbea9adca2a96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 22:50:18 +0000 Subject: [PATCH 044/178] Update dependencies from https://github.com/dotnet/sdk build 20211210.11 (#12797) [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 68a7a36fa..cbdda471f 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 - d268cbed4a4eb3ab84a76bd796ac2a5bd59e451f + eecd0b51081c8e43197b8f0cc592ad5e1674b26d - + https://github.com/dotnet/sdk - d268cbed4a4eb3ab84a76bd796ac2a5bd59e451f + eecd0b51081c8e43197b8f0cc592ad5e1674b26d diff --git a/eng/Versions.props b/eng/Versions.props index cac842119..366068870 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.9 - 6.0.200-preview.21610.9 + 6.0.200-preview.21610.11 + 6.0.200-preview.21610.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9471f49b4a5ae5cc214317eb76abef3c1fdaf98c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Dec 2021 00:11:30 +0000 Subject: [PATCH 045/178] Update dependencies from https://github.com/dotnet/sdk build 20211210.13 (#12799) [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 cbdda471f..749cd1c63 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 - eecd0b51081c8e43197b8f0cc592ad5e1674b26d + 420dc32f3477673ebf192050e0944d423e58b92a - + https://github.com/dotnet/sdk - eecd0b51081c8e43197b8f0cc592ad5e1674b26d + 420dc32f3477673ebf192050e0944d423e58b92a diff --git a/eng/Versions.props b/eng/Versions.props index 366068870..68bf285d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.11 - 6.0.200-preview.21610.11 + 6.0.200-preview.21610.13 + 6.0.200-preview.21610.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 74d83b52e6f44094a92c91f036fa481d5b14d932 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 05:02:12 +0000 Subject: [PATCH 046/178] Update dependencies from https://github.com/dotnet/sdk build 20211212.4 (#12803) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-alpha.1.21609.2 to 6.0.200-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.200-alpha.1.21609.2 to 6.0.200-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 749cd1c63..667a5aac0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,11 +90,11 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating 7c35333b66a97deaa23c519889de11069cf22504 - + https://github.com/dotnet/templating 7c35333b66a97deaa23c519889de11069cf22504 @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 420dc32f3477673ebf192050e0944d423e58b92a + 4a935da067ee66f3d9bf5bdcda8dd3952e342ebb - + https://github.com/dotnet/sdk - 420dc32f3477673ebf192050e0944d423e58b92a + 4a935da067ee66f3d9bf5bdcda8dd3952e342ebb diff --git a/eng/Versions.props b/eng/Versions.props index 68bf285d1..18a9b2510 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-alpha.1.21609.2 + 6.0.200-alpha.1.21609.4 @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.13 - 6.0.200-preview.21610.13 + 6.0.200-preview.21612.4 + 6.0.200-preview.21612.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d8c9c22117ca2db1d42f0d2c367450c818202a06 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:20:28 +0000 Subject: [PATCH 047/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211213.1 (#12811) [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 667a5aac0..a87dbe481 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - d18b3749457151f76d5f9fc4a1318d9be3bbfbff + e025965a8e463030d890739043b6e64b41a5de84 From 2e29acc142418464086b64f81bf61cf745fc93a8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 10 Dec 2021 10:10:05 -0800 Subject: [PATCH 048/178] Fix the logic that generates the fallback text file --- src/redist/targets/GenerateLayout.targets | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 3917efa60..a26cad868 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -463,9 +463,13 @@ + - + + + + From f2abec4abdbed5758a01797dee75ad4306eaa32c 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:34:03 +0000 Subject: [PATCH 049/178] Update dependencies from https://github.com/dotnet/arcade build 20211209.4 (#12834) [release/6.0.2xx] 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 a87dbe481..11e95235a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - ad9890056979bc704773746d927dfdfa5bec7227 + 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/arcade - ad9890056979bc704773746d927dfdfa5bec7227 + 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/arcade - ad9890056979bc704773746d927dfdfa5bec7227 + 7421b55f46aff8373764016d942b23cbf87c75cb https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 18a9b2510..6658d273c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21562.1 + 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 e6d26905e..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.21562.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21562.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21609.4", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21609.4" } } From 0ce201ed68d1fa0b397531084d12ccf6bc82b91f 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:04:25 +0000 Subject: [PATCH 050/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.1 (#12841) [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 11e95235a..e96c241f3 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 6dc017e0d982deaed7fa4bdf3ba749eaa3aa207a Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 14 Dec 2021 14:32:13 -0800 Subject: [PATCH 051/178] Update asp.net template versions (#12765) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6658d273c..4f5399580 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 360e2cff8664aff90e6f070b6a456d1898421887 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 23:51:54 +0000 Subject: [PATCH 052/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.3 (#12844) [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 e96c241f3..44ae65f6c 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 2dc0c5a0c9e30b861916e288676dc81d09ec9454 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 20:42:26 +0000 Subject: [PATCH 053/178] 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 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 054/178] 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 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 055/178] [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 056/178] 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 057/178] 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 058/178] 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 059/178] 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 060/178] 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 061/178] 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 062/178] 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 063/178] 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 064/178] 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 065/178] 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 066/178] 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 5a7eef4a1b1cb163bcbb8cc8272733cc39bcafc5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jan 2022 02:51:02 +0000 Subject: [PATCH 067/178] Update dependencies from https://github.com/dotnet/sdk build 20220105.25 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22055.25 --- 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 0d13c6409..2de83afc0 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 - 6ca80ba4d8c6f3087176440622bbdb90e78d3708 + 98364b5e1003e68b649657336684930190a5d4bb - + https://github.com/dotnet/sdk - 6ca80ba4d8c6f3087176440622bbdb90e78d3708 + 98364b5e1003e68b649657336684930190a5d4bb diff --git a/eng/Versions.props b/eng/Versions.props index 287138a80..98ae9ef2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22055.23 - 6.0.200-preview.22055.23 + 6.0.200-preview.22055.25 + 6.0.200-preview.22055.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1848d3b1fa6dee36d1f9acf13a4a28ce5e3da995 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jan 2022 04:32:22 +0000 Subject: [PATCH 068/178] Update dependencies from https://github.com/dotnet/sdk build 20220105.27 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22055.27 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.1.0-3.22054.26 -> To Version 4.1.0-3.22055.10 (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 2de83afc0..716d473b5 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 - 98364b5e1003e68b649657336684930190a5d4bb + 3ef0672b5f1979b0018b95511a98c23f37be6ac8 - + https://github.com/dotnet/sdk - 98364b5e1003e68b649657336684930190a5d4bb + 3ef0672b5f1979b0018b95511a98c23f37be6ac8 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - f206c5d203c5562f814d3afa3c9e695250391c76 + 52e8f58f035d81186858cceafe7595d3e241778b diff --git a/eng/Versions.props b/eng/Versions.props index 98ae9ef2e..fcc819e46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22055.25 - 6.0.200-preview.22055.25 + 6.0.200-preview.22055.27 + 6.0.200-preview.22055.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f107e8e9611b632eb73cd9045f5e731dfbb79506 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jan 2022 08:34:54 +0000 Subject: [PATCH 069/178] Update dependencies from https://github.com/dotnet/sdk build 20220105.28 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22055.28 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.1.0-3.22054.26 -> To Version 4.1.0-3.22055.16 (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 716d473b5..9a713d167 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 - 3ef0672b5f1979b0018b95511a98c23f37be6ac8 + 627de326592c80aa8e4009d139bdf2b65b307c64 - + https://github.com/dotnet/sdk - 3ef0672b5f1979b0018b95511a98c23f37be6ac8 + 627de326592c80aa8e4009d139bdf2b65b307c64 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 52e8f58f035d81186858cceafe7595d3e241778b + 154c5d69b25dd18492685d440aa6f6d8c7b2aa97 diff --git a/eng/Versions.props b/eng/Versions.props index fcc819e46..010c4b155 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22055.27 - 6.0.200-preview.22055.27 + 6.0.200-preview.22055.28 + 6.0.200-preview.22055.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 557fa0dc0de9995ae616e530eb7f8ceb29a012d4 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Thu, 6 Jan 2022 17:06:09 +0000 Subject: [PATCH 070/178] Remove source-build format repo patches that were backported --- .../0001-Fix-MicrosoftExtensionsVersion.patch | 68 -------- ...2-Update-system-command-line-version.patch | 164 ------------------ 2 files changed, 232 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch delete mode 100644 src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch deleted file mode 100644 index 7d5d03116..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Fri, 22 Oct 2021 13:26:33 -0500 -Subject: [PATCH] Fix MicrosoftExtensionsVersion - -Move it to eng/Versions.props to make it overridable, and rename it to match an -actual package ID. - -Update paramater nullability in src/Logging/SimpleConsoleLogger.cs to be -source-compatible with the 6.0 version of these packages. - -See https://github.com/dotnet/format/issues/1400 ---- - Directory.Packages.props | 7 +++---- - eng/Versions.props | 1 + - src/Logging/SimpleConsoleLogger.cs | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 6b628c2..9b579ea 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -2,7 +2,6 @@ - - - -- 5.0.0 - - 6.0.0-preview.4.221 - -@@ -25,9 +24,9 @@ - - - -- -- -- -+ -+ -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index b1990aa..f6ddbbd 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -15,6 +15,7 @@ - - 16.11.0 - 3.3.2 -+ 5.0.0 - - 4.0.0-6.21526.21 - -diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs -index c361f84..fd8015c 100644 ---- a/src/Logging/SimpleConsoleLogger.cs -+++ b/src/Logging/SimpleConsoleLogger.cs -@@ -37,7 +37,7 @@ namespace Microsoft.CodeAnalysis.Tools.Logging - _minimalErrorLevel = minimalErrorLevel; - } - -- public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) -+ public void Log(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func formatter) - { - if (!IsEnabled(logLevel)) - { diff --git a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch deleted file mode 100644 index 68917950e..000000000 --- a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Fri, 19 Nov 2021 13:50:52 -0600 -Subject: [PATCH] Update system-command-line version - -Backported with https://github.com/dotnet/format/pull/1436 ---- - eng/Version.Details.xml | 8 ++++---- - eng/Versions.props | 4 ++-- - src/Commands/FormatAnalyzersCommand.cs | 4 ++-- - src/Commands/FormatCommandCommon.cs | 12 ++++++------ - src/Commands/FormatStyleCommand.cs | 4 ++-- - src/Commands/RootFormatCommand.cs | 4 ++-- - 6 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index 48b181b..68c0b43 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -5,13 +5,13 @@ - https://github.com/dotnet/roslyn - c7d6f9fab845ffd943216da465022744e7d35f22 - -- -+ - https://github.com/dotnet/command-line-api -- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 -+ 09a24a79ef01a0c70655919ee3c59bb54a8574df - -- -+ - https://github.com/dotnet/command-line-api -- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 -+ 09a24a79ef01a0c70655919ee3c59bb54a8574df - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 2758207..6a02917 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -18,8 +18,8 @@ - - 4.0.0-6.21526.21 - -- 2.0.0-beta1.21473.1 -- 0.3.0-alpha.21473.1 -+ 2.0.0-beta1.21525.1 -+ 0.3.0-alpha.21525.1 - - @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f + 030073995f5e50bb48ba81606d2cbc3e9f651d36 - + https://github.com/dotnet/fsharp - f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f + 030073995f5e50bb48ba81606d2cbc3e9f651d36 @@ -135,9 +135,9 @@ a809880e02d8a9986e3ba1daeeeb5078fbb96be5 - + https://github.com/dotnet/linker - d0662ed8db919642177ddfd06a1c33895a69015f + 4e27b8551ff51bf0d46cc1ab7181ee2d37a91025 linker diff --git a/eng/Versions.props b/eng/Versions.props index 010c4b155..9ac0eab91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22055.28 - 6.0.200-preview.22055.28 + 6.0.200-preview.22056.5 + 6.0.200-preview.22056.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15f52ef2c6f06908bd98e769f2fb16124d64203c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jan 2022 23:00:38 +0000 Subject: [PATCH 072/178] Update dependencies from https://github.com/dotnet/sdk build 20220106.6 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22056.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22056.2 (parent: Microsoft.NET.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 eb49b9ebf..ab00d8cd6 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 - 4421d3bf0f5e0c85cb301129c61ac79885f22392 + c7af9ecfd8b261aea835c2589a3f8d762fc5a700 - + https://github.com/dotnet/sdk - 4421d3bf0f5e0c85cb301129c61ac79885f22392 + c7af9ecfd8b261aea835c2589a3f8d762fc5a700 diff --git a/eng/Versions.props b/eng/Versions.props index 9ac0eab91..36399b08e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22056.5 - 6.0.200-preview.22056.5 + 6.0.200-preview.22056.6 + 6.0.200-preview.22056.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f383bdde0626fe6429c8e4e5e852dfc48dc26a4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jan 2022 23:40:00 +0000 Subject: [PATCH 073/178] Update dependencies from https://github.com/dotnet/sdk build 20220106.7 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22056.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22056.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 ab00d8cd6..0710d3154 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 - c7af9ecfd8b261aea835c2589a3f8d762fc5a700 + 209020d9cfde2bd78fc6e228532a67bf624be2b1 - + https://github.com/dotnet/sdk - c7af9ecfd8b261aea835c2589a3f8d762fc5a700 + 209020d9cfde2bd78fc6e228532a67bf624be2b1 @@ -151,9 +151,9 @@ 797fd829a374a880f63fd4eea4ea6990404c48f4 - + https://github.com/nuget/nuget.client - 9187a50daec29061772a2057490697c6c0e4c354 + 0a2795fb4ae20042ff55a1da21f71ae1d7f116ba diff --git a/eng/Versions.props b/eng/Versions.props index 36399b08e..2fb3d2587 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22056.6 - 6.0.200-preview.22056.6 + 6.0.200-preview.22056.7 + 6.0.200-preview.22056.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d3d4f64e610eec60a27a1d10ec15555a5b32bf7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jan 2022 22:37:20 +0000 Subject: [PATCH 074/178] Update dependencies from https://github.com/dotnet/sdk build 20220107.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22057.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22056.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 0710d3154..bd68d62b2 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 - 209020d9cfde2bd78fc6e228532a67bf624be2b1 + f238dbd202788c761a070172363716d1d89ea947 - + https://github.com/dotnet/sdk - 209020d9cfde2bd78fc6e228532a67bf624be2b1 + f238dbd202788c761a070172363716d1d89ea947 @@ -146,9 +146,9 @@ 154c5d69b25dd18492685d440aa6f6d8c7b2aa97 - + https://github.com/dotnet/msbuild - 797fd829a374a880f63fd4eea4ea6990404c48f4 + 64edb33a278d1334bd6efc35fecd23bd3af4ed48 diff --git a/eng/Versions.props b/eng/Versions.props index 2fb3d2587..2c80a1ae5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22056.7 - 6.0.200-preview.22056.7 + 6.0.200-preview.22057.3 + 6.0.200-preview.22057.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eccc4f0d6b865c65c08dba12727e2652fd1d18eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jan 2022 23:40:21 +0000 Subject: [PATCH 075/178] Update dependencies from https://github.com/dotnet/sdk build 20220107.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22057.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22056.2 (parent: Microsoft.NET.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 bd68d62b2..531dcee08 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 - f238dbd202788c761a070172363716d1d89ea947 + 46b38206e7081d9661b4ddaf03547783d10596b2 - + https://github.com/dotnet/sdk - f238dbd202788c761a070172363716d1d89ea947 + 46b38206e7081d9661b4ddaf03547783d10596b2 diff --git a/eng/Versions.props b/eng/Versions.props index 2c80a1ae5..d7e2df79a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22057.3 - 6.0.200-preview.22057.3 + 6.0.200-preview.22057.4 + 6.0.200-preview.22057.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5acebb1e9f056ad07c1e45eab016dcf097251ae5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jan 2022 00:50:06 +0000 Subject: [PATCH 076/178] Update dependencies from https://github.com/dotnet/sdk build 20220107.7 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22057.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22056.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 531dcee08..c2ac91249 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 - 46b38206e7081d9661b4ddaf03547783d10596b2 + b0db59e3a967343b26056a9f1f3e347614f4bbb1 - + https://github.com/dotnet/sdk - 46b38206e7081d9661b4ddaf03547783d10596b2 + b0db59e3a967343b26056a9f1f3e347614f4bbb1 @@ -135,9 +135,9 @@ a809880e02d8a9986e3ba1daeeeb5078fbb96be5 - + https://github.com/dotnet/linker - 4e27b8551ff51bf0d46cc1ab7181ee2d37a91025 + 5b33e3ad8f422d002ffe84700a0e51b976391f2b linker diff --git a/eng/Versions.props b/eng/Versions.props index d7e2df79a..a6fe4be7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22057.4 - 6.0.200-preview.22057.4 + 6.0.200-preview.22057.7 + 6.0.200-preview.22057.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From efecac883fe7eac4ebc827a65d7a848c4847bf84 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jan 2022 01:16:04 +0000 Subject: [PATCH 077/178] Update dependencies from https://github.com/dotnet/sdk build 20220107.9 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22057.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22056.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 c2ac91249..bdc86eeb3 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 - b0db59e3a967343b26056a9f1f3e347614f4bbb1 + 6b2e676f37168ea2670d68dcd77961aa44c85e3f - + https://github.com/dotnet/sdk - b0db59e3a967343b26056a9f1f3e347614f4bbb1 + 6b2e676f37168ea2670d68dcd77961aa44c85e3f @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 154c5d69b25dd18492685d440aa6f6d8c7b2aa97 + 887ccf1bdf27a24813b62fdf8fc9bb73f0f08cac diff --git a/eng/Versions.props b/eng/Versions.props index a6fe4be7c..ddf76bc39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22057.7 - 6.0.200-preview.22057.7 + 6.0.200-preview.22057.9 + 6.0.200-preview.22057.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1db91bc6d0d6024d5f805a15a997c2dcad5b85b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jan 2022 01:51:09 +0000 Subject: [PATCH 078/178] Update dependencies from https://github.com/dotnet/sdk build 20220107.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22057.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22056.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 bdc86eeb3..b906e0092 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 - 6b2e676f37168ea2670d68dcd77961aa44c85e3f + b2933954877fca54c72720804a43e277f131b767 - + https://github.com/dotnet/sdk - 6b2e676f37168ea2670d68dcd77961aa44c85e3f + b2933954877fca54c72720804a43e277f131b767 @@ -146,9 +146,9 @@ 887ccf1bdf27a24813b62fdf8fc9bb73f0f08cac - + https://github.com/dotnet/msbuild - 64edb33a278d1334bd6efc35fecd23bd3af4ed48 + cc0492cd0039b7dead4eac8244b8d638bd4e2cb5 diff --git a/eng/Versions.props b/eng/Versions.props index ddf76bc39..f07353d50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22057.9 - 6.0.200-preview.22057.9 + 6.0.200-preview.22057.11 + 6.0.200-preview.22057.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9c73608101775c35fd837fe27f05579d98758aa6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jan 2022 02:59:33 +0000 Subject: [PATCH 079/178] Update dependencies from https://github.com/dotnet/sdk build 20220107.15 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22057.15 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22056.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 b906e0092..dd4a579d8 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 - b2933954877fca54c72720804a43e277f131b767 + 9d9dea4ad85457dda06929121bc6656f0dd8dd04 - + https://github.com/dotnet/sdk - b2933954877fca54c72720804a43e277f131b767 + 9d9dea4ad85457dda06929121bc6656f0dd8dd04 @@ -146,9 +146,9 @@ 887ccf1bdf27a24813b62fdf8fc9bb73f0f08cac - + https://github.com/dotnet/msbuild - cc0492cd0039b7dead4eac8244b8d638bd4e2cb5 + 7852153acab419ef11b98a3868bb9751130f40b9 diff --git a/eng/Versions.props b/eng/Versions.props index f07353d50..60afb2f92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22057.11 - 6.0.200-preview.22057.11 + 6.0.200-preview.22057.15 + 6.0.200-preview.22057.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6bd4a66446f73e16731b723ea219cf58f8dd51af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jan 2022 06:22:19 +0000 Subject: [PATCH 080/178] Update dependencies from https://github.com/dotnet/sdk build 20220107.18 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22057.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22056.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 dd4a579d8..ef9768b67 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 - 9d9dea4ad85457dda06929121bc6656f0dd8dd04 + 2b74247dbe6fd346c35ab7ac3c4782b5707ec298 - + https://github.com/dotnet/sdk - 9d9dea4ad85457dda06929121bc6656f0dd8dd04 + 2b74247dbe6fd346c35ab7ac3c4782b5707ec298 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 887ccf1bdf27a24813b62fdf8fc9bb73f0f08cac + a07da6871b3b7f53611b0f95530561286dd1e529 diff --git a/eng/Versions.props b/eng/Versions.props index 60afb2f92..262c27510 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22057.15 - 6.0.200-preview.22057.15 + 6.0.200-preview.22057.18 + 6.0.200-preview.22057.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1a5bf37437a47064d5a175e73d32c779bf448c18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jan 2022 06:56:15 +0000 Subject: [PATCH 081/178] Update dependencies from https://github.com/dotnet/sdk build 20220107.19 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22057.19 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22057.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef9768b67..88a111350 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 - 2b74247dbe6fd346c35ab7ac3c4782b5707ec298 + 0094100090ff659268d46570a81d810f95b5c38a - + https://github.com/dotnet/sdk - 2b74247dbe6fd346c35ab7ac3c4782b5707ec298 + 0094100090ff659268d46570a81d810f95b5c38a @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 030073995f5e50bb48ba81606d2cbc3e9f651d36 + 7200973937f45e4e270b27634b0550d2954668d3 - + https://github.com/dotnet/fsharp - 030073995f5e50bb48ba81606d2cbc3e9f651d36 + 7200973937f45e4e270b27634b0550d2954668d3 diff --git a/eng/Versions.props b/eng/Versions.props index 262c27510..e6395c46e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22057.18 - 6.0.200-preview.22057.18 + 6.0.200-preview.22057.19 + 6.0.200-preview.22057.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2ce908597d62cbfa71cbaa8dd685b31ce47c6285 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 10 Jan 2022 14:59:27 +0000 Subject: [PATCH 082/178] Remove linker source-build patches that were backported. --- .../0001-fix-tlens-Mono.Cecil-reference.patch | 24 ------------------- ...t.DotNet.ApiCompat-from-source-build.patch | 24 ------------------- ...t.NETFramework.ReferenceAssemblies-f.patch | 23 ------------------ 3 files changed, 71 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch delete mode 100644 src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch diff --git a/src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch b/src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch deleted file mode 100644 index 319028d25..000000000 --- a/src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell <36081148+lbussell@users.noreply.github.com> -Date: Wed, 13 Oct 2021 18:26:09 +0000 -Subject: [PATCH] fix tlens Mono.Cecil reference - -Pull request for applying the patch: https://github.com/dotnet/linker/pull/2317 ---- - src/tlens/tlens.csproj | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/tlens/tlens.csproj b/src/tlens/tlens.csproj -index 92b3754..e17f9fb 100644 ---- a/src/tlens/tlens.csproj -+++ b/src/tlens/tlens.csproj -@@ -10,7 +10,8 @@ - - - -- -+ -+ - - - diff --git a/src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch b/src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch deleted file mode 100644 index 48bf63e70..000000000 --- a/src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 20 Oct 2021 14:44:36 +0000 -Subject: [PATCH] Exclude Microsoft.DotNet.ApiCompat from source-build - -Backport PR: https://github.com/dotnet/linker/pull/2326 ---- - eng/Tools.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Tools.props b/eng/Tools.props -index 494d208..7c32ad5 100644 ---- a/eng/Tools.props -+++ b/eng/Tools.props -@@ -2,7 +2,7 @@ - - - -- -+ - - - -\ No newline at end of file diff --git a/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch b/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch deleted file mode 100644 index 8458c20e5..000000000 --- a/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 20 Oct 2021 14:38:14 +0000 -Subject: [PATCH 1/2] Upgrade Microsoft.NETFramework.ReferenceAssemblies from - 1.0.0 to 1.0.2 - -Backport PR: https://github.com/dotnet/linker/pull/2326 ---- - src/ILLink.Tasks/ILLink.Tasks.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj -index 0ecf5d1..7501ecb 100644 ---- a/src/ILLink.Tasks/ILLink.Tasks.csproj -+++ b/src/ILLink.Tasks/ILLink.Tasks.csproj -@@ -53,6 +53,6 @@ - - - -- -+ - - From 4b416931154059ad38a5a6e080978191f9dae8aa Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 10 Jan 2022 15:07:03 +0000 Subject: [PATCH 083/178] Resolve msbuild source-build patch conflict --- ...Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index 9a55fed1b..546419625 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -21,9 +21,9 @@ index a1f21de26..ff74d6e7f 100644 --- a/eng/dependabot/Packages.props +++ b/eng/dependabot/Packages.props @@ -22,9 +22,6 @@ - - + + - - - From fbfe33b3f03ba7013e676ccc15d375cd4d6680d2 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 10 Jan 2022 19:53:27 +0000 Subject: [PATCH 084/178] Revert "Remove linker source-build patches that were backported." This reverts commit 2ce908597d62cbfa71cbaa8dd685b31ce47c6285. --- .../0001-fix-tlens-Mono.Cecil-reference.patch | 24 +++++++++++++++++++ ...t.DotNet.ApiCompat-from-source-build.patch | 24 +++++++++++++++++++ ...t.NETFramework.ReferenceAssemblies-f.patch | 23 ++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch create mode 100644 src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch create mode 100644 src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch diff --git a/src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch b/src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch new file mode 100644 index 000000000..319028d25 --- /dev/null +++ b/src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell <36081148+lbussell@users.noreply.github.com> +Date: Wed, 13 Oct 2021 18:26:09 +0000 +Subject: [PATCH] fix tlens Mono.Cecil reference + +Pull request for applying the patch: https://github.com/dotnet/linker/pull/2317 +--- + src/tlens/tlens.csproj | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/tlens/tlens.csproj b/src/tlens/tlens.csproj +index 92b3754..e17f9fb 100644 +--- a/src/tlens/tlens.csproj ++++ b/src/tlens/tlens.csproj +@@ -10,7 +10,8 @@ + + + +- ++ ++ + + + diff --git a/src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch b/src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch new file mode 100644 index 000000000..48bf63e70 --- /dev/null +++ b/src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Wed, 20 Oct 2021 14:44:36 +0000 +Subject: [PATCH] Exclude Microsoft.DotNet.ApiCompat from source-build + +Backport PR: https://github.com/dotnet/linker/pull/2326 +--- + eng/Tools.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Tools.props b/eng/Tools.props +index 494d208..7c32ad5 100644 +--- a/eng/Tools.props ++++ b/eng/Tools.props +@@ -2,7 +2,7 @@ + + + +- ++ + + + +\ No newline at end of file diff --git a/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch b/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch new file mode 100644 index 000000000..8458c20e5 --- /dev/null +++ b/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Wed, 20 Oct 2021 14:38:14 +0000 +Subject: [PATCH 1/2] Upgrade Microsoft.NETFramework.ReferenceAssemblies from + 1.0.0 to 1.0.2 + +Backport PR: https://github.com/dotnet/linker/pull/2326 +--- + src/ILLink.Tasks/ILLink.Tasks.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj +index 0ecf5d1..7501ecb 100644 +--- a/src/ILLink.Tasks/ILLink.Tasks.csproj ++++ b/src/ILLink.Tasks/ILLink.Tasks.csproj +@@ -53,6 +53,6 @@ + + + +- ++ + + From f529bef51cae4ccc66fe5b8504419fd67756ae24 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jan 2022 20:12:23 +0000 Subject: [PATCH 085/178] Update dependencies from https://github.com/dotnet/sdk build 20220110.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22060.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22057.4 (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 88a111350..78b6014f2 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 - 0094100090ff659268d46570a81d810f95b5c38a + 2d09f4556ae008ed5059ceaaa769093a3e4d588c - + https://github.com/dotnet/sdk - 0094100090ff659268d46570a81d810f95b5c38a + 2d09f4556ae008ed5059ceaaa769093a3e4d588c @@ -135,9 +135,9 @@ a809880e02d8a9986e3ba1daeeeb5078fbb96be5 - + https://github.com/dotnet/linker - 5b33e3ad8f422d002ffe84700a0e51b976391f2b + 67e3d793b82c46e62e767cf0ead3294f9689430f linker diff --git a/eng/Versions.props b/eng/Versions.props index e6395c46e..e6a4cd581 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22057.19 - 6.0.200-preview.22057.19 + 6.0.200-preview.22060.5 + 6.0.200-preview.22060.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4247b77d77edffb3c8c1706380ac0f5bbca5de88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jan 2022 22:19:55 +0000 Subject: [PATCH 086/178] Update dependencies from https://github.com/dotnet/sdk build 20220110.7 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22060.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22057.4 (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 78b6014f2..19e04757a 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 - 2d09f4556ae008ed5059ceaaa769093a3e4d588c + 81110f38cbb2630fcd9f4c7805f8e85c701d4865 - + https://github.com/dotnet/sdk - 2d09f4556ae008ed5059ceaaa769093a3e4d588c + 81110f38cbb2630fcd9f4c7805f8e85c701d4865 @@ -146,9 +146,9 @@ a07da6871b3b7f53611b0f95530561286dd1e529 - + https://github.com/dotnet/msbuild - 7852153acab419ef11b98a3868bb9751130f40b9 + 14efa06d736aabb3af01ff827fff9426518f5fac diff --git a/eng/Versions.props b/eng/Versions.props index e6a4cd581..757b63288 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22060.5 - 6.0.200-preview.22060.5 + 6.0.200-preview.22060.7 + 6.0.200-preview.22060.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6c7a73bd2293ac353ae29232b080e476c06f389d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jan 2022 23:29:53 +0000 Subject: [PATCH 087/178] Update dependencies from https://github.com/dotnet/sdk build 20220110.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22060.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22057.4 (parent: Microsoft.NET.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 19e04757a..983d3b5e1 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 - 81110f38cbb2630fcd9f4c7805f8e85c701d4865 + 3d9e8e8c5492754ccc0a56498e1b5bfc16581922 - + https://github.com/dotnet/sdk - 81110f38cbb2630fcd9f4c7805f8e85c701d4865 + 3d9e8e8c5492754ccc0a56498e1b5bfc16581922 diff --git a/eng/Versions.props b/eng/Versions.props index 757b63288..f328f5961 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22060.7 - 6.0.200-preview.22060.7 + 6.0.200-preview.22060.8 + 6.0.200-preview.22060.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c0b4eb3de09aa8d2cd9bae5e3741ada4e28dfadc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jan 2022 00:23:55 +0000 Subject: [PATCH 088/178] Update dependencies from https://github.com/dotnet/sdk build 20220110.9 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22060.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22057.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 983d3b5e1..7bcb718c7 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 - 3d9e8e8c5492754ccc0a56498e1b5bfc16581922 + f5408722b88a3b6b24045cb3de4c1365ddd27cc1 - + https://github.com/dotnet/sdk - 3d9e8e8c5492754ccc0a56498e1b5bfc16581922 + f5408722b88a3b6b24045cb3de4c1365ddd27cc1 @@ -141,7 +141,7 @@ linker - + https://github.com/dotnet/roslyn a07da6871b3b7f53611b0f95530561286dd1e529 diff --git a/eng/Versions.props b/eng/Versions.props index f328f5961..bdf2edb9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22060.8 - 6.0.200-preview.22060.8 + 6.0.200-preview.22060.9 + 6.0.200-preview.22060.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8a5895e0c20374f5c749da7202f93a5d78bd815c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jan 2022 01:33:10 +0000 Subject: [PATCH 089/178] Update dependencies from https://github.com/dotnet/sdk build 20220110.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22060.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22057.4 (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 7bcb718c7..6056176c0 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 - f5408722b88a3b6b24045cb3de4c1365ddd27cc1 + 1a041ea1269199484d63c03b4e42fb83f352e2df - + https://github.com/dotnet/sdk - f5408722b88a3b6b24045cb3de4c1365ddd27cc1 + 1a041ea1269199484d63c03b4e42fb83f352e2df @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - a07da6871b3b7f53611b0f95530561286dd1e529 + bb9955c3b723f59de7fcc3aba4c75ca0048126b6 diff --git a/eng/Versions.props b/eng/Versions.props index bdf2edb9e..54fd98971 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22060.9 - 6.0.200-preview.22060.9 + 6.0.200-preview.22060.11 + 6.0.200-preview.22060.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 80ac8705574b585109526d2e919df81ccaab9e62 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 11 Jan 2022 14:25:47 +0000 Subject: [PATCH 090/178] Remove linker source-build patches that were backported --- .../0001-fix-tlens-Mono.Cecil-reference.patch | 24 ------------------- ...t.DotNet.ApiCompat-from-source-build.patch | 24 ------------------- ...t.NETFramework.ReferenceAssemblies-f.patch | 23 ------------------ 3 files changed, 71 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch delete mode 100644 src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch diff --git a/src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch b/src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch deleted file mode 100644 index 319028d25..000000000 --- a/src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell <36081148+lbussell@users.noreply.github.com> -Date: Wed, 13 Oct 2021 18:26:09 +0000 -Subject: [PATCH] fix tlens Mono.Cecil reference - -Pull request for applying the patch: https://github.com/dotnet/linker/pull/2317 ---- - src/tlens/tlens.csproj | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/tlens/tlens.csproj b/src/tlens/tlens.csproj -index 92b3754..e17f9fb 100644 ---- a/src/tlens/tlens.csproj -+++ b/src/tlens/tlens.csproj -@@ -10,7 +10,8 @@ - - - -- -+ -+ - - - diff --git a/src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch b/src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch deleted file mode 100644 index 48bf63e70..000000000 --- a/src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 20 Oct 2021 14:44:36 +0000 -Subject: [PATCH] Exclude Microsoft.DotNet.ApiCompat from source-build - -Backport PR: https://github.com/dotnet/linker/pull/2326 ---- - eng/Tools.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Tools.props b/eng/Tools.props -index 494d208..7c32ad5 100644 ---- a/eng/Tools.props -+++ b/eng/Tools.props -@@ -2,7 +2,7 @@ - - - -- -+ - - - -\ No newline at end of file diff --git a/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch b/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch deleted file mode 100644 index 8458c20e5..000000000 --- a/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 20 Oct 2021 14:38:14 +0000 -Subject: [PATCH 1/2] Upgrade Microsoft.NETFramework.ReferenceAssemblies from - 1.0.0 to 1.0.2 - -Backport PR: https://github.com/dotnet/linker/pull/2326 ---- - src/ILLink.Tasks/ILLink.Tasks.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj -index 0ecf5d1..7501ecb 100644 ---- a/src/ILLink.Tasks/ILLink.Tasks.csproj -+++ b/src/ILLink.Tasks/ILLink.Tasks.csproj -@@ -53,6 +53,6 @@ - - - -- -+ - - 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 091/178] 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 51ef0cf99a476a8b434df193f9183fe9d233adba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jan 2022 05:27:41 +0000 Subject: [PATCH 092/178] Update dependencies from https://github.com/dotnet/sdk build 20220111.9 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22061.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22057.4 (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 6056176c0..32cadbf8d 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 - 1a041ea1269199484d63c03b4e42fb83f352e2df + eef6359f98c8e69fa7b0049a35e4b1f3d3f64fd8 - + https://github.com/dotnet/sdk - 1a041ea1269199484d63c03b4e42fb83f352e2df + eef6359f98c8e69fa7b0049a35e4b1f3d3f64fd8 @@ -146,9 +146,9 @@ bb9955c3b723f59de7fcc3aba4c75ca0048126b6 - + https://github.com/dotnet/msbuild - 14efa06d736aabb3af01ff827fff9426518f5fac + 7f9429d09bdd4109e5e1e9aa8a87ce692887a874 diff --git a/eng/Versions.props b/eng/Versions.props index 54fd98971..06b72d77c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22060.11 - 6.0.200-preview.22060.11 + 6.0.200-preview.22061.9 + 6.0.200-preview.22061.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1fb3e2b88694f1e1cf7882061848d8b3748df3eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jan 2022 10:25:44 +0000 Subject: [PATCH 093/178] Update dependencies from https://github.com/dotnet/sdk build 20220112.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22062.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22057.4 (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 32cadbf8d..ceeea99d6 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 - eef6359f98c8e69fa7b0049a35e4b1f3d3f64fd8 + 8fc326b6c9979e29244847212472fc459257cc6c - + https://github.com/dotnet/sdk - eef6359f98c8e69fa7b0049a35e4b1f3d3f64fd8 + 8fc326b6c9979e29244847212472fc459257cc6c @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - bb9955c3b723f59de7fcc3aba4c75ca0048126b6 + 3ba71c01793973bbbdd30ff5fffa037fbfbe76ec diff --git a/eng/Versions.props b/eng/Versions.props index 06b72d77c..5bbde494f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22061.9 - 6.0.200-preview.22061.9 + 6.0.200-preview.22062.3 + 6.0.200-preview.22062.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c335a5270f99b21bfab87e879da61daa85d191f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jan 2022 15:31:53 +0000 Subject: [PATCH 094/178] Update dependencies from https://github.com/dotnet/sdk build 20220112.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22062.5 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.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 ceeea99d6..29e3af3cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 55fa299ca45a3c19e8970e6afba34951e368525a + 8ce0a1aaf91a59c97239cf486006d3142a030efd - + https://github.com/dotnet/templating - 55fa299ca45a3c19e8970e6afba34951e368525a + 8ce0a1aaf91a59c97239cf486006d3142a030efd - + https://github.com/dotnet/templating - 55fa299ca45a3c19e8970e6afba34951e368525a + 8ce0a1aaf91a59c97239cf486006d3142a030efd - + https://github.com/dotnet/sdk - 8fc326b6c9979e29244847212472fc459257cc6c + 0f849fa7b9e8d2dbd5a72b086577d46256bbd0ac - + https://github.com/dotnet/sdk - 8fc326b6c9979e29244847212472fc459257cc6c + 0f849fa7b9e8d2dbd5a72b086577d46256bbd0ac diff --git a/eng/Versions.props b/eng/Versions.props index 5bbde494f..cbd29185a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-preview.21623.5 + 6.0.200-preview.22062.1 @@ -56,8 +56,8 @@ - 6.0.200-preview.22062.3 - 6.0.200-preview.22062.3 + 6.0.200-preview.22062.5 + 6.0.200-preview.22062.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.200-preview.21623.5 + 6.0.200-preview.22062.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 658b50e68c38ad32506e558423882a93e6095066 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jan 2022 20:40:03 +0000 Subject: [PATCH 095/178] Update dependencies from https://github.com/dotnet/sdk build 20220112.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22062.11 --- 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 29e3af3cb..4eb743cc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ce0a1aaf91a59c97239cf486006d3142a030efd - + https://github.com/dotnet/sdk - 0f849fa7b9e8d2dbd5a72b086577d46256bbd0ac + 51ed18658c50a38240de33c3dd3c80aee29682a7 - + https://github.com/dotnet/sdk - 0f849fa7b9e8d2dbd5a72b086577d46256bbd0ac + 51ed18658c50a38240de33c3dd3c80aee29682a7 diff --git a/eng/Versions.props b/eng/Versions.props index cbd29185a..e8079f25b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22062.5 - 6.0.200-preview.22062.5 + 6.0.200-preview.22062.11 + 6.0.200-preview.22062.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e17fabc5ba4e648d3e8fb57a6919e55a79a269e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jan 2022 20:40:16 +0000 Subject: [PATCH 096/178] Update dependencies from https://github.com/dotnet/sdk build 20220112.14 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22062.11 -> To Version 6.0.200-preview.22062.14 --- 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 4eb743cc3..35cc802a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ce0a1aaf91a59c97239cf486006d3142a030efd - + https://github.com/dotnet/sdk - 51ed18658c50a38240de33c3dd3c80aee29682a7 + fdbf3e393c63517ddff9567216023f57b2fbb5e5 - + https://github.com/dotnet/sdk - 51ed18658c50a38240de33c3dd3c80aee29682a7 + fdbf3e393c63517ddff9567216023f57b2fbb5e5 diff --git a/eng/Versions.props b/eng/Versions.props index e8079f25b..b539a841e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22062.11 - 6.0.200-preview.22062.11 + 6.0.200-preview.22062.14 + 6.0.200-preview.22062.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4124481fae1cfdf2ca80fdb45e68362628c6915a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jan 2022 20:40:28 +0000 Subject: [PATCH 097/178] Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.1 (parent: Microsoft.NET.Sdk --- 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 35cc802a5..312f801b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -146,9 +146,9 @@ 3ba71c01793973bbbdd30ff5fffa037fbfbe76ec - + https://github.com/dotnet/msbuild - 7f9429d09bdd4109e5e1e9aa8a87ce692887a874 + ebab967617762442e413bc837a4c1651694d5325 From 8700d82bcd98005431887cd34c4588ca0bdf56c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jan 2022 01:59:37 +0000 Subject: [PATCH 098/178] Update dependencies from https://github.com/dotnet/sdk build 20220112.19 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22062.19 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.1 (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 312f801b7..c33903068 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ce0a1aaf91a59c97239cf486006d3142a030efd - + https://github.com/dotnet/sdk - fdbf3e393c63517ddff9567216023f57b2fbb5e5 + 87c9008c61765bf48b6a2762cae0379162d8176c - + https://github.com/dotnet/sdk - fdbf3e393c63517ddff9567216023f57b2fbb5e5 + 87c9008c61765bf48b6a2762cae0379162d8176c @@ -146,9 +146,9 @@ 3ba71c01793973bbbdd30ff5fffa037fbfbe76ec - + https://github.com/dotnet/msbuild - ebab967617762442e413bc837a4c1651694d5325 + b909fe611557de6777c141881b7f265495b0ef30 diff --git a/eng/Versions.props b/eng/Versions.props index b539a841e..f1b8ba866 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22062.14 - 6.0.200-preview.22062.14 + 6.0.200-preview.22062.19 + 6.0.200-preview.22062.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1c37d714d47fc331a921739e5ca16f8f73e477f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jan 2022 07:09:03 +0000 Subject: [PATCH 099/178] Update dependencies from https://github.com/dotnet/sdk build 20220112.21 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22062.21 --- 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 c33903068..8f4723dfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ce0a1aaf91a59c97239cf486006d3142a030efd - + https://github.com/dotnet/sdk - 87c9008c61765bf48b6a2762cae0379162d8176c + 70d48f9c6d97b09042a15173a72d92381f539a52 - + https://github.com/dotnet/sdk - 87c9008c61765bf48b6a2762cae0379162d8176c + 70d48f9c6d97b09042a15173a72d92381f539a52 diff --git a/eng/Versions.props b/eng/Versions.props index f1b8ba866..fcbfd87a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22062.19 - 6.0.200-preview.22062.19 + 6.0.200-preview.22062.21 + 6.0.200-preview.22062.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a3334f7b69a10fbf7c9db6f955b8d83c62f877e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jan 2022 07:09:17 +0000 Subject: [PATCH 100/178] Update dependencies from https://github.com/dotnet/sdk build 20220112.22 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22062.21 -> To Version 6.0.200-preview.22062.22 --- 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 8f4723dfe..ce6f7207e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ce0a1aaf91a59c97239cf486006d3142a030efd - + https://github.com/dotnet/sdk - 70d48f9c6d97b09042a15173a72d92381f539a52 + 4434a231837bdf0b8575311a0aeecb157cfe3411 - + https://github.com/dotnet/sdk - 70d48f9c6d97b09042a15173a72d92381f539a52 + 4434a231837bdf0b8575311a0aeecb157cfe3411 diff --git a/eng/Versions.props b/eng/Versions.props index fcbfd87a8..188f1d8dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22062.21 - 6.0.200-preview.22062.21 + 6.0.200-preview.22062.22 + 6.0.200-preview.22062.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 89a1175512798dfc81bc05fb30e164d6dfce9b5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jan 2022 07:09:30 +0000 Subject: [PATCH 101/178] Update dependencies from https://github.com/dotnet/sdk build 20220112.26 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22062.22 -> To Version 6.0.200-preview.22062.26 --- 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 ce6f7207e..cec73ff5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ce0a1aaf91a59c97239cf486006d3142a030efd - + https://github.com/dotnet/sdk - 4434a231837bdf0b8575311a0aeecb157cfe3411 + 01d98e4e73ffce07fbda920779fcf222a758cd73 - + https://github.com/dotnet/sdk - 4434a231837bdf0b8575311a0aeecb157cfe3411 + 01d98e4e73ffce07fbda920779fcf222a758cd73 diff --git a/eng/Versions.props b/eng/Versions.props index 188f1d8dd..bb7d9e9cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22062.22 - 6.0.200-preview.22062.22 + 6.0.200-preview.22062.26 + 6.0.200-preview.22062.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d0ae3e4754193dedbcee0ec7cf66b65e7d810965 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jan 2022 07:09:43 +0000 Subject: [PATCH 102/178] Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cec73ff5a..7848a6d12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,18 +90,18 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 8ce0a1aaf91a59c97239cf486006d3142a030efd + 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/templating - 8ce0a1aaf91a59c97239cf486006d3142a030efd + 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/templating - 8ce0a1aaf91a59c97239cf486006d3142a030efd + 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 https://github.com/dotnet/sdk @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - 3ba71c01793973bbbdd30ff5fffa037fbfbe76ec + cc0d213b15fdda217ad888d269d19754fa556eb4 - + https://github.com/dotnet/msbuild - b909fe611557de6777c141881b7f265495b0ef30 + 32e260b1218b64b9985185602e667a064850ae85 diff --git a/eng/Versions.props b/eng/Versions.props index bb7d9e9cd..658c67f07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-preview.22062.1 + 6.0.200-preview.22062.10 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.200-preview.22062.1 + 6.0.200-preview.22062.10 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 887aa4323bbb5fb9bb3df2de135d76fb94d44561 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jan 2022 11:59:11 +0000 Subject: [PATCH 103/178] Update dependencies from https://github.com/dotnet/sdk build 20220113.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22063.1 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7848a6d12..8f08b081e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 01d98e4e73ffce07fbda920779fcf222a758cd73 + 76324967800b02bbb77a6dd03db09c02a0b78b93 - + https://github.com/dotnet/sdk - 01d98e4e73ffce07fbda920779fcf222a758cd73 + 76324967800b02bbb77a6dd03db09c02a0b78b93 @@ -130,9 +130,9 @@ 7200973937f45e4e270b27634b0550d2954668d3 - + https://github.com/microsoft/vstest - a809880e02d8a9986e3ba1daeeeb5078fbb96be5 + 9dd433015247cf1d3a9ec66d3615794dd1d05703 diff --git a/eng/Versions.props b/eng/Versions.props index 658c67f07..3b1d1cf81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22062.26 - 6.0.200-preview.22062.26 + 6.0.200-preview.22063.1 + 6.0.200-preview.22063.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211210-01 + 17.2.0-preview-20220106-01 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 104/178] 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 7bcc25995a564f8db8e998ba15f3a1a6a8618344 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jan 2022 19:08:50 +0000 Subject: [PATCH 105/178] Update dependencies from https://github.com/dotnet/sdk build 20220113.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22063.12 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.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 8f08b081e..da6f66876 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 76324967800b02bbb77a6dd03db09c02a0b78b93 + 273216a66d07a6395a9d40e5c0ed76d95b42c810 - + https://github.com/dotnet/sdk - 76324967800b02bbb77a6dd03db09c02a0b78b93 + 273216a66d07a6395a9d40e5c0ed76d95b42c810 diff --git a/eng/Versions.props b/eng/Versions.props index 3b1d1cf81..830b3d11a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22063.1 - 6.0.200-preview.22063.1 + 6.0.200-preview.22063.12 + 6.0.200-preview.22063.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 51a0225f8009bb309102e6766e6af4e6f8a952bb Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 14 Jan 2022 00:15:19 +0000 Subject: [PATCH 106/178] 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 From db5dc07f815af43460ab669418c8f91caee38278 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jan 2022 08:46:03 +0000 Subject: [PATCH 107/178] Update dependencies from https://github.com/dotnet/sdk build 20220114.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22064.1 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 da6f66876..0f1dad88a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 273216a66d07a6395a9d40e5c0ed76d95b42c810 + fb9ade28ab96f31706e3f52ff5d3758999fb3169 - + https://github.com/dotnet/sdk - 273216a66d07a6395a9d40e5c0ed76d95b42c810 + fb9ade28ab96f31706e3f52ff5d3758999fb3169 @@ -146,9 +146,9 @@ cc0d213b15fdda217ad888d269d19754fa556eb4 - + https://github.com/dotnet/msbuild - 32e260b1218b64b9985185602e667a064850ae85 + f3c1fc9e5d82321fa4d0d7c82a5a479f3cc98796 diff --git a/eng/Versions.props b/eng/Versions.props index 830b3d11a..b2c5c57f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22063.12 - 6.0.200-preview.22063.12 + 6.0.200-preview.22064.1 + 6.0.200-preview.22064.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6a10fac9d32179ae700b20e10e90a4c2cf28f976 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jan 2022 09:22:52 +0000 Subject: [PATCH 108/178] Update dependencies from https://github.com/dotnet/sdk build 20220114.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22064.5 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f1dad88a..7fe4cd007 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - fb9ade28ab96f31706e3f52ff5d3758999fb3169 + 44d0dcdae268d5a8565a0cb7a22c8e9e3d68308e - + https://github.com/dotnet/sdk - fb9ade28ab96f31706e3f52ff5d3758999fb3169 + 44d0dcdae268d5a8565a0cb7a22c8e9e3d68308e @@ -130,9 +130,9 @@ 7200973937f45e4e270b27634b0550d2954668d3 - + https://github.com/microsoft/vstest - 9dd433015247cf1d3a9ec66d3615794dd1d05703 + d39826aa6461b639f8a1121c4d95c9f48ea68e11 diff --git a/eng/Versions.props b/eng/Versions.props index b2c5c57f7..23539d1f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22064.1 - 6.0.200-preview.22064.1 + 6.0.200-preview.22064.5 + 6.0.200-preview.22064.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20220106-01 + 17.2.0-preview-20220113-04 From 5ccd5f5feabea9bd95f30d77f6a84b2b7455ce01 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jan 2022 15:03:06 +0000 Subject: [PATCH 109/178] Update dependencies from https://github.com/dotnet/sdk build 20220114.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22064.8 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7fe4cd007..2a9cebda2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 44d0dcdae268d5a8565a0cb7a22c8e9e3d68308e + 524d7bc360c70e6da3c7fe27a038b630369edfac - + https://github.com/dotnet/sdk - 44d0dcdae268d5a8565a0cb7a22c8e9e3d68308e + 524d7bc360c70e6da3c7fe27a038b630369edfac @@ -130,9 +130,9 @@ 7200973937f45e4e270b27634b0550d2954668d3 - + https://github.com/microsoft/vstest - d39826aa6461b639f8a1121c4d95c9f48ea68e11 + d3c6439b04452047cb62fc645ce341a034bdb5be diff --git a/eng/Versions.props b/eng/Versions.props index 23539d1f0..ddf7e88a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22064.5 - 6.0.200-preview.22064.5 + 6.0.200-preview.22064.8 + 6.0.200-preview.22064.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20220113-04 + 17.1.0-release-20220113-05 From ee7e6073f47ffe618b12fbe0dd09bfffda007575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 17 Jan 2022 19:11:04 +0100 Subject: [PATCH 110/178] Revert "Resolve msbuild source-build patch conflict" This reverts commit 4b416931154059ad38a5a6e080978191f9dae8aa. We need the previous version after https://github.com/dotnet/sdk/pull/23421 was merged which downgraded msbuild back to the correct version. --- ...Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index 546419625..9a55fed1b 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -21,9 +21,9 @@ index a1f21de26..ff74d6e7f 100644 --- a/eng/dependabot/Packages.props +++ b/eng/dependabot/Packages.props @@ -22,9 +22,6 @@ - + + - - - - From 8cd050c01b1e209024d39217f94ba80f0d271deb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jan 2022 04:57:27 +0000 Subject: [PATCH 111/178] Update dependencies from https://github.com/dotnet/sdk build 20220117.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22067.4 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 2a9cebda2..15b737efd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 524d7bc360c70e6da3c7fe27a038b630369edfac + 0b0a3350cad8f8eb8f2985bfbe13fc3b5ec0c420 - + https://github.com/dotnet/sdk - 524d7bc360c70e6da3c7fe27a038b630369edfac + 0b0a3350cad8f8eb8f2985bfbe13fc3b5ec0c420 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - cc0d213b15fdda217ad888d269d19754fa556eb4 + 58609014783fc59275fbfec2c0656bed43ecf0b3 diff --git a/eng/Versions.props b/eng/Versions.props index ddf7e88a7..ede05382a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22064.8 - 6.0.200-preview.22064.8 + 6.0.200-preview.22067.4 + 6.0.200-preview.22067.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bd82fb0361a61b5838b87a4c5628029402f355de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jan 2022 08:30:11 +0000 Subject: [PATCH 112/178] Update dependencies from https://github.com/dotnet/sdk build 20220118.26 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22068.26 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 15b737efd..9f03607f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 0b0a3350cad8f8eb8f2985bfbe13fc3b5ec0c420 + 62a4a80cc3428e4b975a746e73155760df8abf72 - + https://github.com/dotnet/sdk - 0b0a3350cad8f8eb8f2985bfbe13fc3b5ec0c420 + 62a4a80cc3428e4b975a746e73155760df8abf72 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 58609014783fc59275fbfec2c0656bed43ecf0b3 + 073b71936e04e334dacebea3cf00662b0a13a280 diff --git a/eng/Versions.props b/eng/Versions.props index ede05382a..599932332 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22067.4 - 6.0.200-preview.22067.4 + 6.0.200-preview.22068.26 + 6.0.200-preview.22068.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aa25a1f5b438427b73dbdbe6ca4007973b6b5e38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jan 2022 13:32:34 +0000 Subject: [PATCH 113/178] Update dependencies from https://github.com/dotnet/sdk build 20220119.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22069.1 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 9f03607f6..681111061 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 62a4a80cc3428e4b975a746e73155760df8abf72 + 5df0e5f401d1bbf3531627f1cb4be1e23c97031c - + https://github.com/dotnet/sdk - 62a4a80cc3428e4b975a746e73155760df8abf72 + 5df0e5f401d1bbf3531627f1cb4be1e23c97031c @@ -135,9 +135,9 @@ d3c6439b04452047cb62fc645ce341a034bdb5be - + https://github.com/dotnet/linker - 67e3d793b82c46e62e767cf0ead3294f9689430f + 70dc7f6daaf50e8eb67afb91876b8efc8330103f linker diff --git a/eng/Versions.props b/eng/Versions.props index 599932332..3ab9f51a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22068.26 - 6.0.200-preview.22068.26 + 6.0.200-preview.22069.1 + 6.0.200-preview.22069.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c90f7a2280db25b4284dd11ae9239d8a4aa357ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 Jan 2022 15:01:14 +0000 Subject: [PATCH 114/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220119.1 (#13083) [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 5033e241e..be7a2e46d 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 - f5bc8bd3d3a2738be1095b2ca4f928504acb4801 + 220fc35f99158d68e72e55a667db44b93b293055 From 0ff982cb3f322eff6d7654a21a86be8debf2cf08 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jan 2022 18:46:21 +0000 Subject: [PATCH 115/178] Update dependencies from https://github.com/dotnet/sdk build 20220119.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22069.5 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.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 681111061..a6efa62f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 5df0e5f401d1bbf3531627f1cb4be1e23c97031c + af70bc8c02b6c6086370912189eef9f3cf5b0613 - + https://github.com/dotnet/sdk - 5df0e5f401d1bbf3531627f1cb4be1e23c97031c + af70bc8c02b6c6086370912189eef9f3cf5b0613 diff --git a/eng/Versions.props b/eng/Versions.props index 3ab9f51a1..31e7a461e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22069.1 - 6.0.200-preview.22069.1 + 6.0.200-preview.22069.5 + 6.0.200-preview.22069.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 231c11fddcd8f6a3917ad4cfb803dfa61c25d04a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 Jan 2022 18:57:48 +0000 Subject: [PATCH 116/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220119.2 (#13085) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22069.1 -> To Version 6.0.0-servicing.22069.2 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 be7a2e46d..900a33559 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 - 220fc35f99158d68e72e55a667db44b93b293055 + 8867610fc0861940f204bcc87f792bd49bbe49d6 From 0dd347db34ed522d510ca2263f11bdc0e7bc11ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jan 2022 00:37:15 +0000 Subject: [PATCH 117/178] Update dependencies from https://github.com/dotnet/sdk build 20220119.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22069.11 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.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 a6efa62f8..1c55fa60b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - af70bc8c02b6c6086370912189eef9f3cf5b0613 + bc62edb2050f9c78bfad9902d50a6337ea9ec879 - + https://github.com/dotnet/sdk - af70bc8c02b6c6086370912189eef9f3cf5b0613 + bc62edb2050f9c78bfad9902d50a6337ea9ec879 diff --git a/eng/Versions.props b/eng/Versions.props index 31e7a461e..ea740dedf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22069.5 - 6.0.200-preview.22069.5 + 6.0.200-preview.22069.11 + 6.0.200-preview.22069.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0f94224fa00f392f363c42e6408e275fba8d7573 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jan 2022 02:06:31 +0000 Subject: [PATCH 118/178] Update dependencies from https://github.com/dotnet/sdk build 20220119.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22069.13 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.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 1c55fa60b..7c20012f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - bc62edb2050f9c78bfad9902d50a6337ea9ec879 + 0a093cf221875beb36d509d0b407c1b8f61bd1af - + https://github.com/dotnet/sdk - bc62edb2050f9c78bfad9902d50a6337ea9ec879 + 0a093cf221875beb36d509d0b407c1b8f61bd1af diff --git a/eng/Versions.props b/eng/Versions.props index ea740dedf..e2f6f100b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22069.11 - 6.0.200-preview.22069.11 + 6.0.200-preview.22069.13 + 6.0.200-preview.22069.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e9b4d50445c9e2ec542254ffa1ffa35745e0439b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:53:47 +0000 Subject: [PATCH 119/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220120.1 (#13091) [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 900a33559..fb9fdce5f 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 - 8867610fc0861940f204bcc87f792bd49bbe49d6 + b047d49b93597b29986623f3c7c67a65fbccf648 From 69b52eef813ad237b7f562c917472951e6c3467e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 21 Jan 2022 09:46:24 -0800 Subject: [PATCH 120/178] Update .vsts-ci.yml --- .vsts-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d91efec67..652748bb7 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -46,6 +46,13 @@ stages: - stage: build jobs: - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals build.windows.10.amd64.vs2019.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals build.windows.10.amd64.vs2019 steps: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration From 3c0c7a1f37b86462af70d6837449cc2bfb78bb90 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Jan 2022 22:15:14 +0000 Subject: [PATCH 121/178] Update dependencies from https://github.com/dotnet/sdk build 20220121.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22071.4 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c20012f9..4cd22f4bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 0a093cf221875beb36d509d0b407c1b8f61bd1af + 5e74b04557ce2c6f3826ab7327556858566054c0 - + https://github.com/dotnet/sdk - 0a093cf221875beb36d509d0b407c1b8f61bd1af + 5e74b04557ce2c6f3826ab7327556858566054c0 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 073b71936e04e334dacebea3cf00662b0a13a280 + 637de22a0f15f93be1b5b9204b767d276077c633 @@ -151,9 +151,9 @@ f3c1fc9e5d82321fa4d0d7c82a5a479f3cc98796 - + https://github.com/nuget/nuget.client - 0a2795fb4ae20042ff55a1da21f71ae1d7f116ba + f1906d3d581e0ea0bdd282134208d654f8447880 diff --git a/eng/Versions.props b/eng/Versions.props index e2f6f100b..fee06e8fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.22069.13 - 6.0.200-preview.22069.13 + 6.0.200-preview.22071.4 + 6.0.200-preview.22071.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3de22e2a28ccdcd63d82bd49aebb31ae39492b01 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 21 Jan 2022 15:04:38 -0800 Subject: [PATCH 122/178] stabilize branding for release --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 287138a80..a48dd953f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,11 +10,11 @@ 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + rtm $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release From e2d39eca2b0d9079b7d4a85e0ea32744849761c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Jan 2022 19:21:43 +0000 Subject: [PATCH 123/178] Update dependencies from https://github.com/dotnet/sdk build 20220124.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-rtm.22074.1 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cd22f4bb..3512ced5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 + f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/templating - 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 + f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/templating - 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 + f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/sdk - 5e74b04557ce2c6f3826ab7327556858566054c0 + c8354edba9a93890f09ea3e95c2281e4acac3e8c - + https://github.com/dotnet/sdk - 5e74b04557ce2c6f3826ab7327556858566054c0 + c8354edba9a93890f09ea3e95c2281e4acac3e8c @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 637de22a0f15f93be1b5b9204b767d276077c633 + 663228dd1656d5e5ca7bd38bd5c95e3d8c2b7b01 diff --git a/eng/Versions.props b/eng/Versions.props index fee06e8fc..b522e49f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-preview.22062.10 + 6.0.200 @@ -56,8 +56,8 @@ - 6.0.200-preview.22071.4 - 6.0.200-preview.22071.4 + 6.0.200-rtm.22074.1 + 6.0.200-rtm.22074.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.200-preview.22062.10 + 6.0.200 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 1097fbf1833d254ee28466e77524ed53366d59fd Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 24 Jan 2022 14:48:48 -0800 Subject: [PATCH 124/178] Update NuGet.config --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index ae8794e04..7cab4584c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,6 +15,7 @@ + From 13beb40bd46b9c4929da42d6190525fef455f7d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Jan 2022 00:04:00 +0000 Subject: [PATCH 125/178] Update dependencies from https://github.com/dotnet/sdk build 20220125.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22074.1 -> To Version 6.0.200-rtm.22075.12 Dependency coherency updates Microsoft.Build From Version 17.1.0-preview-22063-01 -> To Version 17.1.0-preview-22075-05 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 82e72d18a..459c393cc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4db04f5c3..062db14e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/sdk - c8354edba9a93890f09ea3e95c2281e4acac3e8c + f985c0aee50585d15e43837db0e6849af68d3103 - + https://github.com/dotnet/sdk - c8354edba9a93890f09ea3e95c2281e4acac3e8c + f985c0aee50585d15e43837db0e6849af68d3103 @@ -146,9 +146,9 @@ 663228dd1656d5e5ca7bd38bd5c95e3d8c2b7b01 - + https://github.com/dotnet/msbuild - f3c1fc9e5d82321fa4d0d7c82a5a479f3cc98796 + b5c4359787ec681b1d91deed3cdbfa1b883b3e0a diff --git a/eng/Versions.props b/eng/Versions.props index 37777e077..cba6f0abc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-rtm.22074.1 - 6.0.200-rtm.22074.1 + 6.0.200-rtm.22075.12 + 6.0.200-rtm.22075.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8b1a04777f8fc687055e8399d78577644a024178 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Jan 2022 05:05:50 +0000 Subject: [PATCH 126/178] Update dependencies from https://github.com/dotnet/sdk build 20220125.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22074.1 -> To Version 6.0.200-rtm.22075.18 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.1.0-3.22071.8 -> To Version 4.1.0-3.22075.3 (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 062db14e3..a30d8f4c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/sdk - f985c0aee50585d15e43837db0e6849af68d3103 + 0505a17332b55e1fd728fb50f20d4983af897654 - + https://github.com/dotnet/sdk - f985c0aee50585d15e43837db0e6849af68d3103 + 0505a17332b55e1fd728fb50f20d4983af897654 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 663228dd1656d5e5ca7bd38bd5c95e3d8c2b7b01 + 592501cbb9c9394072a245c15b3458ff88155d85 diff --git a/eng/Versions.props b/eng/Versions.props index cba6f0abc..bf9a52a4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-rtm.22075.12 - 6.0.200-rtm.22075.12 + 6.0.200-rtm.22075.18 + 6.0.200-rtm.22075.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e191ca51ba6d5f06b08d264e2674caf198fe92e Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 25 Jan 2022 23:07:33 -0800 Subject: [PATCH 127/178] Restore the NuGet.config file --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 459c393cc..fc71fdca3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,6 +15,7 @@ + From 470bf457d0646ce6e24d6cf4c84ced8ce8aa2419 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 26 Jan 2022 10:29:45 -0800 Subject: [PATCH 128/178] Update NuGet.config --- NuGet.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index fc71fdca3..82e72d18a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + From d257a5eb1afb8c5173309ec23dd4d5b4e76ff438 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 04:39:04 +0000 Subject: [PATCH 129/178] Update dependencies from https://github.com/dotnet/sdk build 20220126.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22075.18 -> To Version 6.0.200-rtm.22076.18 Dependency coherency updates Microsoft.Build From Version 17.1.0-preview-22075-05 -> To Version 17.1.0 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 82e72d18a..1eda47b59 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,11 +11,11 @@ + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a30d8f4c7..6592a3f4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/sdk - 0505a17332b55e1fd728fb50f20d4983af897654 + 8a705ab1294ff07ae66ea41ca890b004cfa6fd9f - + https://github.com/dotnet/sdk - 0505a17332b55e1fd728fb50f20d4983af897654 + 8a705ab1294ff07ae66ea41ca890b004cfa6fd9f @@ -146,9 +146,9 @@ 592501cbb9c9394072a245c15b3458ff88155d85 - + https://github.com/dotnet/msbuild - b5c4359787ec681b1d91deed3cdbfa1b883b3e0a + ae57d105c6094d8d59fe42f557ad0dcb46ec285e diff --git a/eng/Versions.props b/eng/Versions.props index bf9a52a4b..7e95465f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-rtm.22075.18 - 6.0.200-rtm.22075.18 + 6.0.200-rtm.22076.18 + 6.0.200-rtm.22076.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 24e2b948e6c294b526ffbbd02a66a0a86a94b655 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 26 Jan 2022 22:17:58 -0800 Subject: [PATCH 130/178] Update NuGet.config --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 1eda47b59..ecbd1218a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,7 @@ + From d5f171953855b861da32eb06206b6305818f4431 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 27 Jan 2022 14:25:01 -0800 Subject: [PATCH 131/178] Update .vsts-ci.yml --- .vsts-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 652748bb7..f4cd67b9f 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -391,7 +391,12 @@ stages: - Source_Build_Create_Tarball publishUsingPipelines: true pool: - vmImage: vs2017-win2016 + ${{ if eq(variables['System.TeamProject'], 'public') }}: + vmImage: windows-2017 + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017 + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml From 10ea11c6974eae8b47d6be214d5837ed168ffc91 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 27 Jan 2022 14:27:36 -0800 Subject: [PATCH 132/178] Fix the public pool --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index f4cd67b9f..1d18d9dd0 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -392,7 +392,7 @@ stages: publishUsingPipelines: true pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - vmImage: windows-2017 + vmImage: vs2017-win2016 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017 From dcd221cebd63f2a9114db212122bccf62cbeb776 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jan 2022 07:14:24 +0000 Subject: [PATCH 133/178] [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#13131) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages - Update NuGet.config --- 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 6592a3f4a..82ff82885 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 - b047d49b93597b29986623f3c7c67a65fbccf648 + 71a327c277a022d15af3d103c0796620ecd40471 From 1b859954d513dc8186d8b712816c585612b3493f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 28 Jan 2022 09:17:16 +0000 Subject: [PATCH 134/178] Update dependencies from https://github.com/dotnet/sdk build 20220128.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22076.18 -> To Version 6.0.200-rtm.22078.2 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22069.1 -> To Version 6.0.200-1.22077.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index ecbd1218a..1eda47b59 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6592a3f4a..a288c2244 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/sdk - 8a705ab1294ff07ae66ea41ca890b004cfa6fd9f + e91f877d81c61ad9ea5e57293978dbe50a4af52d - + https://github.com/dotnet/sdk - 8a705ab1294ff07ae66ea41ca890b004cfa6fd9f + e91f877d81c61ad9ea5e57293978dbe50a4af52d @@ -135,9 +135,9 @@ d3c6439b04452047cb62fc645ce341a034bdb5be - + https://github.com/dotnet/linker - 70dc7f6daaf50e8eb67afb91876b8efc8330103f + d99b0cc5c3169279350e8da4c0961fc70f95aed6 linker diff --git a/eng/Versions.props b/eng/Versions.props index 7e95465f2..043db5c06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-rtm.22076.18 - 6.0.200-rtm.22076.18 + 6.0.200-rtm.22078.2 + 6.0.200-rtm.22078.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e950d071463b02978f13d5324aeadd0eb9a51cfc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jan 2022 07:02:00 +0000 Subject: [PATCH 135/178] [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#13143) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages - Update NuGet.config --- 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 82ff82885..75836c484 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 - 71a327c277a022d15af3d103c0796620ecd40471 + 4643b750ccc93ca151eed888da70b67f0198d1fd From 94086dc35147faa8063e0ce8782e079af26bfb71 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 31 Jan 2022 13:50:23 -0800 Subject: [PATCH 136/178] Update .vsts-ci.yml --- .vsts-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 1d18d9dd0..7fb2a509d 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -391,8 +391,6 @@ stages: - Source_Build_Create_Tarball publishUsingPipelines: true pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - vmImage: vs2017-win2016 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017 From 8ab7b51538c5dffa54f9ec276aebb4b4b51b7281 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 1 Feb 2022 23:58:42 +0000 Subject: [PATCH 137/178] Update dependencies from https://github.com/dotnet/sdk build 20220201.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22076.18 -> To Version 6.0.200-rtm.22101.13 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22069.1 -> To Version 6.0.200-1.22077.1 (parent: Microsoft.NET.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 a288c2244..c337f6bff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/sdk - e91f877d81c61ad9ea5e57293978dbe50a4af52d + c4327225d58e4e70324f116712769bfd8e1044c3 - + https://github.com/dotnet/sdk - e91f877d81c61ad9ea5e57293978dbe50a4af52d + c4327225d58e4e70324f116712769bfd8e1044c3 diff --git a/eng/Versions.props b/eng/Versions.props index 043db5c06..49858df34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-rtm.22078.2 - 6.0.200-rtm.22078.2 + 6.0.200-rtm.22101.13 + 6.0.200-rtm.22101.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 47ed225495b17701a6a04db0a3e58e662056630b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 2 Feb 2022 02:45:45 +0000 Subject: [PATCH 138/178] Update dependencies from https://github.com/dotnet/sdk build 20220201.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22076.18 -> To Version 6.0.200-rtm.22101.20 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22069.1 -> To Version 6.0.200-1.22077.1 (parent: Microsoft.NET.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 c337f6bff..2722b64bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/sdk - c4327225d58e4e70324f116712769bfd8e1044c3 + 8b6180f25a635423c32aee0a3848fb027a8236ce - + https://github.com/dotnet/sdk - c4327225d58e4e70324f116712769bfd8e1044c3 + 8b6180f25a635423c32aee0a3848fb027a8236ce diff --git a/eng/Versions.props b/eng/Versions.props index 49858df34..96f6ddeab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-rtm.22101.13 - 6.0.200-rtm.22101.13 + 6.0.200-rtm.22101.20 + 6.0.200-rtm.22101.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 17648edc6c99931dd3be73be35c2380cf1a0b807 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 3 Feb 2022 00:01:25 +0000 Subject: [PATCH 139/178] Update dependencies from https://github.com/dotnet/sdk build 20220202.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22076.18 -> To Version 6.0.200-rtm.22102.21 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22069.1 -> To Version 6.0.200-1.22081.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1eda47b59..5b0041b72 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2722b64bd..f7e47a279 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/sdk - 8b6180f25a635423c32aee0a3848fb027a8236ce + 3242e0c20d625a18f145b7d9c84b64eecb4c7814 - + https://github.com/dotnet/sdk - 8b6180f25a635423c32aee0a3848fb027a8236ce + 3242e0c20d625a18f145b7d9c84b64eecb4c7814 @@ -135,9 +135,9 @@ d3c6439b04452047cb62fc645ce341a034bdb5be - + https://github.com/dotnet/linker - d99b0cc5c3169279350e8da4c0961fc70f95aed6 + cc3dc76c374152f86ff73aa02f35782b713908c6 linker diff --git a/eng/Versions.props b/eng/Versions.props index 96f6ddeab..79475ddb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-rtm.22101.20 - 6.0.200-rtm.22101.20 + 6.0.200-rtm.22102.21 + 6.0.200-rtm.22102.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c2ea375f06444034ea4cc44430e7355d52806988 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 3 Feb 2022 02:42:33 +0000 Subject: [PATCH 140/178] Update dependencies from https://github.com/dotnet/sdk build 20220202.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22076.18 -> To Version 6.0.200-rtm.22102.30 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22069.1 -> To Version 6.0.200-1.22081.5 (parent: Microsoft.NET.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 f7e47a279..0b1574cda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/sdk - 3242e0c20d625a18f145b7d9c84b64eecb4c7814 + 90364803cdc1eef1c32de4cdce39e08024acdcb4 - + https://github.com/dotnet/sdk - 3242e0c20d625a18f145b7d9c84b64eecb4c7814 + 90364803cdc1eef1c32de4cdce39e08024acdcb4 diff --git a/eng/Versions.props b/eng/Versions.props index 79475ddb1..ad09bd6e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-rtm.22102.21 - 6.0.200-rtm.22102.21 + 6.0.200-rtm.22102.30 + 6.0.200-rtm.22102.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2f9557e2baa58f7d73a4b6416b6cc2f263d24250 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Feb 2022 16:05:33 +0000 Subject: [PATCH 141/178] Update dependencies from https://github.com/dotnet/arcade build 20220202.3 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21609.4 -> To Version 6.0.0-beta.22102.3 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/generate-graph-files.ps1 | 86 --- eng/common/post-build/publish-using-darc.ps1 | 28 +- eng/common/sdl/configure-sdl-tool.ps1 | 9 +- eng/common/sdl/execute-all-sdl-tools.ps1 | 4 +- eng/common/sdl/packages.config | 2 +- eng/common/templates/job/execute-sdl.yml | 25 +- .../templates/job/generate-graph-files.yml | 48 -- eng/common/templates/job/job.yml | 5 + eng/common/templates/job/onelocbuild.yml | 18 +- .../templates/job/publish-build-assets.yml | 4 - eng/common/templates/jobs/codeql-build.yml | 31 + eng/common/templates/jobs/jobs.yml | 24 +- .../channels/generic-internal-channel.yml | 190 ------ .../channels/generic-public-channel.yml | 192 ------ .../templates/post-build/common-variables.yml | 73 --- .../templates/post-build/post-build.yml | 616 +++++------------- .../post-build/setup-maestro-vars.yml | 128 ++-- eng/common/templates/steps/execute-codeql.yml | 32 + global.json | 6 +- 22 files changed, 341 insertions(+), 1196 deletions(-) delete mode 100644 eng/common/generate-graph-files.ps1 delete mode 100644 eng/common/templates/job/generate-graph-files.yml create mode 100644 eng/common/templates/jobs/codeql-build.yml delete mode 100644 eng/common/templates/post-build/channels/generic-internal-channel.yml delete mode 100644 eng/common/templates/post-build/channels/generic-public-channel.yml create mode 100644 eng/common/templates/steps/execute-codeql.yml diff --git a/NuGet.config b/NuGet.config index ecbd1218a..5b0041b72 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75836c484..930bf9a3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7421b55f46aff8373764016d942b23cbf87c75cb + 93e08e378eb00a4267ffeca24b6bebb4f6c011ef - + https://github.com/dotnet/arcade - 7421b55f46aff8373764016d942b23cbf87c75cb + 93e08e378eb00a4267ffeca24b6bebb4f6c011ef - + https://github.com/dotnet/arcade - 7421b55f46aff8373764016d942b23cbf87c75cb + 93e08e378eb00a4267ffeca24b6bebb4f6c011ef https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7e95465f2..f42e706d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21609.4 + 6.0.0-beta.22102.3 diff --git a/eng/common/generate-graph-files.ps1 b/eng/common/generate-graph-files.ps1 deleted file mode 100644 index 0728b1a8b..000000000 --- a/eng/common/generate-graph-files.ps1 +++ /dev/null @@ -1,86 +0,0 @@ -Param( - [Parameter(Mandatory=$true)][string] $barToken, # Token generated at https://maestro-prod.westus2.cloudapp.azure.com/Account/Tokens - [Parameter(Mandatory=$true)][string] $gitHubPat, # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed) - [Parameter(Mandatory=$true)][string] $azdoPat, # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed) - [Parameter(Mandatory=$true)][string] $outputFolder, # Where the graphviz.txt file will be created - [string] $darcVersion, # darc's version - [string] $graphvizVersion = '2.38', # GraphViz version - [switch] $includeToolset # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about - # toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies -) - -function CheckExitCode ([string]$stage) -{ - $exitCode = $LASTEXITCODE - if ($exitCode -ne 0) { - Write-PipelineTelemetryError -Category 'Arcade' -Message "Something failed in stage: '$stage'. Check for errors above. Exiting now..." - ExitWithExitCode $exitCode - } -} - -try { - $ErrorActionPreference = 'Stop' - . $PSScriptRoot\tools.ps1 - - Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') - - Push-Location $PSScriptRoot - - Write-Host 'Installing darc...' - . .\darc-init.ps1 -darcVersion $darcVersion - CheckExitCode 'Running darc-init' - - $engCommonBaseDir = Join-Path $PSScriptRoot 'native\' - $graphvizInstallDir = CommonLibrary\Get-NativeInstallDirectory - $nativeToolBaseUri = 'https://netcorenativeassets.blob.core.windows.net/resource-packages/external' - $installBin = Join-Path $graphvizInstallDir 'bin' - - Write-Host 'Installing dot...' - .\native\install-tool.ps1 -ToolName graphviz -InstallPath $installBin -BaseUri $nativeToolBaseUri -CommonLibraryDirectory $engCommonBaseDir -Version $graphvizVersion -Verbose - - $darcExe = "$env:USERPROFILE\.dotnet\tools" - $darcExe = Resolve-Path "$darcExe\darc.exe" - - Create-Directory $outputFolder - - # Generate 3 graph descriptions: - # 1. Flat with coherency information - # 2. Graphviz (dot) file - # 3. Standard dependency graph - $graphVizFilePath = "$outputFolder\graphviz.txt" - $graphVizImageFilePath = "$outputFolder\graph.png" - $normalGraphFilePath = "$outputFolder\graph-full.txt" - $flatGraphFilePath = "$outputFolder\graph-flat.txt" - $baseOptions = @( '--github-pat', "$gitHubPat", '--azdev-pat', "$azdoPat", '--password', "$barToken" ) - - if ($includeToolset) { - Write-Host 'Toolsets will be included in the graph...' - $baseOptions += @( '--include-toolset' ) - } - - Write-Host 'Generating standard dependency graph...' - & "$darcExe" get-dependency-graph @baseOptions --output-file $normalGraphFilePath - CheckExitCode 'Generating normal dependency graph' - - Write-Host 'Generating flat dependency graph and graphviz file...' - & "$darcExe" get-dependency-graph @baseOptions --flat --coherency --graphviz $graphVizFilePath --output-file $flatGraphFilePath - CheckExitCode 'Generating flat and graphviz dependency graph' - - Write-Host "Generating graph image $graphVizFilePath" - $dotFilePath = Join-Path $installBin "graphviz\$graphvizVersion\release\bin\dot.exe" - & "$dotFilePath" -Tpng -o"$graphVizImageFilePath" "$graphVizFilePath" - CheckExitCode 'Generating graphviz image' - - Write-Host "'$graphVizFilePath', '$flatGraphFilePath', '$normalGraphFilePath' and '$graphVizImageFilePath' created!" -} -catch { - if (!$includeToolset) { - Write-Host 'This might be a toolset repo which includes only toolset dependencies. ' -NoNewline -ForegroundColor Yellow - Write-Host 'Since -includeToolset is not set there is no graph to create. Include -includeToolset and try again...' -ForegroundColor Yellow - } - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'Arcade' -Message $_ - ExitWithExitCode 1 -} finally { - Pop-Location -} \ No newline at end of file diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 2427ca6b6..8508397d7 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -5,13 +5,8 @@ param( [Parameter(Mandatory=$true)][string] $MaestroToken, [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, - [Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation, - [Parameter(Mandatory=$false)][string] $EnableSigningValidation, - [Parameter(Mandatory=$false)][string] $EnableNugetValidation, - [Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, - [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters, - [Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters + [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters ) try { @@ -35,27 +30,6 @@ try { $optionalParams.Add("--no-wait") | Out-Null } - if ("false" -ne $PublishInstallersAndChecksums) { - $optionalParams.Add("--publish-installers-and-checksums") | Out-Null - } - - if ("true" -eq $EnableNugetValidation) { - $optionalParams.Add("--validate-nuget") | Out-Null - } - - if ("true" -eq $EnableSourceLinkValidation) { - $optionalParams.Add("--validate-sourcelinkchecksums") | Out-Null - } - - if ("true" -eq $EnableSigningValidation) { - $optionalParams.Add("--validate-signingchecksums") | Out-Null - - if ("" -ne $SigningValidationAdditionalParameters) { - $optionalParams.Add("--signing-validation-parameters") | Out-Null - $optionalParams.Add($SigningValidationAdditionalParameters) | Out-Null - } - } - & $darc add-build-to-channel ` --id $buildId ` --publishing-infra-version $PublishingInfraVersion ` diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1 index 4999c3070..adea8e8da 100644 --- a/eng/common/sdl/configure-sdl-tool.ps1 +++ b/eng/common/sdl/configure-sdl-tool.ps1 @@ -15,7 +15,9 @@ Param( # Optional: Additional params to add to any tool using CredScan. [string[]] $CrScanAdditionalRunConfigParams, # Optional: Additional params to add to any tool using PoliCheck. - [string[]] $PoliCheckAdditionalRunConfigParams + [string[]] $PoliCheckAdditionalRunConfigParams, + # Optional: Additional params to add to any tool using CodeQL/Semmle. + [string[]] $CodeQLAdditionalRunConfigParams ) $ErrorActionPreference = 'Stop' @@ -78,6 +80,11 @@ try { $tool.Args += "Target < $TargetDirectory" } $tool.Args += $PoliCheckAdditionalRunConfigParams + } elseif ($tool.Name -eq 'semmle' -or $tool.Name -eq 'codeql') { + if ($targetDirectory) { + $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`"" + } + $tool.Args += $CodeQLAdditionalRunConfigParams } # Create variable pointing to the args array directly so we can use splat syntax later. diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 1157151f4..b9fe73179 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -34,6 +34,7 @@ Param( [string] $GuardianLoggerLevel='Standard', # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error [string[]] $CrScanAdditionalRunConfigParams, # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1") [string[]] $PoliCheckAdditionalRunConfigParams, # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1") + [string[]] $CodeQLAdditionalRunConfigParams, # Optional: Additional Params to custom build a Semmle/CodeQL run config in the format @("xyz < abc","sdf < 1") [bool] $BreakOnFailure=$False # Optional: Fail the build if there were errors during the run ) @@ -105,7 +106,8 @@ try { -AzureDevOpsAccessToken $AzureDevOpsAccessToken ` -GuardianLoggerLevel $GuardianLoggerLevel ` -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams ` - -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams + -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams ` + -CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams if ($BreakOnFailure) { Exit-IfNZEC "Sdl" } diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 3bd8b29eb..b7bcfe38c 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 4882dd931..d0a1ea8b0 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -29,14 +29,6 @@ parameters: # Optional: download a list of pipeline artifacts. 'downloadArtifacts' controls build artifacts, # not pipeline artifacts, so doesn't affect the use of this parameter. pipelineArtifactNames: [] - # Optional: location and ID of the AzDO build that the build/pipeline artifacts should be - # downloaded from. By default, uses runtime expressions to decide based on the variables set by - # the 'setupMaestroVars' dependency. Overriding this parameter is necessary if SDL tasks are - # running without Maestro++/BAR involved, or to download artifacts from a specific existing build - # to iterate quickly on SDL changes. - AzDOProjectName: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - AzDOPipelineId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - AzDOBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] jobs: - job: Run_SDL @@ -54,21 +46,26 @@ jobs: # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in # sync with the packages.config file. - name: DefaultGuardianVersion - value: 0.53.3 + value: 0.110.1 - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - name: GuardianPackagesConfigFile value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config pool: - # To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019. - ${{ if eq(parameters.extractArchiveArtifacts, 'false') }}: - vmImage: windows-2019 - ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}: - vmImage: windows-2019 + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: VSEngSS-MicroBuild2022-1ES + demands: Cmd + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - checkout: self clean: true + - template: /eng/common/templates/post-build/setup-maestro-vars.yml + - ${{ if ne(parameters.downloadArtifacts, 'false')}}: - ${{ if ne(parameters.artifactNames, '') }}: - ${{ each artifactName in parameters.artifactNames }}: diff --git a/eng/common/templates/job/generate-graph-files.yml b/eng/common/templates/job/generate-graph-files.yml deleted file mode 100644 index e54ce956f..000000000 --- a/eng/common/templates/job/generate-graph-files.yml +++ /dev/null @@ -1,48 +0,0 @@ -parameters: - # Optional: dependencies of the job - dependsOn: '' - - # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: {} - - # Optional: Include toolset dependencies in the generated graph files - includeToolset: false - -jobs: -- job: Generate_Graph_Files - - dependsOn: ${{ parameters.dependsOn }} - - displayName: Generate Graph Files - - pool: ${{ parameters.pool }} - - variables: - # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT - # DotNet-AllOrgs-Darc-Pats provides: dn-bot-devdiv-dnceng-rw-code-pat - - group: Publish-Build-Assets - - group: DotNet-AllOrgs-Darc-Pats - - name: _GraphArguments - value: -gitHubPat $(BotAccount-dotnet-maestro-bot-PAT) - -azdoPat $(dn-bot-devdiv-dnceng-rw-code-pat) - -barToken $(MaestroAccessToken) - -outputFolder '$(Build.StagingDirectory)/GraphFiles/' - - ${{ if ne(parameters.includeToolset, 'false') }}: - - name: _GraphArguments - value: ${{ variables._GraphArguments }} -includeToolset - - steps: - - task: PowerShell@2 - displayName: Generate Graph Files - inputs: - filePath: eng\common\generate-graph-files.ps1 - arguments: $(_GraphArguments) - continueOnError: true - - task: PublishBuildArtifacts@1 - displayName: Publish Graph to Artifacts - inputs: - PathtoPublish: '$(Build.StagingDirectory)/GraphFiles' - PublishLocation: Container - ArtifactName: GraphFiles - continueOnError: true - condition: always() diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 37dceb1ba..30d1de583 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,6 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false + disableComponentGovernance: false mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -136,6 +137,10 @@ jobs: richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin continueOnError: true + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 069098b0a..9d1e3042d 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -3,9 +3,8 @@ parameters: dependsOn: '' # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: - vmImage: windows-2019 - + pool: '' + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) @@ -31,7 +30,18 @@ jobs: displayName: OneLocBuild - pool: ${{ parameters.pool }} + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: VSEngSS-MicroBuild2022-1ES + demands: Cmd + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Server.Amd64.VS2019 variables: - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index fe9dfdf72..d91bf9147 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -38,10 +38,6 @@ jobs: value: ${{ parameters.configuration }} - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats - # Skip component governance and codesign validation for SDL. These jobs - # create no content. - - name: skipComponentGovernanceDetection - value: true - name: runCodesignValidationInjection value: false diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml new file mode 100644 index 000000000..f7dc5ea4a --- /dev/null +++ b/eng/common/templates/jobs/codeql-build.yml @@ -0,0 +1,31 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + +jobs: +- template: /eng/common/templates/jobs/jobs.yml + parameters: + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishTestResults: false + enablePublishBuildAssets: false + enablePublishUsingPipelines: false + enableTelemetry: true + + variables: + - group: Publish-Build-Assets + # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in + # sync with the packages.config file. + - name: DefaultGuardianVersion + value: 0.109.0 + - name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + - name: GuardianVersion + value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + + jobs: ${{ parameters.jobs }} + diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 90015a7e5..70d44735a 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -8,6 +8,10 @@ parameters: # Optional: Enable publishing using release pipelines enablePublishUsingPipelines: false + # Optional: Disable component governance detection. In general, component governance + # should be on for all jobs. Use only in the event of issues. + disableComponentGovernance: false + # Optional: Enable running the source-build jobs to build repo from source enableSourceBuild: false @@ -83,17 +87,15 @@ jobs: - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete pool: - vmImage: windows-2019 + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: VSEngSS-MicroBuild2022-1ES + demands: Cmd + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Server.Amd64.VS2019 + runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} - - - ${{ if eq(parameters.graphFileGeneration.enabled, true) }}: - - template: ../job/generate-graph-files.yml - parameters: - continueOnError: ${{ parameters.continueOnError }} - includeToolset: ${{ parameters.graphFileGeneration.includeToolset }} - dependsOn: - - Asset_Registry_Publish - pool: - vmImage: windows-2019 diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml deleted file mode 100644 index 8990dfc8c..000000000 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ /dev/null @@ -1,190 +0,0 @@ -parameters: - BARBuildId: '' - PromoteToChannelIds: '' - artifactsPublishingAdditionalParameters: '' - dependsOn: - - Validate - publishInstallersAndChecksums: true - symbolPublishingAdditionalParameters: '' - stageName: '' - channelName: '' - channelId: '' - transportFeed: '' - shippingFeed: '' - symbolsFeed: '' - -stages: -- stage: ${{ parameters.stageName }} - dependsOn: ${{ parameters.dependsOn }} - variables: - - template: ../common-variables.yml - displayName: ${{ parameters.channelName }} Publishing - jobs: - - template: ../setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - job: publish_symbols - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) - variables: - - group: DotNet-Symbol-Server-Pats - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - pool: - vmImage: 'windows-2019' - steps: - - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." - displayName: Warn about v2 Arcade Publishing Usage - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: DownloadBuildArtifacts@0 - displayName: Download Build Assets - continueOnError: true - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - downloadType: 'specific' - itemPattern: | - PdbArtifacts/** - BlobArtifacts/** - downloadPath: '$(Build.ArtifactStagingDirectory)' - checkDownloadedFiles: true - - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - /p:PublishToMSDL=false - ${{ parameters.symbolPublishingAdditionalParameters }} - - - template: ../../steps/publish-logs.yml - parameters: - StageLabel: '${{ parameters.stageName }}' - JobLabel: 'SymbolPublishing' - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - timeoutInMinutes: 120 - variables: - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) - pool: - vmImage: 'windows-2019' - steps: - - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." - displayName: Warn about v2 Arcade Publishing Usage - - - task: DownloadBuildArtifacts@0 - displayName: Download Build Assets - continueOnError: true - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - downloadType: 'specific' - itemPattern: | - PackageArtifacts/** - BlobArtifacts/** - AssetManifests/** - downloadPath: '$(Build.ArtifactStagingDirectory)' - checkDownloadedFiles: true - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:PublishingInfraVersion=2 - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey) - /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey) - /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:PublishToMSDL=false - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/publish-logs.yml - parameters: - StageLabel: '${{ parameters.stageName }}' - JobLabel: 'AssetsPublishing' - - - template: ../../steps/add-build-to-channel.yml - parameters: - ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml deleted file mode 100644 index 3220c6a4f..000000000 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ /dev/null @@ -1,192 +0,0 @@ -parameters: - BARBuildId: '' - PromoteToChannelIds: '' - artifactsPublishingAdditionalParameters: '' - dependsOn: - - Validate - publishInstallersAndChecksums: true - symbolPublishingAdditionalParameters: '' - stageName: '' - channelName: '' - channelId: '' - transportFeed: '' - shippingFeed: '' - symbolsFeed: '' - # If the channel name is empty, no links will be generated - akaMSChannelName: '' - -stages: -- stage: ${{ parameters.stageName }} - dependsOn: ${{ parameters.dependsOn }} - variables: - - template: ../common-variables.yml - displayName: ${{ parameters.channelName }} Publishing - jobs: - - template: ../setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - job: publish_symbols - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) - variables: - - group: DotNet-Symbol-Server-Pats - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - pool: - vmImage: 'windows-2019' - steps: - - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." - displayName: Warn about v2 Arcade Publishing Usage - - - task: DownloadBuildArtifacts@0 - displayName: Download Build Assets - continueOnError: true - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - downloadType: 'specific' - itemPattern: | - PdbArtifacts/** - BlobArtifacts/** - downloadPath: '$(Build.ArtifactStagingDirectory)' - checkDownloadedFiles: true - - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - template: ../../steps/publish-logs.yml - parameters: - StageLabel: '${{ parameters.stageName }}' - JobLabel: 'SymbolPublishing' - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - timeoutInMinutes: 120 - variables: - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - - name: ArtifactsCategory - value: ${{ coalesce(variables._DotNetArtifactsCategory, '.NETCore') }} - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) - pool: - vmImage: 'windows-2019' - steps: - - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." - displayName: Warn about v2 Arcade Publishing Usage - - - task: DownloadBuildArtifacts@0 - displayName: Download Build Assets - continueOnError: true - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - downloadType: 'specific' - itemPattern: | - PackageArtifacts/** - BlobArtifacts/** - AssetManifests/** - downloadPath: '$(Build.ArtifactStagingDirectory)' - checkDownloadedFiles: true - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:PublishingInfraVersion=2 - /p:ArtifactsCategory=$(ArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:LatestLinkShortUrlPrefix=dotnet/'${{ parameters.akaMSChannelName }}' - /p:AkaMSClientId=$(akams-client-id) - /p:AkaMSClientSecret=$(akams-client-secret) - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/publish-logs.yml - parameters: - StageLabel: '${{ parameters.stageName }}' - JobLabel: 'AssetsPublishing' - - - template: ../../steps/add-build-to-channel.yml - parameters: - ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index c99fd7503..1ac7f49a4 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -4,54 +4,6 @@ variables: - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage - group: Publish-Build-Assets - - # .NET Core 3.1 Dev - - name: PublicDevRelease_31_Channel_Id - value: 128 - - # .NET 5 Dev - - name: Net_5_Dev_Channel_Id - value: 131 - - # .NET Eng - Validation - - name: Net_Eng_Validation_Channel_Id - value: 9 - - # .NET Eng - Latest - - name: Net_Eng_Latest_Channel_Id - value: 2 - - # .NET 3 Eng - Validation - - name: NET_3_Eng_Validation_Channel_Id - value: 390 - - # .NET 3 Eng - - name: NetCore_3_Tools_Channel_Id - value: 344 - - # .NET Core 3.0 Internal Servicing - - name: InternalServicing_30_Channel_Id - value: 184 - - # .NET Core 3.0 Release - - name: PublicRelease_30_Channel_Id - value: 19 - - # .NET Core 3.1 Release - - name: PublicRelease_31_Channel_Id - value: 129 - - # General Testing - - name: GeneralTesting_Channel_Id - value: 529 - - # .NET Core 3.1 Blazor Features - - name: NetCore_31_Blazor_Features_Channel_Id - value: 531 - - # .NET Core Experimental - - name: NetCore_Experimental_Channel_Id - value: 562 # Whether the build is internal or not - name: IsInternalBuild @@ -70,30 +22,5 @@ variables: - name: SymbolToolVersion value: 1.0.1 - # Feed Configurations - # These should include the suffix "/index.json" - - # Default locations for Installers and checksums - # Public Locations - - name: ChecksumsBlobFeedUrl - value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json - - name: InstallersBlobFeedUrl - value: https://dotnetcli.blob.core.windows.net/dotnet/index.json - - # Private Locations - - name: InternalChecksumsBlobFeedUrl - value: https://dotnetclichecksumsmsrc.blob.core.windows.net/dotnet/index.json - - name: InternalChecksumsBlobFeedKey - value: $(dotnetclichecksumsmsrc-storage-key) - - - name: InternalInstallersBlobFeedUrl - value: https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json - - name: InternalInstallersBlobFeedKey - value: $(dotnetclimsrc-access-key) - - # Skip component governance and codesign validation for SDL. These jobs - # create no content. - - name: skipComponentGovernanceDetection - value: true - name: runCodesignValidationInjection value: false diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 4f79cf0f3..24e92a275 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -1,113 +1,114 @@ parameters: - # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. - # Publishing V2 accepts optionally outlining the publishing stages - default is inline. - # Publishing V3 DOES NOT accept inlining the publishing stages. - publishingInfraVersion: 2 - # When set to true the publishing templates from the repo will be used - # otherwise Darc add-build-to-channel will be used to trigger the promotion pipeline - inline: true + # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. + # Publishing V1 is no longer supported + # Publishing V2 is no longer supported + # Publishing V3 is the default + - name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 - # Only used if inline==false. When set to true will stall the current build until - # the Promotion Pipeline build finishes. Otherwise, the current build will continue - # execution concurrently with the promotion build. - waitPublishingFinish: true + - name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 - BARBuildId: '' - PromoteToChannelIds: '' + - name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' - enableSourceLinkValidation: false - enableSigningValidation: true - enableSymbolValidation: false - enableNugetValidation: true - publishInstallersAndChecksums: true - SDLValidationParameters: - enable: false - continueOnError: false - params: '' - artifactNames: '' - downloadArtifacts: true + - name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + + - name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + + - name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + + - name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + + - name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + + - name: SDLValidationParameters + type: object + default: + enable: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - signingValidationAdditionalParameters: '' + - name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + + - name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + + - name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' # Which stages should finish execution before post-build stages start - validateDependsOn: - - build - publishDependsOn: - - Validate + - name: validateDependsOn + type: object + default: + - build - # Channel ID's instantiated in this file. - # When adding a new channel implementation the call to `check-channel-consistency.ps1` - # needs to be updated with the new channel ID - NetEngLatestChannelId: 2 - NetEngValidationChannelId: 9 - NetDev5ChannelId: 131 - NetDev6ChannelId: 1296 - GeneralTestingChannelId: 529 - NETCoreToolingDevChannelId: 548 - NETCoreToolingReleaseChannelId: 549 - NETInternalToolingChannelId: 551 - NETCoreExperimentalChannelId: 562 - NetEngServicesIntChannelId: 678 - NetEngServicesProdChannelId: 679 - NetCoreSDK313xxChannelId: 759 - NetCoreSDK313xxInternalChannelId: 760 - NetCoreSDK314xxChannelId: 921 - NetCoreSDK314xxInternalChannelId: 922 - VS166ChannelId: 1010 - VS167ChannelId: 1011 - VS168ChannelId: 1154 - VSMasterChannelId: 1012 - VS169ChannelId: 1473 - VS1610ChannelId: 1692 + - name: publishDependsOn + type: object + default: + - Validate stages: -- ${{ if or(and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')), eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: +- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - stage: Validate dependsOn: ${{ parameters.validateDependsOn }} displayName: Validate Build Assets variables: - template: common-variables.yml jobs: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}: - - job: - displayName: Post-build Checks - dependsOn: setupMaestroVars - variables: - - name: TargetChannels - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ] - pool: - vmImage: 'windows-2019' - steps: - - task: PowerShell@2 - displayName: Maestro Channels Consistency - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 - arguments: -PromoteToChannels "$(TargetChannels)" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}},${{parameters.VS169ChannelId}},${{parameters.VS1610ChannelId}} - - job: displayName: NuGet Validation - dependsOn: setupMaestroVars condition: eq( ${{ parameters.enableNugetValidation }}, 'true') pool: - vmImage: 'windows-2019' - variables: - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: VSEngSS-MicroBuild2022-1ES + demands: Cmd + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Server.Amd64.VS2019 + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + - task: DownloadBuildArtifacts@0 displayName: Download Package Artifacts inputs: @@ -128,19 +129,22 @@ stages: - job: displayName: Signing Validation - dependsOn: setupMaestroVars condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) - variables: - - template: common-variables.yml - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] pool: - vmImage: 'windows-2019' + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: VSEngSS-MicroBuild2022-1ES + demands: Cmd + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + - task: DownloadBuildArtifacts@0 displayName: Download Package Artifacts inputs: @@ -185,19 +189,22 @@ stages: - job: displayName: SourceLink Validation - dependsOn: setupMaestroVars condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') - variables: - - template: common-variables.yml - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] pool: - vmImage: 'windows-2019' + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: VSEngSS-MicroBuild2022-1ES + demands: Cmd + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: @@ -223,367 +230,46 @@ stages: - template: /eng/common/templates/job/execute-sdl.yml parameters: enable: ${{ parameters.SDLValidationParameters.enable }} - dependsOn: setupMaestroVars additionalParameters: ${{ parameters.SDLValidationParameters.params }} continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} -- ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}: - - stage: publish_using_darc - ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.publishDependsOn }} - ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Publish using Darc - variables: - - template: common-variables.yml - jobs: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} +- stage: publish_using_darc + ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.publishDependsOn }} + ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Publish using Darc + variables: + - template: common-variables.yml + jobs: + - job: + displayName: Publish Using Darc + timeoutInMinutes: 120 + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: VSEngSS-MicroBuild2022-1ES + demands: Cmd + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Server.Amd64.VS2019 + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - job: - displayName: Publish Using Darc - dependsOn: setupMaestroVars - timeoutInMinutes: 120 - variables: - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - pool: - vmImage: 'windows-2019' - steps: - - task: PowerShell@2 - displayName: Publish Using Darc - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion ${{ parameters.PublishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' - -WaitPublishingFinish ${{ parameters.waitPublishingFinish }} - -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }} - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' - -- ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}: - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Dev5_Publish' - channelName: '.NET 5 Dev' - akaMSChannelName: 'net5/dev' - channelId: ${{ parameters.NetDev5ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Dev6_Publish' - channelName: '.NET 6 Dev' - akaMSChannelName: 'net6/dev' - channelId: ${{ parameters.NetDev6ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net_Eng_Latest_Publish' - channelName: '.NET Eng - Latest' - akaMSChannelName: 'eng/daily' - channelId: ${{ parameters.NetEngLatestChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net_Eng_Validation_Publish' - channelName: '.NET Eng - Validation' - akaMSChannelName: 'eng/validation' - channelId: ${{ parameters.NetEngValidationChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'General_Testing_Publish' - channelName: 'General Testing' - akaMSChannelName: 'generaltesting' - channelId: ${{ parameters.GeneralTestingChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_Tooling_Dev_Publishing' - channelName: '.NET Core Tooling Dev' - channelId: ${{ parameters.NETCoreToolingDevChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_Tooling_Release_Publishing' - channelName: '.NET Core Tooling Release' - channelId: ${{ parameters.NETCoreToolingReleaseChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NET_Internal_Tooling_Publishing' - channelName: '.NET Internal Tooling' - channelId: ${{ parameters.NETInternalToolingChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_Experimental_Publishing' - channelName: '.NET Core Experimental' - channelId: ${{ parameters.NETCoreExperimentalChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net_Eng_Services_Int_Publish' - channelName: '.NET Eng Services - Int' - channelId: ${{ parameters.NetEngServicesIntChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net_Eng_Services_Prod_Publish' - channelName: '.NET Eng Services - Prod' - channelId: ${{ parameters.NetEngServicesProdChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_314xx_Publishing' - channelName: '.NET Core SDK 3.1.4xx' - channelId: ${{ parameters.NetCoreSDK314xxChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_314xx_Internal_Publishing' - channelName: '.NET Core SDK 3.1.4xx Internal' - channelId: ${{ parameters.NetCoreSDK314xxInternalChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_313xx_Publishing' - channelName: '.NET Core SDK 3.1.3xx' - channelId: ${{ parameters.NetCoreSDK313xxChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_313xx_Internal_Publishing' - channelName: '.NET Core SDK 3.1.3xx Internal' - channelId: ${{ parameters.NetCoreSDK313xxInternalChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'VS16_6_Publishing' - channelName: 'VS 16.6' - channelId: ${{ parameters.VS166ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'VS16_7_Publishing' - channelName: 'VS 16.7' - channelId: ${{ parameters.VS167ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'VS16_8_Publishing' - channelName: 'VS 16.8' - channelId: ${{ parameters.VS168ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'VS_Master_Publishing' - channelName: 'VS Master' - channelId: ${{ parameters.VSMasterChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'VS_16_9_Publishing' - channelName: 'VS 16.9' - channelId: ${{ parameters.VS169ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'VS_16_10_Publishing' - channelName: 'VS 16.10' - channelId: ${{ parameters.VS1610ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 4a22b2e6f..0c87f149a 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -2,77 +2,69 @@ parameters: BARBuildId: '' PromoteToChannelIds: '' -jobs: -- job: setupMaestroVars - displayName: Setup Maestro Vars - variables: - - template: common-variables.yml - pool: - vmImage: 'windows-2019' - steps: - - checkout: none - - - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download Release Configs - inputs: - buildType: current - artifactName: ReleaseConfigs - checkDownloadedFiles: true - - - task: PowerShell@2 - name: setReleaseVars - displayName: Set Release Configs Vars +steps: + - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Release Configs inputs: - targetType: inline - script: | - try { - if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { - $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt + buildType: current + artifactName: ReleaseConfigs + checkDownloadedFiles: true - $BarId = $Content | Select -Index 0 - $Channels = $Content | Select -Index 1 - $IsStableBuild = $Content | Select -Index 2 + - task: PowerShell@2 + name: setReleaseVars + displayName: Set Release Configs Vars + inputs: + targetType: inline + pwsh: true + script: | + try { + if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { + $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt - $AzureDevOpsProject = $Env:System_TeamProject - $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId - $AzureDevOpsBuildId = $Env:Build_BuildId - } - else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + $BarId = $Content | Select -Index 0 + $Channels = $Content | Select -Index 1 + $IsStableBuild = $Content | Select -Index 2 - $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $apiHeaders.Add('Accept', 'application/json') - $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - - $BarId = $Env:BARBuildId - $Channels = $Env:PromoteToMaestroChannels -split "," - $Channels = $Channels -join "][" - $Channels = "[$Channels]" - - $IsStableBuild = $buildInfo.stable - $AzureDevOpsProject = $buildInfo.azureDevOpsProject - $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId - $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId - } - - Write-Host "##vso[task.setvariable variable=BARBuildId;isOutput=true]$BarId" - Write-Host "##vso[task.setvariable variable=TargetChannels;isOutput=true]$Channels" - Write-Host "##vso[task.setvariable variable=IsStableBuild;isOutput=true]$IsStableBuild" - - Write-Host "##vso[task.setvariable variable=AzDOProjectName;isOutput=true]$AzureDevOpsProject" - Write-Host "##vso[task.setvariable variable=AzDOPipelineId;isOutput=true]$AzureDevOpsBuildDefinitionId" - Write-Host "##vso[task.setvariable variable=AzDOBuildId;isOutput=true]$AzureDevOpsBuildId" + $AzureDevOpsProject = $Env:System_TeamProject + $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId + $AzureDevOpsBuildId = $Env:Build_BuildId } - catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - exit 1 + else { + $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + + $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $apiHeaders.Add('Accept', 'application/json') + $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") + + $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + + $BarId = $Env:BARBuildId + $Channels = $Env:PromoteToMaestroChannels -split "," + $Channels = $Channels -join "][" + $Channels = "[$Channels]" + + $IsStableBuild = $buildInfo.stable + $AzureDevOpsProject = $buildInfo.azureDevOpsProject + $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId + $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId } - env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} + + Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" + Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" + Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" + + Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" + Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" + Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" + } + catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + exit 1 + } + env: + MAESTRO_API_TOKEN: $(MaestroApiAccessToken) + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates/steps/execute-codeql.yml b/eng/common/templates/steps/execute-codeql.yml new file mode 100644 index 000000000..3930b1630 --- /dev/null +++ b/eng/common/templates/steps/execute-codeql.yml @@ -0,0 +1,32 @@ +parameters: + # Language that should be analyzed. Defaults to csharp + language: csharp + # Build Commands + buildCommands: '' + overrideParameters: '' # Optional: to override values for parameters. + additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth + # diagnosis of problems with specific tool configurations. + publishGuardianDirectoryToPipeline: false + # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL + # parameters rather than relying on YAML. It may be better to use a local script, because you can + # reproduce results locally without piecing together a command based on the YAML. + executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1' + # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named + # 'continueOnError', the parameter value is not correctly picked up. + # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter + # optional: determines whether to continue the build if the step errors; + sdlContinueOnError: false + +steps: +- template: /eng/common/templates/steps/execute-sdl.yml + parameters: + overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} + executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} + overrideParameters: ${{ parameters.overrideParameters }} + additionalParameters: '${{ parameters.additionalParameters }} + -CodeQLAdditionalRunConfigParams @("BuildCommands < ${{ parameters.buildCommands }}", "Language < ${{ parameters.language }}")' + publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} + sdlContinueOnError: ${{ parameters.sdlContinueOnError }} \ No newline at end of file diff --git a/global.json b/global.json index 86e408bbe..641ac3ef3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100", + "dotnet": "6.0.101", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21609.4", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21609.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22102.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22102.3" } } From dd985cd8bb0a075befbcf0c98fbc1590f42e9152 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 16:44:12 +0000 Subject: [PATCH 142/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220203.1 (#13162) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages --- NuGet.config | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index ecbd1218a..5b0041b72 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75836c484..ada6e3949 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 - 4643b750ccc93ca151eed888da70b67f0198d1fd + ff99504268983746f7d8e179eac4b88ece7f2817 From 519c661235ae61bbd1586e4513f4936356616b2b Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 3 Feb 2022 10:49:21 -0600 Subject: [PATCH 143/178] Update manifests for MAUI Preview 13 Insertion: https://devdiv.visualstudio.com/DevDiv/_git/VS/commit/38aa7894a1a98073332c3ff0549525ac8a68a53b Bump to: xamarin/xamarin-android/release/6.0.2xx-preview13@d23abbd7 Bump to: xamarin/xamarin-macios/release/6.0.2xx-preview13@88f54c5e Bump to: dotnet/maui/release/6.0.2xx-preview13@8354ef23 The .NET MAUI workload manifests are now 6.0.200. This also uses the builds we are tentatively shipping for Preview 13. Note, that I think xamarin-macios had to adjust their version numbers for other reasons. Their x.x.301 builds should align to 6.0.200. After `.\build.cmd -pack -publish`, manually tested the workloads: > $env:DOTNET_MULTILEVEL_LOOKUP=0 > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install android --skip-manifest-update Installing pack Microsoft.Android.Sdk version 31.0.200-preview.13.41... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install ios --skip-manifest-update Installing pack Microsoft.iOS.Sdk version 15.2.301-preview.13.2... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maccatalyst --skip-manifest-update Installing pack Microsoft.MacCatalyst.Sdk version 15.2.301-preview.13.2... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install macos --skip-manifest-update Installing pack Microsoft.macOS.Sdk version 12.1.301-preview.13.2... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install tvos --skip-manifest-update Installing pack Microsoft.tvOS.Sdk version 15.2.301-preview.13.2... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maui --skip-manifest-update Installing pack Microsoft.Maui.Core.Ref.android version 6.0.200-preview.13.2747... --- eng/Versions.props | 12 ++++++------ src/redist/targets/BundledManifests.targets | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7e95465f2..617b6cf43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,12 +176,12 @@ - 6.0.101-preview.9.1805 - 31.0.101-preview.9.16 - 15.0.101-preview.9.31 - 15.0.101-preview.9.31 - 12.0.101-preview.9.31 - 15.0.101-preview.9.31 + 6.0.200-preview.13.2747 + 31.0.200-preview.13.41 + 15.2.301-preview.13.2 + 15.2.301-preview.13.2 + 12.1.301-preview.13.2 + 15.2.301-preview.13.2 $(MicrosoftNETCoreAppRefPackageVersion) 6.0.0 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index b83c642f3..e485151c6 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -1,11 +1,11 @@ - - - - - - + + + + + + From 5cdd7f9c8e81b61479fa1ac4acbcc3db61e33ecc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 3 Feb 2022 17:10:09 +0000 Subject: [PATCH 144/178] Update dependencies from https://github.com/dotnet/sdk build 20220203.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22076.18 -> To Version 6.0.200-rtm.22103.4 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset From Version 6.0.200-1.22069.1 -> To Version 6.0.200-1.22081.5 (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 0b1574cda..b91e54edc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/sdk - 90364803cdc1eef1c32de4cdce39e08024acdcb4 + db234316ba6592d93da97a7cb1b95b2c2f74bd30 - + https://github.com/dotnet/sdk - 90364803cdc1eef1c32de4cdce39e08024acdcb4 + db234316ba6592d93da97a7cb1b95b2c2f74bd30 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 592501cbb9c9394072a245c15b3458ff88155d85 + f6b9551f8f1dc36af9dd55557fa59c55c2c6b018 diff --git a/eng/Versions.props b/eng/Versions.props index ad09bd6e6..9be670713 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-rtm.22102.30 - 6.0.200-rtm.22102.30 + 6.0.200-rtm.22103.4 + 6.0.200-rtm.22103.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8b453b9eceba5ef77387e1c358471de348371007 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 3 Feb 2022 10:21:02 -0800 Subject: [PATCH 145/178] Update the Versions for 6.0.200 runtime manifests --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 617b6cf43..808808a31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,9 +182,9 @@ 15.2.301-preview.13.2 12.1.301-preview.13.2 15.2.301-preview.13.2 - $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.0 - $(MicrosoftNETWorkloadEmscriptenManifest60100Version) + 6.0.2 + 6.0.1 + $(MicrosoftNETWorkloadEmscriptenManifest60200Version) From 26b2dca100098ab0e0b375bbbb23cf1f633e6a68 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 3 Feb 2022 10:21:04 -0800 Subject: [PATCH 146/178] Updated the runtime manifests --- src/redist/targets/BundledManifests.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index e485151c6..6e8361d80 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -6,8 +6,8 @@ - - + + From a7d8ea65b7375134f74c53810242bdef1e16b72a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 3 Feb 2022 10:21:59 -0800 Subject: [PATCH 147/178] Switch source build package over to 6.0.200 manifests --- .../Arcade/tools/TextOnlyPackages.csproj | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj index 89142c504..b4702ae32 100644 --- a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj +++ b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj @@ -41,14 +41,14 @@ - - - - - - - - + + + + + + + + + From 71f3758b6de714d6615a3cecdd99fcc28809c29d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 3 Feb 2022 21:52:51 +0000 Subject: [PATCH 150/178] Update dependencies from https://github.com/dotnet/sdk build 20220203.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22103.4 -> To Version 6.0.200-rtm.22103.21 --- 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 b91e54edc..b3e638b50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/sdk - db234316ba6592d93da97a7cb1b95b2c2f74bd30 + fa8661c4b3d55b154d8b17c7e4d920be90b77223 - + https://github.com/dotnet/sdk - db234316ba6592d93da97a7cb1b95b2c2f74bd30 + fa8661c4b3d55b154d8b17c7e4d920be90b77223 diff --git a/eng/Versions.props b/eng/Versions.props index 9be670713..053c385d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-rtm.22103.4 - 6.0.200-rtm.22103.4 + 6.0.200-rtm.22103.21 + 6.0.200-rtm.22103.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7f259cacfa2502ea4de91de6abde7b0c47c90d31 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 3 Feb 2022 22:58:08 +0000 Subject: [PATCH 151/178] Update dependencies from https://github.com/dotnet/sdk build 20220203.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22103.4 -> To Version 6.0.200-rtm.22103.24 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22081.5 -> To Version 6.0.200-1.22103.1 (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 b3e638b50..ded3dc263 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/sdk - fa8661c4b3d55b154d8b17c7e4d920be90b77223 + 04f752b60f61e75c14458324c25d8f815f723a11 - + https://github.com/dotnet/sdk - fa8661c4b3d55b154d8b17c7e4d920be90b77223 + 04f752b60f61e75c14458324c25d8f815f723a11 @@ -135,9 +135,9 @@ d3c6439b04452047cb62fc645ce341a034bdb5be - + https://github.com/dotnet/linker - cc3dc76c374152f86ff73aa02f35782b713908c6 + 2b78c5e93b8dd36f4e55ee1e0327e064c0f5e84c linker diff --git a/eng/Versions.props b/eng/Versions.props index 053c385d7..9364bf0df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-rtm.22103.21 - 6.0.200-rtm.22103.21 + 6.0.200-rtm.22103.24 + 6.0.200-rtm.22103.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 681dc6348a35ba399ff662447b9632592bded4ee Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 4 Feb 2022 07:23:58 +0000 Subject: [PATCH 152/178] Update dependencies from https://github.com/dotnet/sdk build 20220203.35 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22103.4 -> To Version 6.0.200-rtm.22103.35 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22081.5 -> To Version 6.0.200-1.22103.1 (parent: Microsoft.NET.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 ded3dc263..7b208eda1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f6749ec0725a81db2491dd83b1c4b665332a7330 - + https://github.com/dotnet/sdk - 04f752b60f61e75c14458324c25d8f815f723a11 + 82104d83fba7ad2710ba4526a645a6b1a490d331 - + https://github.com/dotnet/sdk - 04f752b60f61e75c14458324c25d8f815f723a11 + 82104d83fba7ad2710ba4526a645a6b1a490d331 diff --git a/eng/Versions.props b/eng/Versions.props index 9364bf0df..a81fd8a32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-rtm.22103.24 - 6.0.200-rtm.22103.24 + 6.0.200-rtm.22103.35 + 6.0.200-rtm.22103.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a56db4a33f189ad28d3e54969c908122d422534f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 4 Feb 2022 22:48:34 +0000 Subject: [PATCH 153/178] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220204.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22103.35 -> To Version 6.0.200-rtm.22104.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.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.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,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,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0 -> To Version 6.0.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 +++++++- eng/Version.Details.xml | 126 ++++++++++++++++++++-------------------- eng/Versions.props | 40 ++++++------- 3 files changed, 105 insertions(+), 85 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba0bf48d8..f7517c012 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,27 @@ + + + - + + + - + + + + @@ -38,9 +46,21 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d719466b..293df744e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - - https://github.com/dotnet/windowsdesktop - 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef15b555537a90da229ce6474658ae1a9916a932 + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - - https://github.com/dotnet/windowsdesktop - 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef15b555537a90da229ce6474658ae1a9916a932 + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 3a25a7f1cc446b60678ed25c9d829420d6321eba - - https://github.com/dotnet/aspnetcore - ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 - - - https://github.com/dotnet/aspnetcore - ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 - - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7d976438b0fc17f435804e801d5d68d193ec33 + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7d976438b0fc17f435804e801d5d68d193ec33 + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7d976438b0fc17f435804e801d5d68d193ec33 + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7d976438b0fc17f435804e801d5d68d193ec33 + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace https://github.com/dotnet/test-templates @@ -91,35 +91,35 @@ - https://github.com/dotnet/templating - f6749ec0725a81db2491dd83b1c4b665332a7330 + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + e6d9bf1868c4aa2808714ada839018a8506bd7dd - - https://github.com/dotnet/templating - f6749ec0725a81db2491dd83b1c4b665332a7330 + + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + e6d9bf1868c4aa2808714ada839018a8506bd7dd - https://github.com/dotnet/templating - f6749ec0725a81db2491dd83b1c4b665332a7330 + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + e6d9bf1868c4aa2808714ada839018a8506bd7dd - - https://github.com/dotnet/sdk - 82104d83fba7ad2710ba4526a645a6b1a490d331 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + f9b6be31b19097cb47125075ca2e8322bf591fc0 - - https://github.com/dotnet/sdk - 82104d83fba7ad2710ba4526a645a6b1a490d331 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + f9b6be31b19097cb47125075ca2e8322bf591fc0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 846205b4af05c7a200e1d203536fdc39994b9bd6 + 5ad241b9633924db40503de19cb502bb0aca7718 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0350d04790959e8ebdd3ceab0d34a40f811f019d + fb76229895cae74c1adc62c2411a0730a2f3759b https://github.com/dotnet/fsharp @@ -135,15 +135,15 @@ d3c6439b04452047cb62fc645ce341a034bdb5be - + https://github.com/dotnet/linker - 2b78c5e93b8dd36f4e55ee1e0327e064c0f5e84c + cc3dc76c374152f86ff73aa02f35782b713908c6 linker - + https://github.com/dotnet/roslyn - f6b9551f8f1dc36af9dd55557fa59c55c2c6b018 + 592501cbb9c9394072a245c15b3458ff88155d85 diff --git a/eng/Versions.props b/eng/Versions.props index 85087524b..472e6b2aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.1-servicing.21567.5 + 6.0.2-servicing.22064.7 - 6.0.1-servicing.21567.7 + 6.0.2-servicing.22064.8 @@ -44,20 +44,20 @@ - 6.0.1 - 6.0.0 - 6.0.0-rtm.21526.8 - 6.0.1-servicing.21567.14 - 6.0.1-servicing.21567.14 - 6.0.1-servicing.21567.14 + 6.0.2 + 6.0.2 + 6.0.2-servicing.22064.12 + 6.0.2-servicing.22064.12 + 6.0.2-servicing.22064.12 + 6.0.2-servicing.22064.12 0.2.0 - 6.0.200-rtm.22103.35 - 6.0.200-rtm.22103.35 + 6.0.200-rtm.22104.9 + 6.0.200-rtm.22104.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.1-servicing.21567.5 - 6.0.1-servicing.21567.5 - 6.0.1 - 6.0.1 - 6.0.1 - 6.0.1 + 6.0.2-servicing.22064.6 + 6.0.2-servicing.22064.6 + 6.0.2 + 6.0.2 + 6.0.2 + 6.0.2 2.1.0 - 6.0.1-servicing.21568.2 - 6.0.0-rtm.21523.1 - 6.0.1 - 6.0.0 + 6.0.2-servicing.22064.6 + 6.0.2-servicing.22064.6 + 6.0.2 + 6.0.2 From 6efd1da62e77bbeeb34f48e6e41614ac9a5b5e09 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 4 Feb 2022 15:13:25 -0800 Subject: [PATCH 154/178] Fix up implicit versions --- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 425337024..1cf223da9 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,8 +26,8 @@ 30 - $([MSBuild]::Add($(VersionFeature), 21)) - $([MSBuild]::Add($(VersionFeature), 12)) + $([MSBuild]::Add($(VersionFeature), 22)) + $([MSBuild]::Add($(VersionFeature), 14)) From e0993bd73c2548b5420e3b1158a34d6522adca6f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sat, 5 Feb 2022 06:33:35 +0000 Subject: [PATCH 155/178] Switch to lowercase to match other cases. --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 0cb1be8fe..67c8c46b7 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -392,7 +392,7 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017 + demands: ImageOverride -equals build.windows.10.amd64.vs2017 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: From 9049a306f63b8cde045db941a3367c1b8efd076a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 6 Feb 2022 09:40:53 -0800 Subject: [PATCH 156/178] Update .vsts-ci.yml --- .vsts-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 7fb2a509d..b0386b1bd 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -391,9 +391,9 @@ stages: - Source_Build_Create_Tarball publishUsingPipelines: true pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017 + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: From c506cfba13ac8861afdaaeadacb34fe7f54cde88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 08:32:20 -0800 Subject: [PATCH 157/178] [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#13177) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220205.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22103.1 -> To Version 6.0.0-servicing.22105.1 * Update NuGet.config Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- 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 7ab56a268..442f99b01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 93e08e378eb00a4267ffeca24b6bebb4f6c011ef - + https://github.com/dotnet/source-build-reference-packages - ff99504268983746f7d8e179eac4b88ece7f2817 + a7c8487a49a4343bcbe279ea2f7406138cf98776 From ea4be9c1a74c618fa2dc0019732ac26698e0a7b3 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 8 Feb 2022 13:15:48 -0800 Subject: [PATCH 158/178] [release/6.0.2xx] Windows SDK projection update --- eng/ManualVersions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 953d16ee6..08821b070 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,10 +9,10 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.22 - 10.0.18362.22 - 10.0.19041.22 - 10.0.20348.22 - 10.0.22000.22 + 10.0.17763.23 + 10.0.18362.23 + 10.0.19041.23 + 10.0.20348.23 + 10.0.22000.23 From b2eed32257c6e32a591eab75555eaeb4abeb04b1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 8 Feb 2022 16:03:45 -0800 Subject: [PATCH 159/178] Update Versions.props --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7e4cd7dec..8fd0a8098 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,9 +8,9 @@ 6 0 2 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + servicing $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From f13c273745d511330ad359b0b4891846b942f1e0 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 8 Feb 2022 16:30:48 -0800 Subject: [PATCH 160/178] Update asp.net templates (#13194) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7e4cd7dec..f4bb3872c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.13 + 5.0.14 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 From 080205a5d924c147f61d12952af99fb20fcd75bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Feb 2022 15:16:14 +0000 Subject: [PATCH 161/178] [release/6.0.2xx] Update dependencies from dotnet/arcade (#13188) [release/6.0.2xx] Update dependencies from dotnet/arcade - Update NuGet.config --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/source-build.yml | 15 +++++++++------ global.json | 4 ++-- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 442f99b01..ecab8f9f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 93e08e378eb00a4267ffeca24b6bebb4f6c011ef + fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/arcade - 93e08e378eb00a4267ffeca24b6bebb4f6c011ef + fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/arcade - 93e08e378eb00a4267ffeca24b6bebb4f6c011ef + fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f4bb3872c..6e8ab2e83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22102.3 + 6.0.0-beta.22107.2 diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 5023d36dc..5cd5325d7 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,11 +31,6 @@ parameters: # container and pool. platform: {} - # The default VM host AzDO pool. This should be capable of running Docker containers: almost all - # source-build builds run in Docker, including the default managed platform. - defaultContainerHostPool: - vmImage: ubuntu-20.04 - jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -47,7 +42,15 @@ jobs: container: ${{ parameters.platform.container }} ${{ if eq(parameters.platform.pool, '') }}: - pool: ${{ parameters.defaultContainerHostPool }} + # The default VM host AzDO pool. This should be capable of running Docker containers: almost all + # source-build builds run in Docker, including the default managed platform. + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore1ESPool-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/global.json b/global.json index 641ac3ef3..8d9bc761f 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.22102.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22102.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22107.2" } } From 1a8edd64152a2294ca013c9ad9fbb18039f7e36f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 16:14:00 +0000 Subject: [PATCH 162/178] [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#13213) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages - Update NuGet.config --- 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 ecab8f9f1..7fed04179 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - a7c8487a49a4343bcbe279ea2f7406138cf98776 + 095aaf95c3d1d10a96db5cb3914632bc0c36db81 From e4b687014666351460bc7919e140aa27d2039a16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Feb 2022 15:59:20 +0000 Subject: [PATCH 163/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220215.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22110.1 -> To Version 6.0.0-servicing.22115.1 --- NuGet.config | 1 - eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba0bf48d8..5b0041b72 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7fed04179..3c6675d20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - 095aaf95c3d1d10a96db5cb3914632bc0c36db81 + d933cf368424482afb2bd8aebe6a412932f4fee4 From ec79e28c68e348b611ed5e5bf6134dbb04792f7c Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 16 Feb 2022 01:47:06 -0800 Subject: [PATCH 164/178] Update NuGet.config --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 5b0041b72..ba0bf48d8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + From 332641837ae9e14cc995072e502330503c378991 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 16:32:23 +0000 Subject: [PATCH 165/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220217.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22110.1 -> To Version 6.0.0-servicing.22117.1 --- NuGet.config | 2 -- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba0bf48d8..1eda47b59 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - @@ -17,7 +16,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c6675d20..fefbbd4c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - d933cf368424482afb2bd8aebe6a412932f4fee4 + ed58779fdb436582d28af4a356180090d11e1159 From 7581d578500b52633bbc12aae75f6fcd7145d10b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 06:04:10 +0000 Subject: [PATCH 166/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220217.5 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22110.1 -> To Version 6.0.0-servicing.22117.5 --- NuGet.config | 20 -------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index fca0e2fd5..881f29147 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -17,17 +14,10 @@ - - - - - - - @@ -46,21 +36,11 @@ - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e550fe250..bf2ae550c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - ed58779fdb436582d28af4a356180090d11e1159 + 58acc1f97a4c7b121356ea9b33b7db29b861b81d From 2bd864a550843a36550f9812af075669fa904f9d Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 17 Feb 2022 23:59:48 -0800 Subject: [PATCH 167/178] Merge branch 'release/6.0.2xx' of https://github.com/dotnet/installer into darc-release/6.0.2xx-c4c73741-470d-4e92-aabd-a4c047629eb4 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 881f29147..13a6b5143 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,6 +30,7 @@ + From 694b7a52ec8e06e471036202e68cf80f87c0efcf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Feb 2022 16:09:02 +0000 Subject: [PATCH 168/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220223.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22110.1 -> To Version 6.0.0-servicing.22123.1 --- 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 bf2ae550c..7642e5393 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - 58acc1f97a4c7b121356ea9b33b7db29b861b81d + 55ed31cf6f8046fb4b64d29ac6a7d0bc3ea82d68 From e4d99df28f0621563aa65a7a7cf43e20c5076771 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sun, 27 Feb 2022 22:53:30 -0800 Subject: [PATCH 169/178] Remove api.nuget.org feed --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 13a6b5143..881f29147 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,6 @@ - From 717d2e214b7f66446ddd6a716d1d3e514564b0a2 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Mar 2022 10:55:33 -0800 Subject: [PATCH 170/178] Update branding to 6.0.202 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index aad8526a9..59a79b02a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 2 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From ca993728b60a517db70920298b904a609debf1a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Mar 2022 19:15:30 +0000 Subject: [PATCH 171/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220301.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22110.1 -> To Version 6.0.0-servicing.22151.1 --- 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 7642e5393..4e8c680cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - 55ed31cf6f8046fb4b64d29ac6a7d0bc3ea82d68 + 61308aa42850264930ffef9ad070b04e14ab74f7 From 87a7258c1f3bd64bafb1cb87049a28b8e03281f1 Mon Sep 17 00:00:00 2001 From: Djuradj Kurepa <91743470+dkurepa@users.noreply.github.com> Date: Mon, 22 Nov 2021 08:22:03 -0800 Subject: [PATCH 172/178] Merge pull request #12604 from dkurepa/ResolveComponentGovernance Resolve Component Governance alerts --- src/core-sdk-tasks/AzurePublisher.cs | 3 +-- src/core-sdk-tasks/core-sdk-tasks.csproj | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core-sdk-tasks/AzurePublisher.cs b/src/core-sdk-tasks/AzurePublisher.cs index c537331be..243fad789 100644 --- a/src/core-sdk-tasks/AzurePublisher.cs +++ b/src/core-sdk-tasks/AzurePublisher.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using System.Net.Http; using System.Threading; using System.Threading.Tasks; using Microsoft.WindowsAzure.Storage; @@ -217,4 +216,4 @@ namespace Microsoft.DotNet.Cli.Build } } } -#endif \ No newline at end of file +#endif diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index f4f54d8fb..5ad1f11af 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -15,7 +15,8 @@ - + + From abe53ee3e3d44faa7c8d09ad9a82846c6b45b4e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Mar 2022 23:14:49 +0000 Subject: [PATCH 173/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220303.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22110.1 -> To Version 6.0.0-servicing.22153.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e8c680cb..5477e4412 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - 61308aa42850264930ffef9ad070b04e14ab74f7 + b624d18c4bed40e4b606beb4cd6f3a7a56b08533 From f63e028333a8f3973ecb5d6d2531db477ab466b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Mar 2022 00:12:11 +0000 Subject: [PATCH 174/178] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220304.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22153.2 -> To Version 6.0.0-servicing.22154.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5477e4412..23621072a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - b624d18c4bed40e4b606beb4cd6f3a7a56b08533 + 39632b6f0303b4a3e26fe2ac088f7b501907f5b5 From c3da28feba66bf66f664d423d2bccfd210b5acb4 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 4 Mar 2022 18:43:03 -0800 Subject: [PATCH 175/178] Update 6.0.2xx with the current state of 1xx (#13244) * Update .vsts-ci.yml * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220205.1 (#13179) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages * Override Microsoft.Net.Sdk.WindowsDesktop references during source-build in Roslyn (#13093) * override SDK for Microsoft.Net.Sdk.WindowsDesktop references in roslyn * add new EmptySdk in the source build tarball * remove roslyn solution filter patch * Update dependencies from https://github.com/dotnet/arcade build 20220207.2 (#13186) Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22102.3 -> To Version 6.0.0-beta.22107.2 Co-authored-by: dotnet-maestro[bot] * [release/6.0.1xx] Windows SDK projection update * Update asp.net templates (#13193) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220210.1 (#13215) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages * Add test to compare msft and sb sdk contents (#13153) * Update to SDK and previously-source-built 6.0.102. (#13221) * Add CentOS Stream 9 container to CI matrix (#12955) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220215.1 (#13229) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages * Gather additional smoke test prereqs (#13233) * Remove bootstrapping for CI builds now that we use CentOS7 previously-source-built (#13232) * Update Version.Details.xml * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220303.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22151.1 -> To Version 6.0.0-servicing.22153.2 Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Logan Bussell Co-authored-by: dotnet-maestro[bot] Co-authored-by: Sean Reeser Co-authored-by: Manodasan Wignarajah Co-authored-by: William Godbe Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: Michael Simons Co-authored-by: Chris Rummel Co-authored-by: Omair Majid --- eng/Version.Details.xml | 4 +- eng/Versions.props | 2 +- eng/source-build-tarball-build-official.yml | 2 +- eng/source-build-tarball-build.yml | 2 +- .../job/source-build-run-tarball-build.yml | 66 +- .../steps/source-build-build-tarball.yml | 45 +- src/SourceBuild/tarball/content/build.proj | 20 +- src/SourceBuild/tarball/content/global.json | 2 +- .../content/repos/Directory.Build.props | 1 + .../tarball/content/repos/roslyn.proj | 1 + .../BaselineHelper.cs | 31 + .../Config.cs | 6 +- .../DotNetHelper.cs | 21 +- .../ExecuteHelper.cs | 23 +- .../SdkContentTests.cs | 92 + .../XmlDocTests.cs | 7 +- .../baselines/MsftToSbSdk.diff | 1481 +++++++++++++++++ .../smoke-tests/smoke-test.sh | 4 + .../tools-local/EmptySdk/Sdk/Sdk.props | 14 + .../tools-local/EmptySdk/Sdk/Sdk.targets | 9 + ...05-Build-a-subset-of-roslyn-projects.patch | 146 -- 21 files changed, 1766 insertions(+), 213 deletions(-) create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff create mode 100644 src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props create mode 100644 src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.targets delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5477e4412..8d678e880 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 1ec2e17fcfd86bdd6f7e7246b6d527e94e34c15a + e8ffccbd683205bf94e406e43556f8baca07dc5b https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 59a79b02a..eb9e4941c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,7 +172,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.1-1 + 6.0.2 diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 3f8f08321..a230a4d7c 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -11,4 +11,4 @@ stages: jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml parameters: - tarballResourceId: installer-build-resource + installerBuildResourceId: installer-build-resource diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml index a800f5849..18dbe8324 100644 --- a/eng/source-build-tarball-build.yml +++ b/eng/source-build-tarball-build.yml @@ -11,4 +11,4 @@ stages: jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml parameters: - tarballResourceId: installer-build-resource + installerBuildResourceId: installer-build-resource 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 6330a1529..a0db3872f 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 @@ -7,13 +7,15 @@ parameters: # Dependent jobs that must be completed before this job will run dependsOn: - # The resource id of the tarball to download and build - tarballResourceId: current + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: current # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- + buildJobTimeout: 300 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 + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c 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 @@ -38,37 +40,49 @@ jobs: strategy: matrix: CentOS7-Online: - _BootstrapPrep: true + _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.centOS7Container }} _ExcludeOmniSharpTests: true + _Platform: linux _RunOnline: true + CentOS7-Offline: + _BootstrapPrep: false + _BuildArch: x64 + _Container: ${{ parameters.centOS7Container }} + _ExcludeOmniSharpTests: true + _Platform: linux + _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - CentOS7-Offline: - _BootstrapPrep: true - _BuildArch: x64 - _Container: ${{ parameters.centOS7Container }} - _ExcludeOmniSharpTests: true - _RunOnline: false CentOS8-Offline: - _BootstrapPrep: true + _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.centOS8Container }} _ExcludeOmniSharpTests: false + _Platform: linux + _RunOnline: false + CentOSStream9-Offline: + _BootstrapPrep: false + _BuildArch: x64 + _Container: ${{ parameters.centOSStream9Container }} + _ExcludeOmniSharpTests: false + _Platform: linux _RunOnline: false Fedora33-Offline: _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.fedora33Container }} _ExcludeOmniSharpTests: false + _Platform: linux _RunOnline: false Ubuntu1804-Offline: - _BootstrapPrep: true + _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.ubuntu1804Container }} _ExcludeOmniSharpTests: false + _Platform: linux _RunOnline: false - timeoutInMinutes: 300 + timeoutInMinutes: ${{ parameters.buildJobTimeout }} variables: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - group: AzureDevOps-Artifact-Feeds-Pats @@ -79,20 +93,13 @@ jobs: - checkout: self clean: true - - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - task: Bash@3 - displayName: Setup Private Feeds Credentials - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - arguments: $(Build.SourcesDirectory)/NuGet.config $Token - env: - Token: $(dn-bot-dnceng-artifact-feeds-rw) - - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml parameters: buildArch: $(_BuildArch) container: $(_Container) excludeOmniSharpTests: $(_ExcludeOmniSharpTests) + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + platform: $(_Platform) prepScript: | set -x @@ -104,7 +111,6 @@ jobs: docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs} runOnline: $(_RunOnline) tarballDir: ${{ parameters.tarballDir }} - tarballResourceId: ${{ parameters.tarballResourceId }} - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - job: Rebuild_Tarball @@ -121,8 +127,9 @@ jobs: _PreviousSourceBuildArtifact: Build Tarball Fedora33-Offline_Artifacts _BuildArch: x64 _Container: ${{ parameters.fedora33Container }} + _Platform: linux _RunOnline: false - timeoutInMinutes: 180 + timeoutInMinutes: ${{ parameters.buildJobTimeout }} variables: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - group: AzureDevOps-Artifact-Feeds-Pats @@ -133,15 +140,6 @@ jobs: - checkout: self clean: true - - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - task: Bash@3 - displayName: Setup Private Feeds Credentials - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - arguments: $(Build.SourcesDirectory)/NuGet.config $Token - env: - Token: $(dn-bot-dnceng-artifact-feeds-rw) - - download: current artifact: $(_PreviousSourceBuildArtifact) patterns: '*.tar.gz' @@ -159,6 +157,9 @@ jobs: additionalBuildArgs: --with-sdk /tarball/.dotnet buildArch: $(_BuildArch) container: $(_Container) + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + isBootstrapped: true + platform: $(_Platform) prepScript: | set -x @@ -168,4 +169,3 @@ jobs: eval rm -f "$tarballFilePath" 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 cfb965134..200a934b7 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 @@ -13,6 +13,15 @@ parameters: # Skip running the OmniSharp smoke-tests excludeOmniSharpTests: false + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: null + + # Whether or not this is a bootstrapped build + isBootstrapped: false + + # Platform the build is running on (linux, osx, win) + platform: null + # Script logic to prep the tarball for building prepScript: null @@ -22,21 +31,32 @@ parameters: # Directory to build the tarball in tarballDir: - # Resource id of the tarball to download and build - tarballResourceId: null - steps: - - download: ${{ parameters.tarballResourceId }} + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - download: ${{ parameters.installerBuildResourceId }} artifact: BlobArtifacts patterns: '**/dotnet-sdk-source*.tar.gz' - displayName: Download Tarball + displayName: Download Source Tarball + + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-!(*-*)-${{ parameters.platform }}-${{ parameters.buildArch }}.tar.gz' + displayName: Download MSFT sdk Tarball - script: | set -x resourceIdPathSegment= - if [ '${{ parameters.tarballResourceId }}' != 'current' ]; then - resourceIdPathSegment='${{ parameters.tarballResourceId }}/' + if [ '${{ parameters.installerBuildResourceId }}' != 'current' ]; then + resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' fi mkdir -p "${{ parameters.tarballDir }}" @@ -70,7 +90,16 @@ steps: rm -f ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config cp NuGet.config ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config - docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball -e EXCLUDE_OMNISHARP_TESTS=${{ parameters.excludeOmniSharpTests}} ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} + dockerVolumeArgs="-v ${{ parameters.tarballDir }}:/tarball" + dockerEnvArgs="-e EXCLUDE_OMNISHARP_TESTS=${{ parameters.excludeOmniSharpTests}}" + + if [ '${{ parameters.isBootstrapped}}' != 'true' && '${{ parameters.installerBuildResourceId }}' != 'current' ]; then + dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-${{ parameters.Platform }}-${{ parameters.buildArch }}.tar.gz" -exec basename {} \;) + dockerEnvArgs+=" -e MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" + fi + + docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs ${{ 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/build.proj b/src/SourceBuild/tarball/content/build.proj index 9c59468f6..f2bdcbe28 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -106,9 +106,23 @@ " /> - + Condition="'$(SkipSmokeTestPrereqsTarballCreation)' != 'true'" + DependsOnTargets=" + CheckIfCreateSmokeTestPrereqsExistToPack; + CreateCreateSmokeTestPrereqsTarballIfPrereqsExist"/> + + + + + + + + + + $(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).tar.gz @@ -116,7 +130,7 @@ - + diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 39f48573d..5874e648b 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.200-preview.21603.2" + "dotnet": "6.0.200" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 69dab2b18..e61a6e689 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -154,5 +154,6 @@ + diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj index 6aeeebdf2..0f43286ce 100644 --- a/src/SourceBuild/tarball/content/repos/roslyn.proj +++ b/src/SourceBuild/tarball/content/repos/roslyn.proj @@ -45,6 +45,7 @@ + diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs index 73c2951f7..3fc18b357 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs @@ -4,9 +4,11 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Linq; using Xunit; +using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests { @@ -32,6 +34,35 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests Assert.Null(message); } + public static void Compare(string baselineFileName, string actual, ITestOutputHelper outputHelper) + { + string baselineFilePath = GetBaselineFilePath(baselineFileName); + string baseline = File.ReadAllText(baselineFilePath); + + string? message = null; + if (baseline != actual) + { + string actualBaselineFilePath = Path.Combine(Environment.CurrentDirectory, $"{baselineFileName}"); + File.WriteAllText(actualBaselineFilePath, actual); + + // Retrieve a diff in order to provide a UX which calls out the diffs. + string diff = DiffFiles(baselineFilePath, actualBaselineFilePath, outputHelper); + message = $"{Environment.NewLine}Baseline '{baselineFilePath}' does not match actual '{actualBaselineFilePath}`. {Environment.NewLine}" + + $"{diff}{Environment.NewLine}"; + } + + Assert.Null(message); + } + + public static string DiffFiles(string file1Path, string file2Path, ITestOutputHelper outputHelper) + { + (Process Process, string StdOut, string StdErr) diffResult = + ExecuteHelper.ExecuteProcess("git", $"diff --no-index {file1Path} {file2Path}", outputHelper); + Assert.Equal(1, diffResult.Process.ExitCode); + + return diffResult.StdOut; + } + private static string GetBaselineFilePath(string baselineFileName) => Path.Combine(Directory.GetCurrentDirectory(), "baselines", baselineFileName); } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs index be0e6b411..11c3ed821 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs @@ -3,17 +3,21 @@ // See the LICENSE file in the project root for more information. using System; +using System.IO; namespace Microsoft.DotNet.SourceBuild.SmokeTests; internal static class Config { - public static string DotNetDirectory { get; } = Environment.GetEnvironmentVariable("DOTNET_DIR") ?? "./.dotnet"; + public static string DotNetDirectory { get; } = + Environment.GetEnvironmentVariable("DOTNET_DIR") ?? Path.Combine(Directory.GetCurrentDirectory(), ".dotnet"); public static string DotNetTarballPath { get; } = Environment.GetEnvironmentVariable(DotNetTarballPathEnv) ?? string.Empty; public const string DotNetTarballPathEnv = "DOTNET_TARBALL_PATH"; public static bool ExcludeOmniSharpTests { get; } = bool.TryParse(Environment.GetEnvironmentVariable("EXCLUDE_OMNISHARP_TESTS"), out bool excludeOmniSharpTests) ? excludeOmniSharpTests : false; public static bool ExcludeOnlineTests { get; } = bool.TryParse(Environment.GetEnvironmentVariable("EXCLUDE_ONLINE_TESTS"), out bool excludeOnlineTests) ? excludeOnlineTests : false; + public static string MsftSdkTarballPath { get; } = Environment.GetEnvironmentVariable(MsftSdkTarballPathEnv) ?? string.Empty; + public const string MsftSdkTarballPathEnv = "MSFT_SDK_TARBALL_PATH"; public static string TargetRid { get; } = Environment.GetEnvironmentVariable("TARGET_RID") ?? string.Empty; } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index 5a6716030..d3385c37e 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -12,24 +12,27 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; internal class DotNetHelper { + private static readonly object s_lockObj = new object(); + public string DotNetPath { get; } - public string DotNetInstallDirectory { get; } public DotNetHelper(ITestOutputHelper outputHelper) { - if (!Directory.Exists(Config.DotNetDirectory)) + lock (s_lockObj) { - if (!File.Exists(Config.DotNetTarballPath)) + if (!Directory.Exists(Config.DotNetDirectory)) { - throw new InvalidOperationException($"Tarball path '{Config.DotNetTarballPath}' specified in {Config.DotNetTarballPathEnv} does not exist."); - } + if (!File.Exists(Config.DotNetTarballPath)) + { + throw new InvalidOperationException($"Tarball path '{Config.DotNetTarballPath}' specified in {Config.DotNetTarballPathEnv} does not exist."); + } - Directory.CreateDirectory(Config.DotNetDirectory); - ExecuteHelper.ExecuteProcess("tar", $"xzf {Config.DotNetTarballPath} -C {Config.DotNetDirectory}", outputHelper); + Directory.CreateDirectory(Config.DotNetDirectory); + ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {Config.DotNetTarballPath} -C {Config.DotNetDirectory}", outputHelper); + } } - DotNetInstallDirectory = Path.Combine(Directory.GetCurrentDirectory(), Config.DotNetDirectory); - DotNetPath = Path.Combine(DotNetInstallDirectory, "dotnet"); + DotNetPath = Path.Combine(Config.DotNetDirectory, "dotnet"); } public void ExecuteDotNetCmd(string args, ITestOutputHelper outputHelper) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs index 2c38e43ca..497211ba1 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using System.Diagnostics; using System.Linq; using System.Text; @@ -12,7 +13,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; internal static class ExecuteHelper { public static (Process Process, string StdOut, string StdErr) ExecuteProcess( - string fileName, string args, ITestOutputHelper outputHelper) + string fileName, string args, ITestOutputHelper outputHelper, bool logOutput = false) { outputHelper.WriteLine($"Executing: {fileName} {args}"); @@ -47,17 +48,33 @@ internal static class ExecuteHelper process.WaitForExit(); string output = stdOutput.ToString().Trim(); - if (outputHelper != null && !string.IsNullOrWhiteSpace(output)) + if (logOutput && !string.IsNullOrWhiteSpace(output)) { outputHelper.WriteLine(output); } string error = stdError.ToString().Trim(); - if (outputHelper != null && !string.IsNullOrWhiteSpace(error)) + if (logOutput && !string.IsNullOrWhiteSpace(error)) { outputHelper.WriteLine(error); } return (process, output, error); } + + public static string ExecuteProcessValidateExitCode(string fileName, string args, ITestOutputHelper outputHelper) + { + (Process Process, string StdOut, string StdErr) result = ExecuteHelper.ExecuteProcess(fileName, args, outputHelper); + + if (result.Process.ExitCode != 0) + { + ProcessStartInfo startInfo = result.Process.StartInfo; + string msg = $"Failed to execute {startInfo.FileName} {startInfo.Arguments}" + + $"{Environment.NewLine}Exit code: {result.Process.ExitCode}" + + $"{Environment.NewLine}Standard Error: {result.StdErr}"; + throw new InvalidOperationException(msg); + } + + return result.StdOut; + } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs new file mode 100644 index 000000000..774d76c33 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs @@ -0,0 +1,92 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text.RegularExpressions; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +public class SdkContentTests +{ + private ITestOutputHelper OutputHelper { get; } + private DotNetHelper DotNetHelper { get; } + + public SdkContentTests(ITestOutputHelper outputHelper) + { + OutputHelper = outputHelper; + DotNetHelper = new DotNetHelper(outputHelper); + } + + /// + /// Verifies the file layout of the source built sdk tarball to the Microsoft build. + /// The differences are captured in baselines/MsftToSbSdkDiff.txt. + /// Version numbers that appear in paths are compared but are stripped from the baseline. + /// This makes the baseline durable between releases. This does mean however, entries + /// in the baseline may appear identical if the diff is version specific. + /// + [Fact] + public void CompareMsftToSb() + { + if (string.IsNullOrWhiteSpace(Config.MsftSdkTarballPath)) + { + OutputHelper.WriteLine($"skipping {nameof(CompareMsftToSb)} because {Config.MsftSdkTarballPathEnv} was not specified."); + return; + } + + if (!File.Exists(Config.MsftSdkTarballPath)) + { + throw new InvalidOperationException($"Tarball path '{Config.MsftSdkTarballPath}' specified in {Config.MsftSdkTarballPathEnv} does not exist."); + } + + const string msftFileListingFileName = "msftSdkFiles.txt"; + const string sbFileListingFileName = "sbSdkFiles.txt"; + WriteTarballFileList(Config.MsftSdkTarballPath, msftFileListingFileName); + WriteTarballFileList(Config.DotNetTarballPath, sbFileListingFileName); + + string diff = BaselineHelper.DiffFiles(msftFileListingFileName, sbFileListingFileName, OutputHelper); + diff = RemoveVersionedPaths(diff); + diff = RemoveDiffMarkers(diff); + diff = RemoveRids(diff); + BaselineHelper.Compare("MsftToSbSdk.diff", diff, OutputHelper); + } + + private void WriteTarballFileList(string tarballPath, string outputFileName) + { + string fileListing = ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"tf {tarballPath}", OutputHelper); + IEnumerable files = fileListing.Split(Environment.NewLine).OrderBy(path => path); + File.WriteAllLines(outputFileName, files); + } + + private static string RemoveDiffMarkers(string source) + { + Regex indexRegex = new("^index .*", RegexOptions.Multiline); + string result = indexRegex.Replace(source, "index ------------"); + + Regex diffSegmentRegex = new("^@@ .* @@", RegexOptions.Multiline); + return diffSegmentRegex.Replace(result, "@@ ------------ @@"); + } + + private string RemoveRids(string diff) => diff.Replace(Config.TargetRid, "bannana.rid"); + + private static string RemoveVersionedPaths(string source) + { + // Remove semantic version path segments + string pathSeparator = Regex.Escape(Path.DirectorySeparatorChar.ToString()); + // Regex source: https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string + Regex semanticVersionRegex = new( + $"{pathSeparator}(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)" + + $"(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))" + + $"?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?{pathSeparator}"); + string result = semanticVersionRegex.Replace(source, $"{Path.DirectorySeparatorChar}x.y.z{Path.DirectorySeparatorChar}"); + + // Remove net.x.y path segments + Regex netTfmRegex = new($"{pathSeparator}net[1-9]*.[0-9]{pathSeparator}"); + return netTfmRegex.Replace(result, $"{Path.DirectorySeparatorChar}netx.y{Path.DirectorySeparatorChar}"); + } +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs index dd4cadf70..01168ef4e 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.IO; using Xunit; using Xunit.Abstractions; -using System; using System.Linq; namespace Microsoft.DotNet.SourceBuild.SmokeTests; @@ -31,7 +30,7 @@ public class XmlDocTests { List missingXmlDoc = new(); - string targetingPacksDirectory = Path.Combine(DotNetHelper.DotNetInstallDirectory, "packs"); + string targetingPacksDirectory = Path.Combine(Config.DotNetDirectory, "packs"); foreach (string targetingPackAssembly in Directory.EnumerateFiles(targetingPacksDirectory, "*.dll", SearchOption.AllDirectories)) { if (targetingPackAssembly.EndsWith("resources.dll")) @@ -42,8 +41,8 @@ public class XmlDocTests string xmlFile = Path.ChangeExtension(targetingPackAssembly, ".xml"); if (!File.Exists(xmlFile)) { - string pathWithoutPacksPrefix = xmlFile.Substring(targetingPacksDirectory.Length + 1); - String[] pathParts = pathWithoutPacksPrefix.Split(Path.DirectorySeparatorChar); + string pathWithoutPacksPrefix = xmlFile[(targetingPacksDirectory.Length + 1)..]; + string[] pathParts = pathWithoutPacksPrefix.Split(Path.DirectorySeparatorChar); string pathWithoutVersion = string.Join(Path.DirectorySeparatorChar, pathParts.Take(1).Concat(pathParts.Skip(2))); missingXmlDoc.Add(pathWithoutVersion); } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff new file mode 100644 index 000000000..0a153ba87 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff @@ -0,0 +1,1481 @@ +diff --git a/msftSdkFiles.txt b/sbSdkFiles.txt +index ------------ +--- a/msftSdkFiles.txt ++++ b/sbSdkFiles.txt +@@ ------------ @@ + ./host/fxr/x.y.z/ + ./host/fxr/x.y.z/libhostfxr.so + ./LICENSE.txt ++./metadata/ ++./metadata/workloads/ ++./metadata/workloads/x.y.z/ ++./metadata/workloads/x.y.z/userlocal + ./packs/ + ./packs/Microsoft.AspNetCore.App.Ref/ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ +@@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml +-./packs/Microsoft.NETCore.App.Host.linux-x64/ +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/ +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/ +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/ +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/ +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/apphost +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/coreclr_delegates.h +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/hostfxr.h +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/libnethost.a +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/libnethost.so +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/nethost.h +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/singlefilehost ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml ++./packs/Microsoft.NETCore.App.Host.bannana.rid/ ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/ ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/ ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/ ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/ ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/apphost ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/coreclr_delegates.h ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/hostfxr.h ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/libnethost.a ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/libnethost.so ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/nethost.h ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/singlefilehost + ./packs/Microsoft.NETCore.App.Ref/ + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ + ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ +@@ ------------ @@ + ./sdk/x.y.z/AppHostTemplate/apphost + ./sdk/x.y.z/cs/ + ./sdk/x.y.z/cs/dotnet.resources.dll +-./sdk/x.y.z/cs/Microsoft.Build.NuGetSdkResolver.resources.dll + ./sdk/x.y.z/cs/Microsoft.Build.resources.dll + ./sdk/x.y.z/cs/Microsoft.Build.Tasks.Core.resources.dll + ./sdk/x.y.z/cs/Microsoft.Build.Utilities.Core.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/cs/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/cs/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/cs/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/cs/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/cs/Microsoft.VisualStudio.Coverage.IO.resources.dll +-./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Client.resources.dll +-./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/cs/MSBuild.resources.dll +-./sdk/x.y.z/cs/NuGet.Build.Tasks.Console.resources.dll +-./sdk/x.y.z/cs/NuGet.Build.Tasks.resources.dll +-./sdk/x.y.z/cs/NuGet.CommandLine.XPlat.resources.dll +-./sdk/x.y.z/cs/NuGet.Commands.resources.dll +-./sdk/x.y.z/cs/NuGet.Common.resources.dll +-./sdk/x.y.z/cs/NuGet.Configuration.resources.dll +-./sdk/x.y.z/cs/NuGet.Credentials.resources.dll +-./sdk/x.y.z/cs/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/cs/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/cs/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/cs/NuGet.Localization.resources.dll +-./sdk/x.y.z/cs/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/cs/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/cs/NuGet.Packaging.resources.dll +-./sdk/x.y.z/cs/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/cs/NuGet.Protocol.resources.dll +-./sdk/x.y.z/cs/NuGet.Resolver.resources.dll +-./sdk/x.y.z/cs/NuGet.Versioning.resources.dll +-./sdk/x.y.z/cs/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/cs/System.CommandLine.resources.dll +-./sdk/x.y.z/cs/vstest.console.resources.dll + ./sdk/x.y.z/Current/ + ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ + ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ImportAfter/ +@@ ------------ @@ + ./sdk/x.y.z/datacollector.runtimeconfig.json + ./sdk/x.y.z/de/ + ./sdk/x.y.z/de/dotnet.resources.dll +-./sdk/x.y.z/de/Microsoft.Build.NuGetSdkResolver.resources.dll + ./sdk/x.y.z/de/Microsoft.Build.resources.dll + ./sdk/x.y.z/de/Microsoft.Build.Tasks.Core.resources.dll + ./sdk/x.y.z/de/Microsoft.Build.Utilities.Core.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/de/Microsoft.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/de/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/de/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/de/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/de/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/de/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/de/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/de/Microsoft.VisualStudio.Coverage.IO.resources.dll +-./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Client.resources.dll +-./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/de/MSBuild.resources.dll +-./sdk/x.y.z/de/NuGet.Build.Tasks.Console.resources.dll +-./sdk/x.y.z/de/NuGet.Build.Tasks.resources.dll +-./sdk/x.y.z/de/NuGet.CommandLine.XPlat.resources.dll +-./sdk/x.y.z/de/NuGet.Commands.resources.dll +-./sdk/x.y.z/de/NuGet.Common.resources.dll +-./sdk/x.y.z/de/NuGet.Configuration.resources.dll +-./sdk/x.y.z/de/NuGet.Credentials.resources.dll +-./sdk/x.y.z/de/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/de/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/de/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/de/NuGet.Localization.resources.dll +-./sdk/x.y.z/de/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/de/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/de/NuGet.Packaging.resources.dll +-./sdk/x.y.z/de/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/de/NuGet.Protocol.resources.dll +-./sdk/x.y.z/de/NuGet.Resolver.resources.dll +-./sdk/x.y.z/de/NuGet.Versioning.resources.dll +-./sdk/x.y.z/de/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/de/System.CommandLine.resources.dll +-./sdk/x.y.z/de/vstest.console.resources.dll + ./sdk/x.y.z/dotnet-watch.deps.json + ./sdk/x.y.z/dotnet-watch.runtimeconfig.json + ./sdk/x.y.z/dotnet.deps.json +@@ ------------ @@ + ./sdk/x.y.z/dotnet.runtimeconfig.json + ./sdk/x.y.z/DotnetTools/ + ./sdk/x.y.z/DotnetTools/dotnet-dev-certs/ +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/ +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/ +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/ +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.deps.json +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.dll +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.runtimeconfig.json +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/DotnetToolSettings.xml ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/ ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/ ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/ ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.deps.json ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.dll ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.runtimeconfig.json ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/DotnetToolSettings.xml + ./sdk/x.y.z/DotnetTools/dotnet-format/ + ./sdk/x.y.z/DotnetTools/dotnet-format/cs/ + ./sdk/x.y.z/DotnetTools/dotnet-format/cs/dotnet-format.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/ru/System.CommandLine.resources.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Collections.Immutable.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/System.CommandLine.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/System.CommandLine.Rendering.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.AttributedModel.dll +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.Hosting.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.Runtime.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.TypedParts.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Diagnostics.DiagnosticSource.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/System.IO.Pipelines.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Reflection.Metadata.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Runtime.CompilerServices.Unsafe.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ + ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-format/zh-Hant/Microsoft.CodeAnalysis.Workspaces.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/zh-Hant/System.CommandLine.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/ +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/ +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/SecretManager.targets +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.deps.json +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.runtimeconfig.json +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/DotnetToolSettings.xml +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Abstractions.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.FileExtensions.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Json.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.UserSecrets.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Abstractions.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Physical.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/SecretManager.targets ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.deps.json ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.runtimeconfig.json ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/DotnetToolSettings.xml ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Abstractions.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.FileExtensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Json.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.UserSecrets.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Abstractions.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Physical.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Runtime.CompilerServices.Unsafe.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/ +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Hosting.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Runtime.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.TypedParts.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.IO.Pipelines.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Runtime.CompilerServices.Unsafe.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/DotNetWatch.targets + ./sdk/x.y.z/es/ + ./sdk/x.y.z/es/dotnet.resources.dll +-./sdk/x.y.z/es/Microsoft.Build.NuGetSdkResolver.resources.dll + ./sdk/x.y.z/es/Microsoft.Build.resources.dll + ./sdk/x.y.z/es/Microsoft.Build.Tasks.Core.resources.dll + ./sdk/x.y.z/es/Microsoft.Build.Utilities.Core.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/es/Microsoft.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/es/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/es/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/es/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/es/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/es/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/es/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/es/Microsoft.VisualStudio.Coverage.IO.resources.dll +-./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Client.resources.dll +-./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/es/MSBuild.resources.dll +-./sdk/x.y.z/es/NuGet.Build.Tasks.Console.resources.dll +-./sdk/x.y.z/es/NuGet.Build.Tasks.resources.dll +-./sdk/x.y.z/es/NuGet.CommandLine.XPlat.resources.dll +-./sdk/x.y.z/es/NuGet.Commands.resources.dll +-./sdk/x.y.z/es/NuGet.Common.resources.dll +-./sdk/x.y.z/es/NuGet.Configuration.resources.dll +-./sdk/x.y.z/es/NuGet.Credentials.resources.dll +-./sdk/x.y.z/es/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/es/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/es/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/es/NuGet.Localization.resources.dll +-./sdk/x.y.z/es/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/es/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/es/NuGet.Packaging.resources.dll +-./sdk/x.y.z/es/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/es/NuGet.Protocol.resources.dll +-./sdk/x.y.z/es/NuGet.Resolver.resources.dll +-./sdk/x.y.z/es/NuGet.Versioning.resources.dll +-./sdk/x.y.z/es/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/es/System.CommandLine.resources.dll +-./sdk/x.y.z/es/vstest.console.resources.dll + ./sdk/x.y.z/Extensions/ +-./sdk/x.y.z/Extensions/cs/ +-./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/de/ +-./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/es/ +-./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/fr/ +-./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/it/ +-./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/ja/ +-./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/ko/ +-./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/Microsoft.Diagnostics.NETCore.Client.dll + ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.BlameDataCollector.dll + ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.EventLogCollector.dll + ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.TestHostRuntimeProvider.dll + ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll + ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll +-./sdk/x.y.z/Extensions/pl/ +-./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/pt-BR/ +-./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/ru/ +-./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/tr/ +-./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/zh-Hans/ +-./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/zh-Hant/ +-./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll + ./sdk/x.y.z/fr/ + ./sdk/x.y.z/fr/dotnet.resources.dll +-./sdk/x.y.z/fr/Microsoft.Build.NuGetSdkResolver.resources.dll + ./sdk/x.y.z/fr/Microsoft.Build.resources.dll + ./sdk/x.y.z/fr/Microsoft.Build.Tasks.Core.resources.dll + ./sdk/x.y.z/fr/Microsoft.Build.Utilities.Core.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/fr/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/fr/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/fr/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/fr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/fr/Microsoft.VisualStudio.Coverage.IO.resources.dll +-./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll +-./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/fr/MSBuild.resources.dll +-./sdk/x.y.z/fr/NuGet.Build.Tasks.Console.resources.dll +-./sdk/x.y.z/fr/NuGet.Build.Tasks.resources.dll +-./sdk/x.y.z/fr/NuGet.CommandLine.XPlat.resources.dll +-./sdk/x.y.z/fr/NuGet.Commands.resources.dll +-./sdk/x.y.z/fr/NuGet.Common.resources.dll +-./sdk/x.y.z/fr/NuGet.Configuration.resources.dll +-./sdk/x.y.z/fr/NuGet.Credentials.resources.dll +-./sdk/x.y.z/fr/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/fr/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/fr/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/fr/NuGet.Localization.resources.dll +-./sdk/x.y.z/fr/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/fr/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/fr/NuGet.Packaging.resources.dll +-./sdk/x.y.z/fr/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/fr/NuGet.Protocol.resources.dll +-./sdk/x.y.z/fr/NuGet.Resolver.resources.dll +-./sdk/x.y.z/fr/NuGet.Versioning.resources.dll +-./sdk/x.y.z/fr/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/fr/System.CommandLine.resources.dll +-./sdk/x.y.z/fr/vstest.console.resources.dll + ./sdk/x.y.z/FSharp/ + ./sdk/x.y.z/FSharp/cs/ + ./sdk/x.y.z/FSharp/cs/FSharp.Build.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/FSharp/Microsoft.FSharp.Targets + ./sdk/x.y.z/FSharp/Microsoft.NET.StringTools.dll + ./sdk/x.y.z/FSharp/Microsoft.Portable.FSharp.Targets +-./sdk/x.y.z/FSharp/Microsoft.Win32.SystemEvents.dll + ./sdk/x.y.z/FSharp/pl/ + ./sdk/x.y.z/FSharp/pl/FSharp.Build.resources.dll + ./sdk/x.y.z/FSharp/pl/FSharp.Compiler.Interactive.Settings.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/FSharp/ru/FSharp.Compiler.Service.resources.dll + ./sdk/x.y.z/FSharp/ru/FSharp.Core.resources.dll + ./sdk/x.y.z/FSharp/ru/FSharp.DependencyManager.Nuget.resources.dll +-./sdk/x.y.z/FSharp/runtimes/ +-./sdk/x.y.z/FSharp/runtimes/unix/ +-./sdk/x.y.z/FSharp/runtimes/unix/lib/ +-./sdk/x.y.z/FSharp/runtimes/unix/lib/netcoreapp3.0/ +-./sdk/x.y.z/FSharp/runtimes/unix/lib/netcoreapp3.0/System.Drawing.Common.dll +-./sdk/x.y.z/FSharp/runtimes/win/ +-./sdk/x.y.z/FSharp/runtimes/win/lib/ +-./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/ +-./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll +-./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll +-./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll +-./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll +-./sdk/x.y.z/FSharp/runtimes/win/lib/netstandard2.0/ +-./sdk/x.y.z/FSharp/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/FSharp/System.CodeDom.dll +-./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll +-./sdk/x.y.z/FSharp/System.Drawing.Common.dll + ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll +-./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll +-./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll +-./sdk/x.y.z/FSharp/System.Security.Permissions.dll +-./sdk/x.y.z/FSharp/System.Windows.Extensions.dll + ./sdk/x.y.z/FSharp/tr/ + ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll + ./sdk/x.y.z/FSharp/tr/FSharp.Compiler.Interactive.Settings.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/IncludedWorkloadManifests.txt + ./sdk/x.y.z/it/ + ./sdk/x.y.z/it/dotnet.resources.dll +-./sdk/x.y.z/it/Microsoft.Build.NuGetSdkResolver.resources.dll + ./sdk/x.y.z/it/Microsoft.Build.resources.dll + ./sdk/x.y.z/it/Microsoft.Build.Tasks.Core.resources.dll + ./sdk/x.y.z/it/Microsoft.Build.Utilities.Core.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/it/Microsoft.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/it/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/it/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/it/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/it/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/it/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/it/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/it/Microsoft.VisualStudio.Coverage.IO.resources.dll +-./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Client.resources.dll +-./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/it/MSBuild.resources.dll +-./sdk/x.y.z/it/NuGet.Build.Tasks.Console.resources.dll +-./sdk/x.y.z/it/NuGet.Build.Tasks.resources.dll +-./sdk/x.y.z/it/NuGet.CommandLine.XPlat.resources.dll +-./sdk/x.y.z/it/NuGet.Commands.resources.dll +-./sdk/x.y.z/it/NuGet.Common.resources.dll +-./sdk/x.y.z/it/NuGet.Configuration.resources.dll +-./sdk/x.y.z/it/NuGet.Credentials.resources.dll +-./sdk/x.y.z/it/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/it/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/it/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/it/NuGet.Localization.resources.dll +-./sdk/x.y.z/it/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/it/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/it/NuGet.Packaging.resources.dll +-./sdk/x.y.z/it/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/it/NuGet.Protocol.resources.dll +-./sdk/x.y.z/it/NuGet.Resolver.resources.dll +-./sdk/x.y.z/it/NuGet.Versioning.resources.dll +-./sdk/x.y.z/it/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/it/System.CommandLine.resources.dll +-./sdk/x.y.z/it/vstest.console.resources.dll + ./sdk/x.y.z/ja/ + ./sdk/x.y.z/ja/dotnet.resources.dll +-./sdk/x.y.z/ja/Microsoft.Build.NuGetSdkResolver.resources.dll + ./sdk/x.y.z/ja/Microsoft.Build.resources.dll + ./sdk/x.y.z/ja/Microsoft.Build.Tasks.Core.resources.dll + ./sdk/x.y.z/ja/Microsoft.Build.Utilities.Core.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/ja/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/ja/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/ja/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/ja/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/ja/Microsoft.VisualStudio.Coverage.IO.resources.dll +-./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Client.resources.dll +-./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/ja/MSBuild.resources.dll +-./sdk/x.y.z/ja/NuGet.Build.Tasks.Console.resources.dll +-./sdk/x.y.z/ja/NuGet.Build.Tasks.resources.dll +-./sdk/x.y.z/ja/NuGet.CommandLine.XPlat.resources.dll +-./sdk/x.y.z/ja/NuGet.Commands.resources.dll +-./sdk/x.y.z/ja/NuGet.Common.resources.dll +-./sdk/x.y.z/ja/NuGet.Configuration.resources.dll +-./sdk/x.y.z/ja/NuGet.Credentials.resources.dll +-./sdk/x.y.z/ja/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/ja/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/ja/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/ja/NuGet.Localization.resources.dll +-./sdk/x.y.z/ja/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/ja/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/ja/NuGet.Packaging.resources.dll +-./sdk/x.y.z/ja/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/ja/NuGet.Protocol.resources.dll +-./sdk/x.y.z/ja/NuGet.Resolver.resources.dll +-./sdk/x.y.z/ja/NuGet.Versioning.resources.dll +-./sdk/x.y.z/ja/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/ja/System.CommandLine.resources.dll +-./sdk/x.y.z/ja/vstest.console.resources.dll + ./sdk/x.y.z/ko/ + ./sdk/x.y.z/ko/dotnet.resources.dll +-./sdk/x.y.z/ko/Microsoft.Build.NuGetSdkResolver.resources.dll + ./sdk/x.y.z/ko/Microsoft.Build.resources.dll + ./sdk/x.y.z/ko/Microsoft.Build.Tasks.Core.resources.dll + ./sdk/x.y.z/ko/Microsoft.Build.Utilities.Core.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/ko/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/ko/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/ko/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/ko/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/ko/Microsoft.VisualStudio.Coverage.IO.resources.dll +-./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Client.resources.dll +-./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/ko/MSBuild.resources.dll +-./sdk/x.y.z/ko/NuGet.Build.Tasks.Console.resources.dll +-./sdk/x.y.z/ko/NuGet.Build.Tasks.resources.dll +-./sdk/x.y.z/ko/NuGet.CommandLine.XPlat.resources.dll +-./sdk/x.y.z/ko/NuGet.Commands.resources.dll +-./sdk/x.y.z/ko/NuGet.Common.resources.dll +-./sdk/x.y.z/ko/NuGet.Configuration.resources.dll +-./sdk/x.y.z/ko/NuGet.Credentials.resources.dll +-./sdk/x.y.z/ko/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/ko/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/ko/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/ko/NuGet.Localization.resources.dll +-./sdk/x.y.z/ko/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/ko/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/ko/NuGet.Packaging.resources.dll +-./sdk/x.y.z/ko/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/ko/NuGet.Protocol.resources.dll +-./sdk/x.y.z/ko/NuGet.Resolver.resources.dll +-./sdk/x.y.z/ko/NuGet.Versioning.resources.dll +-./sdk/x.y.z/ko/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/ko/System.CommandLine.resources.dll +-./sdk/x.y.z/ko/vstest.console.resources.dll + ./sdk/x.y.z/Microsoft.ApplicationInsights.dll + ./sdk/x.y.z/Microsoft.AspNetCore.DeveloperCertificates.XPlat.dll + ./sdk/x.y.z/Microsoft.Build.dll +@@ ------------ @@ + ./sdk/x.y.z/Microsoft.DotNet.NativeWrapper.dll + ./sdk/x.y.z/Microsoft.DotNet.SdkResolver.dll + ./sdk/x.y.z/Microsoft.DotNet.TemplateLocator.dll +-./sdk/x.y.z/Microsoft.Extensions.CommandLineUtils.dll + ./sdk/x.y.z/Microsoft.Extensions.Configuration.Abstractions.dll + ./sdk/x.y.z/Microsoft.Extensions.Configuration.Binder.dll + ./sdk/x.y.z/Microsoft.Extensions.Configuration.dll +@@ ------------ @@ + ./sdk/x.y.z/Microsoft.TestPlatform.PlatformAbstractions.deps.json + ./sdk/x.y.z/Microsoft.TestPlatform.PlatformAbstractions.dll + ./sdk/x.y.z/Microsoft.TestPlatform.targets ++./sdk/x.y.z/Microsoft.TestPlatform.TestHostRuntimeProvider.dll + ./sdk/x.y.z/Microsoft.TestPlatform.Utilities.dll + ./sdk/x.y.z/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll +-./sdk/x.y.z/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml + ./sdk/x.y.z/Microsoft.VisualBasic.CrossTargeting.targets + ./sdk/x.y.z/Microsoft.VisualBasic.CurrentVersion.targets + ./sdk/x.y.z/Microsoft.VisualBasic.targets +-./sdk/x.y.z/Microsoft.VisualStudio.Coverage.IO.dll + ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Client.dll + ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Common.dll ++./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll ++./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll + ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.ObjectModel.deps.json + ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll + ./sdk/x.y.z/Microsoft.VisualStudioVersion.v11.Common.props + ./sdk/x.y.z/Microsoft.VisualStudioVersion.v12.Common.props + ./sdk/x.y.z/Microsoft.VisualStudioVersion.v14.Common.props + ./sdk/x.y.z/Microsoft.Win32.Msi.dll +-./sdk/x.y.z/Microsoft.Win32.SystemEvents.dll + ./sdk/x.y.z/Microsoft/ + ./sdk/x.y.z/Microsoft/Microsoft.NET.Build.Extensions/ + ./sdk/x.y.z/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.ConflictResolution.targets +@@ ------------ @@ + ./sdk/x.y.z/package.deps.json + ./sdk/x.y.z/pl/ + ./sdk/x.y.z/pl/dotnet.resources.dll +-./sdk/x.y.z/pl/Microsoft.Build.NuGetSdkResolver.resources.dll + ./sdk/x.y.z/pl/Microsoft.Build.resources.dll + ./sdk/x.y.z/pl/Microsoft.Build.Tasks.Core.resources.dll + ./sdk/x.y.z/pl/Microsoft.Build.Utilities.Core.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/pl/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/pl/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/pl/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/pl/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/pl/Microsoft.VisualStudio.Coverage.IO.resources.dll +-./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Client.resources.dll +-./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/pl/MSBuild.resources.dll +-./sdk/x.y.z/pl/NuGet.Build.Tasks.Console.resources.dll +-./sdk/x.y.z/pl/NuGet.Build.Tasks.resources.dll +-./sdk/x.y.z/pl/NuGet.CommandLine.XPlat.resources.dll +-./sdk/x.y.z/pl/NuGet.Commands.resources.dll +-./sdk/x.y.z/pl/NuGet.Common.resources.dll +-./sdk/x.y.z/pl/NuGet.Configuration.resources.dll +-./sdk/x.y.z/pl/NuGet.Credentials.resources.dll +-./sdk/x.y.z/pl/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/pl/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/pl/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/pl/NuGet.Localization.resources.dll +-./sdk/x.y.z/pl/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/pl/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/pl/NuGet.Packaging.resources.dll +-./sdk/x.y.z/pl/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/pl/NuGet.Protocol.resources.dll +-./sdk/x.y.z/pl/NuGet.Resolver.resources.dll +-./sdk/x.y.z/pl/NuGet.Versioning.resources.dll +-./sdk/x.y.z/pl/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/pl/System.CommandLine.resources.dll +-./sdk/x.y.z/pl/vstest.console.resources.dll + ./sdk/x.y.z/pt-BR/ + ./sdk/x.y.z/pt-BR/dotnet.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.Build.NuGetSdkResolver.resources.dll + ./sdk/x.y.z/pt-BR/Microsoft.Build.resources.dll + ./sdk/x.y.z/pt-BR/Microsoft.Build.Tasks.Core.resources.dll + ./sdk/x.y.z/pt-BR/Microsoft.Build.Utilities.Core.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/pt-BR/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.Coverage.IO.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Client.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/pt-BR/MSBuild.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Build.Tasks.Console.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Build.Tasks.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.CommandLine.XPlat.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Commands.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Common.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Configuration.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Credentials.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Localization.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Packaging.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Protocol.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Resolver.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Versioning.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/pt-BR/System.CommandLine.resources.dll +-./sdk/x.y.z/pt-BR/vstest.console.resources.dll + ./sdk/x.y.z/ref/ ++./sdk/x.y.z/ref/Microsoft.TestPlatform.PlatformAbstractions.dll ++./sdk/x.y.z/ref/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll + ./sdk/x.y.z/ref/MSBuild.dll + ./sdk/x.y.z/ref/mscorlib.dll + ./sdk/x.y.z/ref/netstandard.dll +@@ ------------ @@ + ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll + ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll + ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.VisualBasic.resources.dll ++./sdk/x.y.z/Roslyn/bincore/runtimes/ ++./sdk/x.y.z/Roslyn/bincore/runtimes/win/ ++./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/ ++./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netcoreapp3.1/ ++./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netcoreapp3.1/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll + ./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll + ./sdk/x.y.z/Roslyn/bincore/System.Runtime.CompilerServices.Unsafe.dll ++./sdk/x.y.z/Roslyn/bincore/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/Roslyn/bincore/tr/ + ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.CSharp.resources.dll + ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/Roslyn/zh-Hant/Microsoft.Build.Tasks.CodeAnalysis.resources.dll + ./sdk/x.y.z/ru/ + ./sdk/x.y.z/ru/dotnet.resources.dll +-./sdk/x.y.z/ru/Microsoft.Build.NuGetSdkResolver.resources.dll + ./sdk/x.y.z/ru/Microsoft.Build.resources.dll + ./sdk/x.y.z/ru/Microsoft.Build.Tasks.Core.resources.dll + ./sdk/x.y.z/ru/Microsoft.Build.Utilities.Core.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/ru/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/ru/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/ru/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/ru/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/ru/Microsoft.VisualStudio.Coverage.IO.resources.dll +-./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Client.resources.dll +-./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/ru/MSBuild.resources.dll +-./sdk/x.y.z/ru/NuGet.Build.Tasks.Console.resources.dll +-./sdk/x.y.z/ru/NuGet.Build.Tasks.resources.dll +-./sdk/x.y.z/ru/NuGet.CommandLine.XPlat.resources.dll +-./sdk/x.y.z/ru/NuGet.Commands.resources.dll +-./sdk/x.y.z/ru/NuGet.Common.resources.dll +-./sdk/x.y.z/ru/NuGet.Configuration.resources.dll +-./sdk/x.y.z/ru/NuGet.Credentials.resources.dll +-./sdk/x.y.z/ru/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/ru/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/ru/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/ru/NuGet.Localization.resources.dll +-./sdk/x.y.z/ru/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/ru/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/ru/NuGet.Packaging.resources.dll +-./sdk/x.y.z/ru/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/ru/NuGet.Protocol.resources.dll +-./sdk/x.y.z/ru/NuGet.Resolver.resources.dll +-./sdk/x.y.z/ru/NuGet.Versioning.resources.dll +-./sdk/x.y.z/ru/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/ru/System.CommandLine.resources.dll +-./sdk/x.y.z/ru/vstest.console.resources.dll + ./sdk/x.y.z/RuntimeIdentifierGraph.json + ./sdk/x.y.z/runtimes/ + ./sdk/x.y.z/runtimes/any/ +@@ ------------ @@ + ./sdk/x.y.z/runtimes/any/native/NuGet.props + ./sdk/x.y.z/runtimes/any/native/NuGet.RestoreEx.targets + ./sdk/x.y.z/runtimes/any/native/NuGet.targets +-./sdk/x.y.z/runtimes/unix/ +-./sdk/x.y.z/runtimes/unix/lib/ +-./sdk/x.y.z/runtimes/unix/lib/netcoreapp3.0/ +-./sdk/x.y.z/runtimes/unix/lib/netcoreapp3.0/System.Drawing.Common.dll ++./sdk/x.y.z/runtimes/browser/ ++./sdk/x.y.z/runtimes/browser/lib/ ++./sdk/x.y.z/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll + ./sdk/x.y.z/runtimes/win/ + ./sdk/x.y.z/runtimes/win/lib/ + ./sdk/x.y.z/runtimes/win/lib/netx.y/ + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll ++./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll +-./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/ +-./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll +-./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll +-./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll +-./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll +-./sdk/x.y.z/runtimes/win/lib/netstandard2.0/ +-./sdk/x.y.z/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll ++./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache + ./sdk/x.y.z/SdkResolvers/ + ./sdk/x.y.z/SdkResolvers/Microsoft.Build.NuGetSdkResolver/ +@@ ------------ @@ + ./sdk/x.y.z/Sdks/FSharp.NET.Sdk/Sdk/Sdk.props + ./sdk/x.y.z/Sdks/FSharp.NET.Sdk/Sdk/Sdk.targets + ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/ ++./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/microsoft.docker.sdk.1.1.0.csproj + ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/Sdk/ + ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/Sdk/Sdk.props + ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/Sdk/Sdk.targets +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Buffers.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Collections.Immutable.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Memory.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Numerics.Vectors.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Reflection.Metadata.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/ +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/targets/TransformTargets/Transforms/EnvironmentNoLocation.transform + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/targets/TransformTargets/Transforms/EnvironmentWithLocation.transform + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/de/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/de/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/es/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/es/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/fr/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/fr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/it/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/it/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ja/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ja/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ko/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ko/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Bcl.AsyncInterfaces.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.NET.Sdk.Publish.Tasks.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.NET.Sdk.Publish.Tasks.dll.config +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.Delegation.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.Deployment.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.Deployment.Tracing.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.XmlTransform.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pl/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pl/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pt-BR/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pt-BR/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ru/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ru/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Buffers.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Memory.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Numerics.Vectors.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Text.Encodings.Web.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Text.Json.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Threading.Tasks.Extensions.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.ValueTuple.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hans/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hans/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hant/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hant/Microsoft.NET.Sdk.Publish.Tasks.resources.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netstandard2.0/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netx.y/ ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Buffers.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Collections.Immutable.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Memory.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Numerics.Vectors.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Reflection.Metadata.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Runtime.CompilerServices.Unsafe.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Text.Encodings.Web.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Runtime.CompilerServices.Unsafe.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/Microsoft.NET.Sdk.Web.Tasks.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ref/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ref/Microsoft.NET.Sdk.Web.Tasks.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Icon.png +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/LICENSE.TXT +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.props +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.targets +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.props +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.targets +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.WinFX.targets +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/System.Windows.Forms.Analyzers.props +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/THIRD-PARTY-NOTICES.TXT +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/PresentationBuildTasks.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Collections.Immutable.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Memory.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Numerics.Vectors.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Reflection.Metadata.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Reflection.MetadataLoadContext.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/PresentationBuildTasks.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Reflection.MetadataLoadContext.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/useSharedDesignerContext.txt +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/version.txt + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/Sdk.props +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Buffers.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Collections.Immutable.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Memory.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Numerics.Vectors.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Reflection.Metadata.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Text.Encodings.Web.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/ + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/NuGet.Build.Tasks.Pack.targets + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/cs/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/cs/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/de/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/de/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/es/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/es/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/fr/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/fr/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/it/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/it/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ja/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ja/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ko/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ko/NuGet.Build.Tasks.Pack.resources.dll + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Build.Tasks.Pack.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pl/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pl/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pt-BR/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pt-BR/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ru/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ru/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/tr/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/tr/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hans/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hans/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hant/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hant/NuGet.Build.Tasks.Pack.resources.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Commands.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Common.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Configuration.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Credentials.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.DependencyResolver.Core.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Frameworks.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.LibraryModel.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Packaging.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.ProjectModel.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Protocol.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Versioning.dll + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/fr/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/fr/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/it/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/it/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ja/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ja/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ko/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ko/NuGet.Build.Tasks.Pack.resources.dll + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Build.Tasks.Pack.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pl/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pl/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pt-BR/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pt-BR/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ru/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ru/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/tr/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/tr/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hans/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hans/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hant/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hant/NuGet.Build.Tasks.Pack.resources.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Commands.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Common.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Configuration.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Credentials.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.DependencyResolver.Core.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Frameworks.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.LibraryModel.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Packaging.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.ProjectModel.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Protocol.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Versioning.dll + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/icon.png ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Commands.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Common.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Configuration.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Credentials.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.DependencyResolver.Core.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Frameworks.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.LibraryModel.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Packaging.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.ProjectModel.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Protocol.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Versioning.dll + ./sdk/x.y.z/System.CodeDom.dll + ./sdk/x.y.z/System.CommandLine.dll +-./sdk/x.y.z/System.Configuration.ConfigurationManager.dll ++./sdk/x.y.z/System.Diagnostics.DiagnosticSource.dll + ./sdk/x.y.z/System.Diagnostics.EventLog.dll +-./sdk/x.y.z/System.Drawing.Common.dll + ./sdk/x.y.z/System.Resources.Extensions.dll +-./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll ++./sdk/x.y.z/System.Runtime.CompilerServices.Unsafe.dll + ./sdk/x.y.z/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/System.Security.Cryptography.Xml.dll +-./sdk/x.y.z/System.Security.Permissions.dll + ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll +-./sdk/x.y.z/System.Windows.Extensions.dll ++./sdk/x.y.z/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/System.Text.Encodings.Web.dll ++./sdk/x.y.z/System.Text.Json.dll ++./sdk/x.y.z/testhost.deps.json ++./sdk/x.y.z/testhost.dll ++./sdk/x.y.z/testhost.dll.config ++./sdk/x.y.z/testhost.runtimeconfig.json ++./sdk/x.y.z/testhost.x86 ++./sdk/x.y.z/testhost.x86.deps.json ++./sdk/x.y.z/testhost.x86.dll ++./sdk/x.y.z/testhost.x86.dll.config ++./sdk/x.y.z/testhost.x86.runtimeconfig.json + ./sdk/x.y.z/TestHost/ +-./sdk/x.y.z/TestHost/cs/ +-./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/datacollector.exe +-./sdk/x.y.z/TestHost/datacollector.exe.config +-./sdk/x.y.z/TestHost/de/ +-./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/es/ +-./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/fr/ +-./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/it/ +-./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/ja/ +-./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/ko/ +-./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CommunicationUtilities.dll + ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CoreUtilities.dll + ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CrossPlatEngine.dll +@@ ------------ @@ + ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.Utilities.dll + ./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.Common.dll + ./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll +-./sdk/x.y.z/TestHost/msdia140typelib_clr0200.dll + ./sdk/x.y.z/TestHost/Newtonsoft.Json.dll + ./sdk/x.y.z/TestHost/NuGet.Frameworks.dll +-./sdk/x.y.z/TestHost/pl/ +-./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/pt-BR/ +-./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/ru/ +-./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/System.Collections.Immutable.dll +-./sdk/x.y.z/TestHost/System.Reflection.Metadata.dll +-./sdk/x.y.z/TestHost/testhost.exe +-./sdk/x.y.z/TestHost/testhost.exe.config +-./sdk/x.y.z/TestHost/testhost.net452.exe +-./sdk/x.y.z/TestHost/testhost.net452.exe.config +-./sdk/x.y.z/TestHost/testhost.net452.x86.exe +-./sdk/x.y.z/TestHost/testhost.net452.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net46.exe +-./sdk/x.y.z/TestHost/testhost.net46.exe.config +-./sdk/x.y.z/TestHost/testhost.net46.x86.exe +-./sdk/x.y.z/TestHost/testhost.net46.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net461.exe +-./sdk/x.y.z/TestHost/testhost.net461.exe.config +-./sdk/x.y.z/TestHost/testhost.net461.x86.exe +-./sdk/x.y.z/TestHost/testhost.net461.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net462.exe +-./sdk/x.y.z/TestHost/testhost.net462.exe.config +-./sdk/x.y.z/TestHost/testhost.net462.x86.exe +-./sdk/x.y.z/TestHost/testhost.net462.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net47.exe +-./sdk/x.y.z/TestHost/testhost.net47.exe.config +-./sdk/x.y.z/TestHost/testhost.net47.x86.exe +-./sdk/x.y.z/TestHost/testhost.net47.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net471.exe +-./sdk/x.y.z/TestHost/testhost.net471.exe.config +-./sdk/x.y.z/TestHost/testhost.net471.x86.exe +-./sdk/x.y.z/TestHost/testhost.net471.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net472.exe +-./sdk/x.y.z/TestHost/testhost.net472.exe.config +-./sdk/x.y.z/TestHost/testhost.net472.x86.exe +-./sdk/x.y.z/TestHost/testhost.net472.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net48.exe +-./sdk/x.y.z/TestHost/testhost.net48.exe.config +-./sdk/x.y.z/TestHost/testhost.net48.x86.exe +-./sdk/x.y.z/TestHost/testhost.net48.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.x86.exe +-./sdk/x.y.z/TestHost/testhost.x86.exe.config +-./sdk/x.y.z/TestHost/tr/ +-./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/x64/ +-./sdk/x.y.z/TestHost/x64/msdia140.dll +-./sdk/x.y.z/TestHost/x64/msdia140.dll.manifest +-./sdk/x.y.z/TestHost/x86/ +-./sdk/x.y.z/TestHost/x86/msdia140.dll +-./sdk/x.y.z/TestHost/x86/msdia140.dll.manifest +-./sdk/x.y.z/TestHost/zh-Hans/ +-./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/zh-Hant/ +-./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ++./sdk/x.y.z/TestHost/ref/ ++./sdk/x.y.z/TestHost/ref/testhost.dll ++./sdk/x.y.z/TestHost/ref/testhost.x86.dll ++./sdk/x.y.z/TestHost/testhost.deps.json ++./sdk/x.y.z/TestHost/testhost.dll ++./sdk/x.y.z/TestHost/testhost.dll.config ++./sdk/x.y.z/TestHost/testhost.runtimeconfig.json ++./sdk/x.y.z/TestHost/testhost.x86 ++./sdk/x.y.z/TestHost/testhost.x86.deps.json ++./sdk/x.y.z/TestHost/testhost.x86.dll ++./sdk/x.y.z/TestHost/testhost.x86.dll.config ++./sdk/x.y.z/TestHost/testhost.x86.runtimeconfig.json + ./sdk/x.y.z/tr/ + ./sdk/x.y.z/tr/dotnet.resources.dll +-./sdk/x.y.z/tr/Microsoft.Build.NuGetSdkResolver.resources.dll + ./sdk/x.y.z/tr/Microsoft.Build.resources.dll + ./sdk/x.y.z/tr/Microsoft.Build.Tasks.Core.resources.dll + ./sdk/x.y.z/tr/Microsoft.Build.Utilities.Core.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/tr/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/tr/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/tr/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/tr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/tr/Microsoft.VisualStudio.Coverage.IO.resources.dll +-./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll +-./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/tr/MSBuild.resources.dll +-./sdk/x.y.z/tr/NuGet.Build.Tasks.Console.resources.dll +-./sdk/x.y.z/tr/NuGet.Build.Tasks.resources.dll +-./sdk/x.y.z/tr/NuGet.CommandLine.XPlat.resources.dll +-./sdk/x.y.z/tr/NuGet.Commands.resources.dll +-./sdk/x.y.z/tr/NuGet.Common.resources.dll +-./sdk/x.y.z/tr/NuGet.Configuration.resources.dll +-./sdk/x.y.z/tr/NuGet.Credentials.resources.dll +-./sdk/x.y.z/tr/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/tr/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/tr/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/tr/NuGet.Localization.resources.dll +-./sdk/x.y.z/tr/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/tr/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/tr/NuGet.Packaging.resources.dll +-./sdk/x.y.z/tr/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/tr/NuGet.Protocol.resources.dll +-./sdk/x.y.z/tr/NuGet.Resolver.resources.dll +-./sdk/x.y.z/tr/NuGet.Versioning.resources.dll +-./sdk/x.y.z/tr/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/tr/System.CommandLine.resources.dll +-./sdk/x.y.z/tr/vstest.console.resources.dll ++./sdk/x.y.z/vstest.console + ./sdk/x.y.z/vstest.console.deps.json + ./sdk/x.y.z/vstest.console.dll + ./sdk/x.y.z/vstest.console.dll.config + ./sdk/x.y.z/vstest.console.runtimeconfig.json + ./sdk/x.y.z/zh-Hans/ + ./sdk/x.y.z/zh-Hans/dotnet.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.Build.NuGetSdkResolver.resources.dll + ./sdk/x.y.z/zh-Hans/Microsoft.Build.resources.dll + ./sdk/x.y.z/zh-Hans/Microsoft.Build.Tasks.Core.resources.dll + ./sdk/x.y.z/zh-Hans/Microsoft.Build.Utilities.Core.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/zh-Hans/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.Coverage.IO.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Client.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/zh-Hans/MSBuild.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Build.Tasks.Console.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Build.Tasks.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.CommandLine.XPlat.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Commands.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Common.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Configuration.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Credentials.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Localization.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Packaging.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Protocol.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Resolver.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Versioning.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/zh-Hans/System.CommandLine.resources.dll +-./sdk/x.y.z/zh-Hans/vstest.console.resources.dll + ./sdk/x.y.z/zh-Hant/ + ./sdk/x.y.z/zh-Hant/dotnet.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.Build.NuGetSdkResolver.resources.dll + ./sdk/x.y.z/zh-Hant/Microsoft.Build.resources.dll + ./sdk/x.y.z/zh-Hant/Microsoft.Build.Tasks.Core.resources.dll + ./sdk/x.y.z/zh-Hant/Microsoft.Build.Utilities.Core.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/zh-Hant/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.Coverage.IO.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Client.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/zh-Hant/MSBuild.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Build.Tasks.Console.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Build.Tasks.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.CommandLine.XPlat.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Commands.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Common.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Configuration.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Credentials.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Localization.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Packaging.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Protocol.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Resolver.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Versioning.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/zh-Hant/System.CommandLine.resources.dll +-./sdk/x.y.z/zh-Hant/vstest.console.resources.dll + ./shared/ + ./shared/Microsoft.AspNetCore.App/ + ./shared/Microsoft.AspNetCore.App/x.y.z/ +@@ ------------ @@ + ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.Extensions.WebEncoders.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.JSInterop.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.Net.Http.Headers.dll ++./shared/Microsoft.AspNetCore.App/x.y.z/System.Diagnostics.DiagnosticSource.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/System.Diagnostics.EventLog.dll ++./shared/Microsoft.AspNetCore.App/x.y.z/System.Formats.Asn1.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/System.IO.Pipelines.dll ++./shared/Microsoft.AspNetCore.App/x.y.z/System.Runtime.CompilerServices.Unsafe.dll ++./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.AccessControl.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.Cryptography.Pkcs.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.Cryptography.Xml.dll ++./shared/Microsoft.AspNetCore.App/x.y.z/System.Text.Encodings.Web.dll ++./shared/Microsoft.AspNetCore.App/x.y.z/System.Text.Json.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/THIRD-PARTY-NOTICES.txt + ./shared/Microsoft.NETCore.App/ + ./shared/Microsoft.NETCore.App/x.y.z/ \ No newline at end of file diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh index f82692071..cd08e9f4e 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh @@ -250,12 +250,14 @@ function doCommand() { "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" + "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-R2R-portable.binlog" /p:PublishTrimmed=true /p:PublishReadyToRun=true } else runPublishScenarios() { "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" + "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-R2R-portable.binlog" /p:PublishTrimmed=true /p:PublishReadyToRun=true } fi if [ "$projectOutput" == "true" ]; then @@ -350,6 +352,8 @@ function runWebTests() { doCommand C# razor "$@" new restore build run multi-rid-publish doCommand C# blazorwasm "$@" new restore build run publish doCommand C# blazorserver "$@" new restore build run publish + doCommand C# worker new restore + doCommand C# angular new restore doCommand F# web "$@" new restore build run multi-rid-publish doCommand F# mvc "$@" new restore build run multi-rid-publish diff --git a/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props new file mode 100644 index 000000000..25bc36ee8 --- /dev/null +++ b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props @@ -0,0 +1,14 @@ + + + + $([MSBuild]::NormalizeDirectory('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'global.json'))')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'eng')) + + + + + false + + + + diff --git a/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.targets b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.targets new file mode 100644 index 000000000..8fda6a64c --- /dev/null +++ b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.targets @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch b/src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch deleted file mode 100644 index 275d6dcec..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 110fc28ea7c17d57bbd5ce8ed3fc4e2b0274c5b3 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Fri, 22 Oct 2021 22:17:37 +0000 -Subject: [PATCH] Build a subset of roslyn projects - -Some projects use Microsoft.NET.Sdk.WindowsDesktop sdk -which cannot be built using a boostrapped source-build -sdk, since WindowsDesktop is not supported. These cannot -be ignored using ExcludeFromSourceBuild because the project -still needs to be loaded and the sdk cannot be found. - -See https://github.com/dotnet/roslyn/issues/57342 ---- - Roslyn.SourceBuild.slnf | 105 ++++++++++++++++++++++++++++++++++++++++ - eng/SourceBuild.props | 2 +- - 2 files changed, 106 insertions(+), 1 deletion(-) - create mode 100644 Roslyn.SourceBuild.slnf - -diff --git a/Roslyn.SourceBuild.slnf b/Roslyn.SourceBuild.slnf -new file mode 100644 -index 00000000000..e6f8eb315bf ---- /dev/null -+++ b/Roslyn.SourceBuild.slnf -@@ -0,0 +1,105 @@ -+{ -+ "solution": { -+ "path": "Roslyn.sln", -+ "projects": [ -+ "src\\Deployment\\RoslynDeployment.csproj", -+ "src\\Compilers\\Core\\Portable\\Microsoft.CodeAnalysis.csproj", -+ "src\\Compilers\\Server\\VBCSCompiler\\VBCSCompiler.csproj", -+ "src\\Compilers\\CSharp\\csc\\csc.csproj", -+ "src\\Compilers\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.csproj", -+ "src\\Compilers\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.vbproj", -+ "src\\Workspaces\\Core\\Portable\\Microsoft.CodeAnalysis.Workspaces.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\BoundTreeGenerator\\CompilersBoundTreeGenerator.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\CSharpErrorFactsGenerator\\CSharpErrorFactsGenerator.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\CSharpSyntaxGenerator\\CSharpSyntaxGenerator.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\VisualBasicSyntaxGenerator\\VisualBasicSyntaxGenerator.vbproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\VisualBasicErrorFactsGenerator\\VisualBasicErrorFactsGenerator.vbproj", -+ "src\\Workspaces\\Core\\Desktop\\Microsoft.CodeAnalysis.Workspaces.Desktop.csproj", -+ "src\\Workspaces\\Core\\MSBuild\\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj", -+ "src\\Workspaces\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj", -+ "src\\Workspaces\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj", -+ "src\\Features\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.Features.vbproj", -+ "src\\Features\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.Features.csproj", -+ "src\\Features\\Core\\Portable\\Microsoft.CodeAnalysis.Features.csproj", -+ "src\\Scripting\\VisualBasic\\Microsoft.CodeAnalysis.VisualBasic.Scripting.vbproj", -+ "src\\Scripting\\Core\\Microsoft.CodeAnalysis.Scripting.csproj", -+ "src\\Scripting\\CSharp\\Microsoft.CodeAnalysis.CSharp.Scripting.csproj", -+ "src\\ExpressionEvaluator\\Package\\ExpressionEvaluatorPackage.csproj", -+ "src\\ExpressionEvaluator\\CSharp\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.csproj", -+ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.vbproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.ExpressionCompiler.csproj", -+ "src\\Compilers\\Core\\AnalyzerDriver\\AnalyzerDriver.shproj", -+ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\BasicResultProvider.shproj", -+ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\NetFX20\\BasicResultProvider.NetFX20.vbproj", -+ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.VisualBasic.ResultProvider.vbproj", -+ "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\CSharpResultProvider.shproj", -+ "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\NetFX20\\CSharpResultProvider.NetFX20.csproj", -+ "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.CSharp.ResultProvider.csproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\ResultProvider.shproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\NetFX20\\ResultProvider.NetFX20.csproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.ResultProvider.csproj", -+ "src\\Compilers\\VisualBasic\\vbc\\vbc.csproj", -+ "src\\Compilers\\VisualBasic\\BasicAnalyzerDriver\\BasicAnalyzerDriver.shproj", -+ "src\\Compilers\\CSharp\\CSharpAnalyzerDriver\\CSharpAnalyzerDriver.shproj", -+ "src\\Compilers\\Core\\CommandLine\\CommandLine.shproj", -+ "src\\Compilers\\Extension\\Roslyn.Compilers.Extension.csproj", -+ "src\\Dependencies\\CodeAnalysis.Debugging\\Microsoft.CodeAnalysis.Debugging.shproj", -+ "src\\Dependencies\\PooledObjects\\Microsoft.CodeAnalysis.PooledObjects.shproj", -+ "src\\Workspaces\\Remote\\Core\\Microsoft.CodeAnalysis.Remote.Workspaces.csproj", -+ "src\\Workspaces\\Remote\\ServiceHub\\Microsoft.CodeAnalysis.Remote.ServiceHub.csproj", -+ "src\\Compilers\\Core\\MSBuildTask\\Microsoft.Build.Tasks.CodeAnalysis.csproj", -+ "src\\Tools\\BuildBoss\\BuildBoss.csproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\FunctionResolver\\Microsoft.CodeAnalysis.FunctionResolver.csproj", -+ "src\\CodeStyle\\Core\\Analyzers\\Microsoft.CodeAnalysis.CodeStyle.csproj", -+ "src\\CodeStyle\\Core\\CodeFixes\\Microsoft.CodeAnalysis.CodeStyle.Fixes.csproj", -+ "src\\CodeStyle\\CSharp\\Analyzers\\Microsoft.CodeAnalysis.CSharp.CodeStyle.csproj", -+ "src\\CodeStyle\\CSharp\\CodeFixes\\Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj", -+ "src\\CodeStyle\\VisualBasic\\Analyzers\\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.vbproj", -+ "src\\CodeStyle\\VisualBasic\\CodeFixes\\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj", -+ "src\\Tools\\AnalyzerRunner\\AnalyzerRunner.csproj", -+ "src\\Dependencies\\CodeAnalysis.Debugging\\Microsoft.CodeAnalysis.Debugging.Package.csproj", -+ "src\\Dependencies\\PooledObjects\\Microsoft.CodeAnalysis.PooledObjects.Package.csproj", -+ "src\\NuGet\\Microsoft.Net.Compilers\\Microsoft.Net.Compilers.Package.csproj", -+ "src\\NuGet\\Microsoft.NETCore.Compilers\\Microsoft.NETCore.Compilers.Package.csproj", -+ "src\\NuGet\\Microsoft.CodeAnalysis.Compilers.Package.csproj", -+ "src\\NuGet\\Microsoft.CodeAnalysis.Scripting.Package.csproj", -+ "src\\NuGet\\Microsoft.CodeAnalysis.EditorFeatures.Package.csproj", -+ "src\\NuGet\\Microsoft.CodeAnalysis.Package.csproj", -+ "src\\Setup\\DevDivVsix\\CompilersPackage\\Microsoft.CodeAnalysis.Compilers.Setup.csproj", -+ "src\\Setup\\Installer\\Installer.Package.csproj", -+ "src\\Setup\\DevDivInsertionFiles\\DevDivInsertionFiles.csproj", -+ "src\\Tools\\ExternalAccess\\FSharp\\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj", -+ "src\\Tools\\ExternalAccess\\Razor\\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj", -+ "src\\NuGet\\Microsoft.Net.Compilers.Toolset\\Microsoft.Net.Compilers.Toolset.Package.csproj", -+ "src\\Features\\LanguageServer\\Protocol\\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj", -+ "src\\Tools\\ExternalAccess\\Debugger\\Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj", -+ "src\\Tools\\ExternalAccess\\Xamarin.Remote\\Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote.csproj", -+ "src\\Tools\\ExternalAccess\\Apex\\Microsoft.CodeAnalysis.ExternalAccess.Apex.csproj", -+ "src\\Tools\\IdeBenchmarks\\IdeBenchmarks.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\IOperationGenerator\\CompilersIOperationGenerator.csproj", -+ "src\\Features\\Lsif\\Generator\\Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\Core\\CompilerExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\Core\\WorkspaceExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\CSharp\\CSharpCompilerExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\CSharp\\CSharpWorkspaceExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\VisualBasic\\VisualBasicCompilerExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\VisualBasic\\VisualBasicWorkspaceExtensions.shproj", -+ "src\\Analyzers\\Core\\Analyzers\\Analyzers.shproj", -+ "src\\Analyzers\\Core\\CodeFixes\\CodeFixes.shproj", -+ "src\\Analyzers\\CSharp\\Analyzers\\CSharpAnalyzers.shproj", -+ "src\\Analyzers\\CSharp\\CodeFixes\\CSharpCodeFixes.shproj", -+ "src\\Analyzers\\VisualBasic\\Analyzers\\VisualBasicAnalyzers.shproj", -+ "src\\Analyzers\\VisualBasic\\CodeFixes\\VisualBasicCodeFixes.shproj", -+ "src\\Tools\\IdeCoreBenchmarks\\IdeCoreBenchmarks.csproj", -+ "src\\Tools\\BuildValidator\\BuildValidator.csproj", -+ "src\\Tools\\BuildActionTelemetryTable\\BuildActionTelemetryTable.csproj", -+ "src\\CodeStyle\\Tools\\CodeStyleConfigFileGenerator.csproj", -+ "src\\Dependencies\\Collections\\Microsoft.CodeAnalysis.Collections.shproj", -+ "src\\Dependencies\\Collections\\Microsoft.CodeAnalysis.Collections.Package.csproj", -+ "src\\Compilers\\Core\\Rebuild\\Microsoft.CodeAnalysis.Rebuild.csproj", -+ "src\\Tools\\ExternalAccess\\OmniSharp\\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.csproj", -+ "src\\Tools\\ExternalAccess\\OmniSharp.CSharp\\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp.csproj", -+ "src\\Workspaces\\Remote\\ServiceHub.CoreComponents\\Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.csproj" -+ ] -+ } -+} -\ No newline at end of file -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 92e316a4744..9905b35467e 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -11,7 +11,7 @@ - --> - - -- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" -+ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.SourceBuild.slnf" - - - --- -2.31.1 - From 4d001c3b75872e8bd579e59138066cac7ed25d27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Mar 2022 18:53:00 -0600 Subject: [PATCH 176/178] [release/6.0.2xx] Update dependencies from dotnet/arcade (#13314) * Update dependencies from https://github.com/dotnet/arcade build 20220222.7 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22107.2 -> To Version 6.0.0-beta.22122.7 * Remove source-build arcade patches that were backported Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/generate-sbom-prep.ps1 | 19 +++ eng/common/generate-sbom-prep.sh | 22 ++++ eng/common/templates/job/job.yml | 10 ++ eng/common/templates/jobs/jobs.yml | 4 - eng/common/templates/steps/generate-sbom.yml | 44 +++++++ eng/common/templates/steps/source-build.yml | 4 +- global.json | 4 +- ...DotNet.Build.Tasks.Workloads-for-net.patch | 24 ---- ...005-Patch-sdk.props-to-target-net6.0.patch | 26 ---- ...loads-WiX-dependency-in-source-build.patch | 124 ------------------ 12 files changed, 106 insertions(+), 189 deletions(-) create mode 100644 eng/common/generate-sbom-prep.ps1 create mode 100644 eng/common/generate-sbom-prep.sh create mode 100644 eng/common/templates/steps/generate-sbom.yml delete mode 100644 src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch delete mode 100644 src/SourceBuild/tarball/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch delete mode 100644 src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dffe8c3f1..d78524d71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index eb9e4941c..6e0227b5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22107.2 + 6.0.0-beta.22122.7 diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 new file mode 100644 index 000000000..a733a8885 --- /dev/null +++ b/eng/common/generate-sbom-prep.ps1 @@ -0,0 +1,19 @@ +Param( + [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed +) + +Write-Host "Creating dir $ManifestDirPath" +# create directory for sbom manifest to be placed +if (!(Test-Path -path $ManifestDirPath)) +{ + New-Item -ItemType Directory -path $ManifestDirPath + Write-Host "Successfully created directory $ManifestDirPath" +} +else{ + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +} + +Write-Host "Updating artifact name" +$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_' +Write-Host "Artifact name $artifact_name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh new file mode 100644 index 000000000..f6c774531 --- /dev/null +++ b/eng/common/generate-sbom-prep.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" + +manifest_dir=$1 + +if [ ! -d "$manifest_dir" ] ; then + mkdir -p "$manifest_dir" + echo "Sbom directory created." $manifest_dir +else + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +fi + +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +echo "Artifact name before : "$artifact_name +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" +echo "Artifact name after : "$safe_artifact_name +export ARTIFACT_NAME=$safe_artifact_name +echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" + +exit 0 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 30d1de583..547d878da 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -31,6 +31,10 @@ parameters: name: '' preSteps: [] runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 6.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' jobs: - job: ${{ parameters.name }} @@ -247,3 +251,9 @@ jobs: ArtifactName: AssetManifests continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 70d44735a..554e71cfc 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -8,10 +8,6 @@ parameters: # Optional: Enable publishing using release pipelines enablePublishUsingPipelines: false - # Optional: Disable component governance detection. In general, component governance - # should be on for all jobs. Use only in the event of issues. - disableComponentGovernance: false - # Optional: Enable running the source-build jobs to build repo from source enableSourceBuild: false diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml new file mode 100644 index 000000000..f4d7937f3 --- /dev/null +++ b/eng/common/templates/steps/generate-sbom.yml @@ -0,0 +1,44 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed + +parameters: + PackageVersion: 6.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + sbomContinueOnError: true + +steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 +- script: | + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }} + +- task: PublishPipelineArtifact@1 + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + inputs: + targetPath: '${{parameters.manifestDirPath}}' + artifactName: $(ARTIFACT_NAME) + diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index abb1b2bcd..ba40dc82f 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -43,8 +43,8 @@ steps: # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= - if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index 8d9bc761f..8a183c7de 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.22107.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22107.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22122.7" } } diff --git a/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch b/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch deleted file mode 100644 index b1cdb03da..000000000 --- a/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3610fdc1ac6437973d539177c1427ed7f4f65c2e Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Fri, 27 Aug 2021 13:34:55 +0000 -Subject: [PATCH] Build Microsoft.DotNet.Build.Tasks.Workloads for net6.0 - ---- - .../src/Microsoft.DotNet.Build.Tasks.Workloads.csproj | 1 + - 1 files changed, 1 insertions(+) - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -index ae34705a..bda5d581 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -@@ -2,6 +2,7 @@ - - - net472;netcoreapp3.1 -+ net6.0 - true - Latest - true --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch b/src/SourceBuild/tarball/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch deleted file mode 100644 index 5141348f2..000000000 --- a/src/SourceBuild/tarball/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 676bb5aa455dcf877c78792e4e5a62ca6a1d72c1 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 8 Sep 2021 16:43:11 +0000 -Subject: [PATCH] Patch sdk.props to target net6.0 - -Workaround for https://github.com/dotnet/arcade/issues/7413 ---- - src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props -index e3c50582..a577f923 100644 ---- a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props -+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props -@@ -8,7 +8,7 @@ - --> - - -- $(MSBuildThisFileDirectory)../tools/netcoreapp3.1/ -+ $(MSBuildThisFileDirectory)../tools/net6.0/ - $(MSBuildThisFileDirectory)../tools/net472/ - - --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch deleted file mode 100644 index 188312413..000000000 --- a/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Fri, 8 Oct 2021 16:15:42 -0700 -Subject: [PATCH] Disable Workloads WiX dependency in source-build - -This removes the prebuilt WiX dependency: https://github.com/dotnet/arcade/issues/8014 - -The patch is temporary, pending upstream fix and dependency flow. ---- - .../src/{FileRow.cs => FileRow.wix.cs} | 0 - ...ifestMsi.cs => GenerateManifestMsi.wix.cs} | 0 - .../{GenerateMsi.cs => GenerateMsi.wix.cs} | 0 - ...erateMsiBase.cs => GenerateMsiBase.wix.cs} | 0 - ...erateVisualStudioMsiPackageProject.wix.cs} | 0 - ...cs => GenerateVisualStudioWorkload.wix.cs} | 0 - ...oadMsis.cs => GenerateWorkloadMsis.wix.cs} | 0 - ...rosoft.DotNet.Build.Tasks.Workloads.csproj | 23 ++++++++++++++++--- - ...{MsiProperties.cs => MsiProperties.wix.cs} | 0 - .../src/{MsiUtils.cs => MsiUtils.wix.cs} | 0 - ...elatedProduct.cs => RelatedProduct.wix.cs} | 0 - 11 files changed, 20 insertions(+), 3 deletions(-) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{FileRow.cs => FileRow.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateManifestMsi.cs => GenerateManifestMsi.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsi.cs => GenerateMsi.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsiBase.cs => GenerateMsiBase.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioMsiPackageProject.cs => GenerateVisualStudioMsiPackageProject.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioWorkload.cs => GenerateVisualStudioWorkload.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateWorkloadMsis.cs => GenerateWorkloadMsis.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiProperties.cs => MsiProperties.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiUtils.cs => MsiUtils.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{RelatedProduct.cs => RelatedProduct.wix.cs} (100%) - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -index 19cf67b5..2d02b7f4 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -@@ -11,6 +11,16 @@ - $(NoWarn);NU5127 - false - Microsoft.DotNet.Build.Tasks.Workloads -+ -+ -+ true - - - -@@ -19,13 +29,16 @@ - - - -- - -- -+ - - - -- -+ -+ -+ -+ -+ - - - -@@ -48,6 +61,10 @@ - - - -+ -+ -+ -+ - - - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs From ad22b53f36a277ac29d3b630077347edbdba8053 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 Mar 2022 10:22:23 -0600 Subject: [PATCH 177/178] Disable source-build tarball build in CI (#13351) --- .../templates/job/source-build-create-tarball.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 8e55a40b5..4f993567f 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 @@ -80,9 +80,12 @@ jobs: # This prevents allocation of additional agents if the tarball build legs should be skipped. # Only build the tarball if the PR touches source-build source. - script: | - if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*' - then - echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true" - fi + # Temporarily disable tarball PR validation until source-build is supported in this channel. + echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]false" + + # if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*' + # then + # echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true" + # fi displayName: Tarball Build Check name: Tarball_Build_Check From a8858e93693403144951c167b3bfa4fa1400c5c9 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 9 Mar 2022 12:21:02 -0800 Subject: [PATCH 178/178] [6.0.2xx] Bump aspnetcore template versions (#13366) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6e0227b5d..06555de6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.14 + 5.0.15 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.22 + 3.1.23 3.2.1 4.8.0-rc2.19462.10