From 42257c06e2dfe89af03a5e15b4181aeb7d9727b9 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 27 Oct 2021 14:28:48 -0700 Subject: [PATCH 001/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] [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/462] [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/462] 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/462] 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/462] 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/462] 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/462] 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/462] [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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] [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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] [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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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/462] 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 e4df1c7d8028755699458957efaccb845a3381c8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 21 Jan 2022 15:03:16 -0800 Subject: [PATCH 122/462] 6.0.3xx branding --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 287138a80..961d6500f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 6 0 - 2 + 3 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) preview From 3de22e2a28ccdcd63d82bd49aebb31ae39492b01 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 21 Jan 2022 15:04:38 -0800 Subject: [PATCH 123/462] 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 124/462] 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 125/462] 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 126/462] 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 127/462] 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 128/462] 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 129/462] 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 1e961021e4cb1d955854d3fe2003ddb6083e91ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Jan 2022 23:38:05 +0000 Subject: [PATCH 130/462] Update dependencies from https://github.com/dotnet/sdk build 20220126.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22076.9 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 | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++----- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb9fdce5f..3277993b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 55fa299ca45a3c19e8970e6afba34951e368525a + 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/templating - 55fa299ca45a3c19e8970e6afba34951e368525a + 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/templating - 55fa299ca45a3c19e8970e6afba34951e368525a + 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 6ca80ba4d8c6f3087176440622bbdb90e78d3708 + 70cef52a878e81b9cada704b9f2f04ffdc7e7e30 - + https://github.com/dotnet/sdk - 6ca80ba4d8c6f3087176440622bbdb90e78d3708 + 70cef52a878e81b9cada704b9f2f04ffdc7e7e30 @@ -121,39 +121,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f + 28587dc14946a1c623dd6b1fb498272aff48f92e - + https://github.com/dotnet/fsharp - f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f + 28587dc14946a1c623dd6b1fb498272aff48f92e - + https://github.com/microsoft/vstest - a809880e02d8a9986e3ba1daeeeb5078fbb96be5 + d3c6439b04452047cb62fc645ce341a034bdb5be - + https://github.com/dotnet/linker - d0662ed8db919642177ddfd06a1c33895a69015f + 70dc7f6daaf50e8eb67afb91876b8efc8330103f linker - + https://github.com/dotnet/roslyn - f206c5d203c5562f814d3afa3c9e695250391c76 + 637de22a0f15f93be1b5b9204b767d276077c633 - + https://github.com/dotnet/msbuild - 797fd829a374a880f63fd4eea4ea6990404c48f4 + 9ef2fa86f5caa734e697f5bffea80237f8100e43 - + https://github.com/nuget/nuget.client - 9187a50daec29061772a2057490697c6c0e4c354 + f1906d3d581e0ea0bdd282134208d654f8447880 diff --git a/eng/Versions.props b/eng/Versions.props index 961d6500f..8955f3f9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-preview.21623.5 + 6.0.200-preview.22062.10 @@ -56,8 +56,8 @@ - 6.0.200-preview.22055.23 - 6.0.200-preview.22055.23 + 6.0.300-preview.22076.9 + 6.0.300-preview.22076.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.200-preview.21623.5 + 6.0.200-preview.22062.10 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211210-01 + 17.1.0-release-20220113-05 From 464910c153a4cb80b84d770360462ee2fed50fc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 01:53:54 +0000 Subject: [PATCH 131/462] Update dependencies from https://github.com/dotnet/sdk build 20220126.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22076.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 3277993b8..da4cb6e26 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 - 70cef52a878e81b9cada704b9f2f04ffdc7e7e30 + 09e66623fb1ce0ac5682517a50df4f00a5fa5ddf - + https://github.com/dotnet/sdk - 70cef52a878e81b9cada704b9f2f04ffdc7e7e30 + 09e66623fb1ce0ac5682517a50df4f00a5fa5ddf diff --git a/eng/Versions.props b/eng/Versions.props index 8955f3f9b..2efa9789f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22076.9 - 6.0.300-preview.22076.9 + 6.0.300-preview.22076.11 + 6.0.300-preview.22076.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 723a8f25cc9b8862737b79555cf3858f481eb436 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 02:42:13 +0000 Subject: [PATCH 132/462] Update dependencies from https://github.com/dotnet/sdk build 20220126.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22076.14 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 da4cb6e26..4cf0703f1 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 - 09e66623fb1ce0ac5682517a50df4f00a5fa5ddf + 629cde59e0d62e1324d7196cb900be24a81ace89 - + https://github.com/dotnet/sdk - 09e66623fb1ce0ac5682517a50df4f00a5fa5ddf + 629cde59e0d62e1324d7196cb900be24a81ace89 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 28587dc14946a1c623dd6b1fb498272aff48f92e + 3a271d5f0ff3ee996da0894a9446207087f09bd2 - + https://github.com/dotnet/fsharp - 28587dc14946a1c623dd6b1fb498272aff48f92e + 3a271d5f0ff3ee996da0894a9446207087f09bd2 diff --git a/eng/Versions.props b/eng/Versions.props index 2efa9789f..8d77a663f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22076.11 - 6.0.300-preview.22076.11 + 6.0.300-preview.22076.14 + 6.0.300-preview.22076.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d257a5eb1afb8c5173309ec23dd4d5b4e76ff438 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 04:39:04 +0000 Subject: [PATCH 133/462] 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 986baf26ed3f197743d340432458ef66d920f1dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 06:07:10 +0000 Subject: [PATCH 134/462] Update dependencies from https://github.com/dotnet/sdk build 20220126.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22076.21 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 4cf0703f1..190a9e45c 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 - 629cde59e0d62e1324d7196cb900be24a81ace89 + ee627a5f5a3e93250d85026c0e51be9a5ab8ef67 - + https://github.com/dotnet/sdk - 629cde59e0d62e1324d7196cb900be24a81ace89 + ee627a5f5a3e93250d85026c0e51be9a5ab8ef67 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 3a271d5f0ff3ee996da0894a9446207087f09bd2 + 6eaa9c7d1770c575294c52ab7f3944a1842430cd - + https://github.com/dotnet/fsharp - 3a271d5f0ff3ee996da0894a9446207087f09bd2 + 6eaa9c7d1770c575294c52ab7f3944a1842430cd diff --git a/eng/Versions.props b/eng/Versions.props index 8d77a663f..551eec7cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22076.14 - 6.0.300-preview.22076.14 + 6.0.300-preview.22076.21 + 6.0.300-preview.22076.21 $(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 135/462] 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 bbd3a7224bd638bad4fc16f9182108f4d932f7bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 17:00:47 +0000 Subject: [PATCH 136/462] Update dependencies from https://github.com/dotnet/sdk build 20220127.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22077.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 190a9e45c..8578a2a80 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 - ee627a5f5a3e93250d85026c0e51be9a5ab8ef67 + 47c3dd45c70391d98068087ce73df6f8c9d419e2 - + https://github.com/dotnet/sdk - ee627a5f5a3e93250d85026c0e51be9a5ab8ef67 + 47c3dd45c70391d98068087ce73df6f8c9d419e2 diff --git a/eng/Versions.props b/eng/Versions.props index 551eec7cf..a6345c87f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22076.21 - 6.0.300-preview.22076.21 + 6.0.300-preview.22077.5 + 6.0.300-preview.22077.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 59755fe85d35a017f64a092d97d71e836c480a1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 19:21:24 +0000 Subject: [PATCH 137/462] Update dependencies from https://github.com/dotnet/sdk build 20220127.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22077.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 | 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 8578a2a80..91115f38c 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 - 47c3dd45c70391d98068087ce73df6f8c9d419e2 + c8e0d741ad056a19f0ecfef33815e7a59096c213 - + https://github.com/dotnet/sdk - 47c3dd45c70391d98068087ce73df6f8c9d419e2 + c8e0d741ad056a19f0ecfef33815e7a59096c213 diff --git a/eng/Versions.props b/eng/Versions.props index a6345c87f..3f393838c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22077.5 - 6.0.300-preview.22077.5 + 6.0.300-preview.22077.8 + 6.0.300-preview.22077.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a312fd6508e9f765fd969c32336b4e7bb53d4e76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 21:42:23 +0000 Subject: [PATCH 138/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220127.1 (#13129) [release/6.0.3xx] 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 fb9fdce5f..a87fad83d 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 76632510c44507cb35b1dccdb97d302463847e8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 22:03:36 +0000 Subject: [PATCH 139/462] Update dependencies from https://github.com/dotnet/sdk build 20220127.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22077.9 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 91115f38c..623ce00af 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 - c8e0d741ad056a19f0ecfef33815e7a59096c213 + c71ca5efe988ddff9ac80f385ce7854ec4b3398f - + https://github.com/dotnet/sdk - c8e0d741ad056a19f0ecfef33815e7a59096c213 + c71ca5efe988ddff9ac80f385ce7854ec4b3398f diff --git a/eng/Versions.props b/eng/Versions.props index 3f393838c..d876617ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22077.8 - 6.0.300-preview.22077.8 + 6.0.300-preview.22077.9 + 6.0.300-preview.22077.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d5f171953855b861da32eb06206b6305818f4431 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 27 Jan 2022 14:25:01 -0800 Subject: [PATCH 140/462] 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 141/462] 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 6d6fe7d2589b492b062a0b95a7875db43a3a93dc Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 28 Jan 2022 01:53:49 +0000 Subject: [PATCH 142/462] Remove source-build patches that were backported --- .../0001-Fix-MicrosoftExtensionsVersion.patch | 68 -------- ...2-Update-system-command-line-version.patch | 164 ------------------ .../0001-fix-tlens-Mono.Cecil-reference.patch | 24 --- ...t.DotNet.ApiCompat-from-source-build.patch | 24 --- ...t.NETFramework.ReferenceAssemblies-f.patch | 23 --- ...e-building-all-TFMs-for-source-build.patch | 50 ------ ...y-on-MS.VS.Setup.Configuration.Inter.patch | 118 ------------- 7 files changed, 471 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 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 delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.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 - - - -- -+ - - - -\ 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 @@ - - - -- -+ - - diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch deleted file mode 100644 index da26d2cb7..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -From b7f0c8d910b5fa110be7f34816c4934f61643d08 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 20 Oct 2021 15:19:29 -0500 -Subject: [PATCH] Restore building all TFMs for source-build - -Required for omnisharp, nuget-client, templating, sdk - -Background Issue: https://github.com/dotnet/source-build/issues/2542 -Patch removal issue: https://github.com/dotnet/source-build/issues/2556 ---- - src/Build/Microsoft.Build.csproj | 3 +-- - src/Directory.Build.props | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj -index f75408633..8dc86355a 100644 ---- a/src/Build/Microsoft.Build.csproj -+++ b/src/Build/Microsoft.Build.csproj -@@ -4,8 +4,7 @@ - - - -- net6.0 -- $(FullFrameworkTFM);net6.0 -+ $(FullFrameworkTFM);net6.0 - $(RuntimeOutputTargetFrameworks) - Microsoft.Build - Microsoft.Build -diff --git a/src/Directory.Build.props b/src/Directory.Build.props -index b0e233194..7e0c7d8c8 100644 ---- a/src/Directory.Build.props -+++ b/src/Directory.Build.props -@@ -27,13 +27,12 @@ - - - $(FullFrameworkTFM);netstandard2.0 -- netstandard2.0 - $(FullFrameworkTFM) - AnyCPU - - - net6.0 -- $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) -+ $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) - $(FullFrameworkTFM) - - --- -2.31.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 deleted file mode 100644 index 9a55fed1b..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ /dev/null @@ -1,118 +0,0 @@ -From a75f4b17c3595079f69ea00041182368adea14c9 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Wed, 20 Oct 2021 21:49:51 +0000 -Subject: [PATCH] Remove dependency on MS.VS.Setup.Configuration.Interop - -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 +- - 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 -+++ b/src/Build/Microsoft.Build.csproj -@@ -38,8 +38,10 @@ - - - -- -+ - -+ -+ - - - -diff --git a/src/Directory.BeforeCommon.targets b/src/Directory.BeforeCommon.targets -index 913c97b12..320bffa56 100644 ---- a/src/Directory.BeforeCommon.targets -+++ b/src/Directory.BeforeCommon.targets -@@ -99,7 +99,7 @@ - $(DefineConstants);FEATURE_DEBUGGER - $(DefineConstants);FEATURE_WIN32_REGISTRY - $(DefineConstants);FEATURE_WORKINGSET -- $(DefineConstants);FEATURE_VISUALSTUDIOSETUP -+ $(DefineConstants);FEATURE_VISUALSTUDIOSETUP - $(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 -+++ b/src/Samples/Directory.Build.props -@@ -8,6 +8,7 @@ - false - - false -+ true - - - -diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj -index d8f81bf99..3a5514094 100644 ---- a/src/Tasks/Microsoft.Build.Tasks.csproj -+++ b/src/Tasks/Microsoft.Build.Tasks.csproj -@@ -999,8 +999,10 @@ - - - -- -+ - -+ -+ - - - -diff --git a/src/Utilities/Microsoft.Build.Utilities.csproj b/src/Utilities/Microsoft.Build.Utilities.csproj -index 09634e723..72d838d9d 100644 ---- a/src/Utilities/Microsoft.Build.Utilities.csproj -+++ b/src/Utilities/Microsoft.Build.Utilities.csproj -@@ -25,7 +25,7 @@ - - - -- -+ - - - --- -2.31.1 - From 69e4975f6cc203eed56f6fb4f05104d8c9b20036 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jan 2022 04:02:19 +0000 Subject: [PATCH 143/462] Update dependencies from https://github.com/dotnet/sdk build 20220127.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22077.16 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 623ce00af..3944aa853 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 - c71ca5efe988ddff9ac80f385ce7854ec4b3398f + c14220493ad94bd5191cb9ff662c5fd0a180c46d - + https://github.com/dotnet/sdk - c71ca5efe988ddff9ac80f385ce7854ec4b3398f + c14220493ad94bd5191cb9ff662c5fd0a180c46d @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 6eaa9c7d1770c575294c52ab7f3944a1842430cd + 9b12d1dc1991ecc65f87a2b683ddc95df32ec3ac - + https://github.com/dotnet/fsharp - 6eaa9c7d1770c575294c52ab7f3944a1842430cd + 9b12d1dc1991ecc65f87a2b683ddc95df32ec3ac diff --git a/eng/Versions.props b/eng/Versions.props index d876617ed..3cfd24a74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22077.9 - 6.0.300-preview.22077.9 + 6.0.300-preview.22077.16 + 6.0.300-preview.22077.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) 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 144/462] [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 145/462] 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 0b16668e389c8d80e7c5c006e83ea9b9733ec669 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jan 2022 15:49:35 +0000 Subject: [PATCH 146/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220128.1 (#13141) [release/6.0.3xx] 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 a87fad83d..1cd6f4cf4 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 efeb47f03453dff36ab12374ada940493ed6b635 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jan 2022 22:44:16 +0000 Subject: [PATCH 147/462] Update dependencies from https://github.com/dotnet/sdk build 20220128.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22078.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 | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3944aa853..6762eff50 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 - c14220493ad94bd5191cb9ff662c5fd0a180c46d + 203b3b626c8a195ae6b4ee567143839f832c707c - + https://github.com/dotnet/sdk - c14220493ad94bd5191cb9ff662c5fd0a180c46d + 203b3b626c8a195ae6b4ee567143839f832c707c @@ -151,9 +151,9 @@ 9ef2fa86f5caa734e697f5bffea80237f8100e43 - + https://github.com/nuget/nuget.client - f1906d3d581e0ea0bdd282134208d654f8447880 + 37d61e55a7e486fba2d224effde3ac7b775f35b8 diff --git a/eng/Versions.props b/eng/Versions.props index 3cfd24a74..6260295ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22077.16 - 6.0.300-preview.22077.16 + 6.0.300-preview.22078.8 + 6.0.300-preview.22078.8 $(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 148/462] [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 149/462] 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 94780438c246c25082497c53abc38ef98d2c34f2 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 1 Feb 2022 16:24:40 +0000 Subject: [PATCH 150/462] Resolve source-build NuGet.client patch conflict --- ...emove-uneeded-source-build-patches-and-re-patch.patch | 9 --------- 1 file changed, 9 deletions(-) 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 36ce5217c..0b6be41b0 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 @@ -90,15 +90,6 @@ index c94acffd8..f4d083e52 100644 -@@ -189,7 +189,7 @@ - - $(PackagePathDir) - -- -+ - - - diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj index 21015c00a..e306cdee4 100644 --- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj From bb4604a613a1815c51dc147f95241a2f365caa42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Feb 2022 18:25:01 +0000 Subject: [PATCH 151/462] Update dependencies from https://github.com/dotnet/sdk build 20220201.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22101.3 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 6762eff50..f1826bc9b 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 - 203b3b626c8a195ae6b4ee567143839f832c707c + 1e4e6bac90ac999173bdcd14cefae96e37cad2ef - + https://github.com/dotnet/sdk - 203b3b626c8a195ae6b4ee567143839f832c707c + 1e4e6bac90ac999173bdcd14cefae96e37cad2ef diff --git a/eng/Versions.props b/eng/Versions.props index 6260295ab..78fcd3fbb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22078.8 - 6.0.300-preview.22078.8 + 6.0.300-preview.22101.3 + 6.0.300-preview.22101.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8ab7b51538c5dffa54f9ec276aebb4b4b51b7281 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 1 Feb 2022 23:58:42 +0000 Subject: [PATCH 152/462] 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 8fb27683d320c3a88138159a9cffaca3479190d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Feb 2022 00:05:41 +0000 Subject: [PATCH 153/462] Update dependencies from https://github.com/dotnet/sdk build 20220201.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22101.15 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 f1826bc9b..b411444a4 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 - 1e4e6bac90ac999173bdcd14cefae96e37cad2ef + f1004462cf1943033172ec7dfb01165249922261 - + https://github.com/dotnet/sdk - 1e4e6bac90ac999173bdcd14cefae96e37cad2ef + f1004462cf1943033172ec7dfb01165249922261 diff --git a/eng/Versions.props b/eng/Versions.props index 78fcd3fbb..587b38e6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22101.3 - 6.0.300-preview.22101.3 + 6.0.300-preview.22101.15 + 6.0.300-preview.22101.15 $(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 154/462] 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 9538c727f0165252313d029fe90579c9da82f7d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Feb 2022 12:26:19 +0000 Subject: [PATCH 155/462] Update dependencies from https://github.com/dotnet/sdk build 20220202.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22102.2 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 b411444a4..a1506fbef 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 - f1004462cf1943033172ec7dfb01165249922261 + 02770f261377784fde8159aacd28b33e53502bc3 - + https://github.com/dotnet/sdk - f1004462cf1943033172ec7dfb01165249922261 + 02770f261377784fde8159aacd28b33e53502bc3 diff --git a/eng/Versions.props b/eng/Versions.props index 587b38e6e..59e7c704c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22101.15 - 6.0.300-preview.22101.15 + 6.0.300-preview.22102.2 + 6.0.300-preview.22102.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 138ab44a2549ea9853ac433ac4ec14c1ec0f4fe0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Feb 2022 19:55:38 +0000 Subject: [PATCH 156/462] Update dependencies from https://github.com/dotnet/sdk build 20220202.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22102.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 | 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 a1506fbef..40be0827d 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 - 02770f261377784fde8159aacd28b33e53502bc3 + 40b39d9ac520941a9565a2d35008310331fc9529 - + https://github.com/dotnet/sdk - 02770f261377784fde8159aacd28b33e53502bc3 + 40b39d9ac520941a9565a2d35008310331fc9529 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 9b12d1dc1991ecc65f87a2b683ddc95df32ec3ac + 0cce0cbe615b0a944c7b95da646b0dd643f88758 - + https://github.com/dotnet/fsharp - 9b12d1dc1991ecc65f87a2b683ddc95df32ec3ac + 0cce0cbe615b0a944c7b95da646b0dd643f88758 @@ -151,9 +151,9 @@ 9ef2fa86f5caa734e697f5bffea80237f8100e43 - + https://github.com/nuget/nuget.client - 37d61e55a7e486fba2d224effde3ac7b775f35b8 + 64c2460bf84fd332baf1794a6604d9f6329e313a diff --git a/eng/Versions.props b/eng/Versions.props index 59e7c704c..4265a3864 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22102.2 - 6.0.300-preview.22102.2 + 6.0.300-preview.22102.8 + 6.0.300-preview.22102.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fcd71d7ec0fd2c5c148cbc72be76d621196482e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Feb 2022 23:31:29 +0000 Subject: [PATCH 157/462] Update dependencies from https://github.com/dotnet/sdk build 20220202.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22102.20 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 40be0827d..bfd65c702 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 - 40b39d9ac520941a9565a2d35008310331fc9529 + affdf86affc825093baf9102c6390dfff702adaf - + https://github.com/dotnet/sdk - 40b39d9ac520941a9565a2d35008310331fc9529 + affdf86affc825093baf9102c6390dfff702adaf diff --git a/eng/Versions.props b/eng/Versions.props index 4265a3864..fcfe8566c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22102.8 - 6.0.300-preview.22102.8 + 6.0.300-preview.22102.20 + 6.0.300-preview.22102.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 158/462] 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 159/462] 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 160/462] 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 57c156bf12a97ea2a1c66364f2ecb8273d01e701 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 08:44:02 -0800 Subject: [PATCH 161/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220203.1 (#13161) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22078.1 -> To Version 6.0.0-servicing.22103.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 1cd6f4cf4..71c2577c6 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 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 162/462] 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 163/462] 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 164/462] 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 4877a9841bc963d51849029505ee9ecb4201ceaa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Feb 2022 17:42:17 +0000 Subject: [PATCH 165/462] Update dependencies from https://github.com/dotnet/sdk build 20220203.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22103.9 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.300-preview.22103.4 (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 bfd65c702..8967840b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 + 734533e99962c7c411e4ad2807d54afa9d18a73c - + https://github.com/dotnet/templating - 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 + 734533e99962c7c411e4ad2807d54afa9d18a73c - + https://github.com/dotnet/templating - 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 + 734533e99962c7c411e4ad2807d54afa9d18a73c - + https://github.com/dotnet/sdk - affdf86affc825093baf9102c6390dfff702adaf + 28d05714629651f33d42c332acd49d7674517bb6 - + https://github.com/dotnet/sdk - affdf86affc825093baf9102c6390dfff702adaf + 28d05714629651f33d42c332acd49d7674517bb6 diff --git a/eng/Versions.props b/eng/Versions.props index fcfe8566c..35a700027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-preview.22062.10 + 6.0.300-preview.22103.4 @@ -56,8 +56,8 @@ - 6.0.300-preview.22102.20 - 6.0.300-preview.22102.20 + 6.0.300-preview.22103.9 + 6.0.300-preview.22103.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.200-preview.22062.10 + 6.0.300-preview.22103.4 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From eecf4d7f5e9a942f94c47481eab97621b6f63938 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 09:48:52 -0800 Subject: [PATCH 166/462] Update dependencies from https://github.com/dotnet/arcade build 20220202.3 (#13165) 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 Co-authored-by: dotnet-maestro[bot] --- 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 +- 21 files changed, 340 insertions(+), 1195 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/eng/Version.Details.xml b/eng/Version.Details.xml index 71c2577c6..a63f8d99b 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 961d6500f..48f420f4d 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 8b453b9eceba5ef77387e1c358471de348371007 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 3 Feb 2022 10:21:02 -0800 Subject: [PATCH 167/462] 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 168/462] 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 169/462] 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 172/462] 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 173/462] 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 0597782ad1a1ae308673052439763b64f0bcd60b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Feb 2022 23:00:29 +0000 Subject: [PATCH 174/462] Update dependencies from https://github.com/dotnet/sdk build 20220203.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22103.25 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.300-preview.22103.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 8967840b4..7a1ad0014 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 734533e99962c7c411e4ad2807d54afa9d18a73c - + https://github.com/dotnet/sdk - 28d05714629651f33d42c332acd49d7674517bb6 + 6cbbffbea62b4f7665b5e0d086ea33b43b857336 - + https://github.com/dotnet/sdk - 28d05714629651f33d42c332acd49d7674517bb6 + 6cbbffbea62b4f7665b5e0d086ea33b43b857336 diff --git a/eng/Versions.props b/eng/Versions.props index 35a700027..85859bf2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22103.9 - 6.0.300-preview.22103.9 + 6.0.300-preview.22103.25 + 6.0.300-preview.22103.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 10010251e6686eb320a8604468fb8f054b1bad75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Feb 2022 03:07:12 +0000 Subject: [PATCH 175/462] Update dependencies from https://github.com/dotnet/sdk build 20220203.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22103.30 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.300-preview.22103.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 7a1ad0014..a047b3ae5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 734533e99962c7c411e4ad2807d54afa9d18a73c - + https://github.com/dotnet/sdk - 6cbbffbea62b4f7665b5e0d086ea33b43b857336 + 07547edff0f6d1b2228a8de8dac3b58581f0c5df - + https://github.com/dotnet/sdk - 6cbbffbea62b4f7665b5e0d086ea33b43b857336 + 07547edff0f6d1b2228a8de8dac3b58581f0c5df @@ -146,9 +146,9 @@ 637de22a0f15f93be1b5b9204b767d276077c633 - + https://github.com/dotnet/msbuild - 9ef2fa86f5caa734e697f5bffea80237f8100e43 + a2b5fc2d33dd19e85fdd73ce20edd235b9149e8e diff --git a/eng/Versions.props b/eng/Versions.props index 85859bf2f..d4566fcee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22103.25 - 6.0.300-preview.22103.25 + 6.0.300-preview.22103.30 + 6.0.300-preview.22103.30 $(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 176/462] 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 2d05a69434efc4962cb8bd270eb4376ae1d505ed Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 4 Feb 2022 16:59:22 +0000 Subject: [PATCH 177/462] Resolve source-build nuget patch conflict --- .../0001-Remove-uneeded-source-build-patches-and-re-patch.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0b6be41b0..65f3fbca5 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 @@ -33,7 +33,7 @@ index 79a935391..65e482b83 100644 PackageReference v4.7.2 net472 -- netcoreapp2.1 +- netcoreapp3.1 - net6.0 + net6.0 netcoreapp5.0 From 85b52bbcd2ea7775a4e9cd8e5d7cb973dc63dfad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Feb 2022 17:28:34 +0000 Subject: [PATCH 178/462] Update dependencies from https://github.com/dotnet/sdk build 20220204.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22104.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.300-preview.22104.2 (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 a047b3ae5..1110aaa82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 734533e99962c7c411e4ad2807d54afa9d18a73c + ea0e1b00c591d2599b8d7efa7e03c14583187236 - + https://github.com/dotnet/templating - 734533e99962c7c411e4ad2807d54afa9d18a73c + ea0e1b00c591d2599b8d7efa7e03c14583187236 - + https://github.com/dotnet/templating - 734533e99962c7c411e4ad2807d54afa9d18a73c + ea0e1b00c591d2599b8d7efa7e03c14583187236 - + https://github.com/dotnet/sdk - 07547edff0f6d1b2228a8de8dac3b58581f0c5df + d5edc28442a097bf74712e212d093a59be715494 - + https://github.com/dotnet/sdk - 07547edff0f6d1b2228a8de8dac3b58581f0c5df + d5edc28442a097bf74712e212d093a59be715494 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 637de22a0f15f93be1b5b9204b767d276077c633 + 8d81aa51ec316d6a545cbc1a0afebad320444d7b diff --git a/eng/Versions.props b/eng/Versions.props index d4566fcee..3cc5d43de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22103.4 + 6.0.300-preview.22104.2 @@ -56,8 +56,8 @@ - 6.0.300-preview.22103.30 - 6.0.300-preview.22103.30 + 6.0.300-preview.22104.5 + 6.0.300-preview.22104.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22103.4 + 6.0.300-preview.22104.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From a56db4a33f189ad28d3e54969c908122d422534f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 4 Feb 2022 22:48:34 +0000 Subject: [PATCH 179/462] 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 180/462] 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 893b2df42d20ab626ce4b6dbf28ec5096c752cbd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Feb 2022 01:12:50 +0000 Subject: [PATCH 181/462] Update dependencies from https://github.com/dotnet/sdk build 20220204.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22104.17 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.300-preview.22104.2 (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 1110aaa82..6dba94e1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ea0e1b00c591d2599b8d7efa7e03c14583187236 - + https://github.com/dotnet/sdk - d5edc28442a097bf74712e212d093a59be715494 + 40a569166eca5e23a7e7a6ad1bc572781163c501 - + https://github.com/dotnet/sdk - d5edc28442a097bf74712e212d093a59be715494 + 40a569166eca5e23a7e7a6ad1bc572781163c501 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 0cce0cbe615b0a944c7b95da646b0dd643f88758 + 8c5e4cb4b21daec61507b660d6e99db09cd9afe7 - + https://github.com/dotnet/fsharp - 0cce0cbe615b0a944c7b95da646b0dd643f88758 + 8c5e4cb4b21daec61507b660d6e99db09cd9afe7 diff --git a/eng/Versions.props b/eng/Versions.props index 3cc5d43de..a09a8d90b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22104.5 - 6.0.300-preview.22104.5 + 6.0.300-preview.22104.17 + 6.0.300-preview.22104.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e0993bd73c2548b5420e3b1158a34d6522adca6f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sat, 5 Feb 2022 06:33:35 +0000 Subject: [PATCH 182/462] 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 183/462] 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 8edd6f749f22b6fbdd46eac7c33e2f4a2aa0ed64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Feb 2022 04:53:44 +0000 Subject: [PATCH 184/462] Update dependencies from https://github.com/dotnet/sdk build 20220206.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22106.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.300-preview.22104.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 6dba94e1a..070fdb3db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ea0e1b00c591d2599b8d7efa7e03c14583187236 - + https://github.com/dotnet/sdk - 40a569166eca5e23a7e7a6ad1bc572781163c501 + 6d5ba94e1c17da2f95d469fc51e38ddb0169dc28 - + https://github.com/dotnet/sdk - 40a569166eca5e23a7e7a6ad1bc572781163c501 + 6d5ba94e1c17da2f95d469fc51e38ddb0169dc28 @@ -146,9 +146,9 @@ 8d81aa51ec316d6a545cbc1a0afebad320444d7b - + https://github.com/dotnet/msbuild - a2b5fc2d33dd19e85fdd73ce20edd235b9149e8e + 09bdfae164eac3b5c9027d803ffa513efaf91095 diff --git a/eng/Versions.props b/eng/Versions.props index a09a8d90b..ad312df20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22104.17 - 6.0.300-preview.22104.17 + 6.0.300-preview.22106.5 + 6.0.300-preview.22106.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From df993040548a7019699d8924e2757653e0fc2606 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 16:31:43 +0000 Subject: [PATCH 185/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220205.1 (#13178) [release/6.0.3xx] 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 a63f8d99b..04231386d 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 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 186/462] [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 6b97f3b12f971dc55422639615032b0ea8bc7c27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Feb 2022 17:27:11 +0000 Subject: [PATCH 187/462] Update dependencies from https://github.com/dotnet/sdk build 20220207.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22107.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.300-preview.22107.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 070fdb3db..2998ad81f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - ea0e1b00c591d2599b8d7efa7e03c14583187236 + ccd8fa620dd6f9ac404bf80e27b530220839e17f - + https://github.com/dotnet/templating - ea0e1b00c591d2599b8d7efa7e03c14583187236 + ccd8fa620dd6f9ac404bf80e27b530220839e17f - + https://github.com/dotnet/templating - ea0e1b00c591d2599b8d7efa7e03c14583187236 + ccd8fa620dd6f9ac404bf80e27b530220839e17f - + https://github.com/dotnet/sdk - 6d5ba94e1c17da2f95d469fc51e38ddb0169dc28 + 8ad04468432805fe4dc134c761abf02230b3acd0 - + https://github.com/dotnet/sdk - 6d5ba94e1c17da2f95d469fc51e38ddb0169dc28 + 8ad04468432805fe4dc134c761abf02230b3acd0 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 8c5e4cb4b21daec61507b660d6e99db09cd9afe7 + 8f0e95ee4014255c40480da61823e8b2bd4d0230 - + https://github.com/dotnet/fsharp - 8c5e4cb4b21daec61507b660d6e99db09cd9afe7 + 8f0e95ee4014255c40480da61823e8b2bd4d0230 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 8d81aa51ec316d6a545cbc1a0afebad320444d7b + 5c3b89b346788bcb504e18415f94aaa4ad53b86b diff --git a/eng/Versions.props b/eng/Versions.props index ad312df20..9e34317b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22104.2 + 6.0.300-preview.22107.3 @@ -56,8 +56,8 @@ - 6.0.300-preview.22106.5 - 6.0.300-preview.22106.5 + 6.0.300-preview.22107.4 + 6.0.300-preview.22107.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22104.2 + 6.0.300-preview.22107.3 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From f270ad60f9fd0a6bfe3e4d3cae51af95646ba13d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Feb 2022 19:59:58 +0000 Subject: [PATCH 188/462] Update dependencies from https://github.com/dotnet/sdk build 20220207.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22107.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.300-preview.22107.3 (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 2998ad81f..3fa329478 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ccd8fa620dd6f9ac404bf80e27b530220839e17f - + https://github.com/dotnet/sdk - 8ad04468432805fe4dc134c761abf02230b3acd0 + 434f7358a60f44cb3856f3601c91414b6b367e03 - + https://github.com/dotnet/sdk - 8ad04468432805fe4dc134c761abf02230b3acd0 + 434f7358a60f44cb3856f3601c91414b6b367e03 diff --git a/eng/Versions.props b/eng/Versions.props index 9e34317b8..6e3ddd9da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22107.4 - 6.0.300-preview.22107.4 + 6.0.300-preview.22107.8 + 6.0.300-preview.22107.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 09da66c677a6e4740fbaca860aa736d760e8edcf Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 7 Feb 2022 12:35:56 -0800 Subject: [PATCH 189/462] Update pools for publish build assets --- .vsts-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 652748bb7..303276853 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -391,7 +391,8 @@ stages: - Source_Build_Create_Tarball publishUsingPipelines: true pool: - vmImage: vs2017-win2016 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals build.windows.10.amd64.vs2019 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml From 94ce26aa1abc5b8b262d5226af2aa98c98b4ec88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Feb 2022 00:04:16 +0000 Subject: [PATCH 190/462] Update dependencies from https://github.com/dotnet/sdk build 20220207.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22107.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.300-preview.22107.9 (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 3fa329478..9c266cc0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - ccd8fa620dd6f9ac404bf80e27b530220839e17f + 00803e9950cb8303945c8fa763b468ec6e2b355d - + https://github.com/dotnet/templating - ccd8fa620dd6f9ac404bf80e27b530220839e17f + 00803e9950cb8303945c8fa763b468ec6e2b355d - + https://github.com/dotnet/templating - ccd8fa620dd6f9ac404bf80e27b530220839e17f + 00803e9950cb8303945c8fa763b468ec6e2b355d - + https://github.com/dotnet/sdk - 434f7358a60f44cb3856f3601c91414b6b367e03 + cbf5e0534fef32d8271cea6f117262afa9eda5ea - + https://github.com/dotnet/sdk - 434f7358a60f44cb3856f3601c91414b6b367e03 + cbf5e0534fef32d8271cea6f117262afa9eda5ea diff --git a/eng/Versions.props b/eng/Versions.props index 6e3ddd9da..992713f0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22107.3 + 6.0.300-preview.22107.9 @@ -56,8 +56,8 @@ - 6.0.300-preview.22107.8 - 6.0.300-preview.22107.8 + 6.0.300-preview.22107.13 + 6.0.300-preview.22107.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22107.3 + 6.0.300-preview.22107.9 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 399d10fd8b7e305016570e7f6680fa3a4bd2830b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Feb 2022 08:05:26 +0000 Subject: [PATCH 191/462] Update dependencies from https://github.com/dotnet/sdk build 20220207.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22107.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.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.300-preview.22107.9 (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 9c266cc0b..3b44c84fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 00803e9950cb8303945c8fa763b468ec6e2b355d - + https://github.com/dotnet/sdk - cbf5e0534fef32d8271cea6f117262afa9eda5ea + 7c879623fedc43a31ac410e33cdf23244c7138f6 - + https://github.com/dotnet/sdk - cbf5e0534fef32d8271cea6f117262afa9eda5ea + 7c879623fedc43a31ac410e33cdf23244c7138f6 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 8f0e95ee4014255c40480da61823e8b2bd4d0230 + 10c803fa1c776a1f80de8b71adc863d7f8a8a261 - + https://github.com/dotnet/fsharp - 8f0e95ee4014255c40480da61823e8b2bd4d0230 + 10c803fa1c776a1f80de8b71adc863d7f8a8a261 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 5c3b89b346788bcb504e18415f94aaa4ad53b86b + 8a09da9eaed0c0a8cf3b63b86a448aebc49e96f6 diff --git a/eng/Versions.props b/eng/Versions.props index 992713f0f..7d08c4556 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22107.13 - 6.0.300-preview.22107.13 + 6.0.300-preview.22107.19 + 6.0.300-preview.22107.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b268e672ffbe0f4fe84c221b6ec69997f508c3bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Feb 2022 08:22:24 -0800 Subject: [PATCH 192/462] Update dependencies from https://github.com/dotnet/arcade build 20220207.2 (#13187) 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] --- 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 04231386d..9e8b1f2b4 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 48f420f4d..ca044a3ad 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 ea4be9c1a74c618fa2dc0019732ac26698e0a7b3 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 8 Feb 2022 13:15:48 -0800 Subject: [PATCH 193/462] [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 28bb7039a03366142338f3fc76eba2a5f1ceff4c Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 8 Feb 2022 13:16:48 -0800 Subject: [PATCH 194/462] [release/6.0.3xx] 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 b13d3e2d36b4d4f97f6e9d9633fee3532138c456 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Feb 2022 21:49:01 +0000 Subject: [PATCH 195/462] Update dependencies from https://github.com/dotnet/sdk build 20220208.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22108.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.300-preview.22107.9 (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 3b44c84fe..2e9db97fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 00803e9950cb8303945c8fa763b468ec6e2b355d - + https://github.com/dotnet/sdk - 7c879623fedc43a31ac410e33cdf23244c7138f6 + 43ebbbf26281904274cb2eaac76f82e2223a809f - + https://github.com/dotnet/sdk - 7c879623fedc43a31ac410e33cdf23244c7138f6 + 43ebbbf26281904274cb2eaac76f82e2223a809f diff --git a/eng/Versions.props b/eng/Versions.props index 7d08c4556..925004104 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22107.19 - 6.0.300-preview.22107.19 + 6.0.300-preview.22108.4 + 6.0.300-preview.22108.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b2eed32257c6e32a591eab75555eaeb4abeb04b1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 8 Feb 2022 16:03:45 -0800 Subject: [PATCH 196/462] 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 197/462] 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 4b8724910b5ba8b5fb4cb6564e6019d23075fb40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Feb 2022 07:39:01 +0000 Subject: [PATCH 198/462] Update dependencies from https://github.com/dotnet/sdk build 20220208.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22108.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.300-preview.22108.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e9db97fa..7afe001bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 00803e9950cb8303945c8fa763b468ec6e2b355d + 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/templating - 00803e9950cb8303945c8fa763b468ec6e2b355d + 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/templating - 00803e9950cb8303945c8fa763b468ec6e2b355d + 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/sdk - 43ebbbf26281904274cb2eaac76f82e2223a809f + 2e3197f98b8ef2644d0ce2f7e0a0123887e5ba01 - + https://github.com/dotnet/sdk - 43ebbbf26281904274cb2eaac76f82e2223a809f + 2e3197f98b8ef2644d0ce2f7e0a0123887e5ba01 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 10c803fa1c776a1f80de8b71adc863d7f8a8a261 + 0eefd48f01cb243394ae4257ebb5a87acda54bb0 - + https://github.com/dotnet/fsharp - 10c803fa1c776a1f80de8b71adc863d7f8a8a261 + 0eefd48f01cb243394ae4257ebb5a87acda54bb0 diff --git a/eng/Versions.props b/eng/Versions.props index 925004104..c393a8c80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22107.9 + 6.0.300-preview.22108.9 @@ -56,8 +56,8 @@ - 6.0.300-preview.22108.4 - 6.0.300-preview.22108.4 + 6.0.300-preview.22108.11 + 6.0.300-preview.22108.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22107.9 + 6.0.300-preview.22108.9 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) 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 199/462] [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 e394f3725c91312afa5b09ee6b0be14cb164004e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Feb 2022 16:19:06 +0000 Subject: [PATCH 200/462] Update dependencies from https://github.com/dotnet/sdk build 20220209.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22109.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.300-preview.22108.9 (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 7afe001bb..c02b5513b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/sdk - 2e3197f98b8ef2644d0ce2f7e0a0123887e5ba01 + 2e0d47e9f0f8c5479a778f5225ec710a8031cf9e - + https://github.com/dotnet/sdk - 2e3197f98b8ef2644d0ce2f7e0a0123887e5ba01 + 2e0d47e9f0f8c5479a778f5225ec710a8031cf9e @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 8a09da9eaed0c0a8cf3b63b86a448aebc49e96f6 + a29b6ae89a8885856e4c55a0e92ba056e1530458 diff --git a/eng/Versions.props b/eng/Versions.props index c393a8c80..5e762cde0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22108.11 - 6.0.300-preview.22108.11 + 6.0.300-preview.22109.4 + 6.0.300-preview.22109.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bcd4831d7380a39a8a1b055c1151c993176dfb82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Feb 2022 23:29:52 +0000 Subject: [PATCH 201/462] Update dependencies from https://github.com/dotnet/sdk build 20220209.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22109.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.300-preview.22108.9 (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 c02b5513b..212a6f7bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/sdk - 2e0d47e9f0f8c5479a778f5225ec710a8031cf9e + 5e2aa1203036b7d4b160877650771db367d4be4d - + https://github.com/dotnet/sdk - 2e0d47e9f0f8c5479a778f5225ec710a8031cf9e + 5e2aa1203036b7d4b160877650771db367d4be4d diff --git a/eng/Versions.props b/eng/Versions.props index 5e762cde0..658b2b5b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22109.4 - 6.0.300-preview.22109.4 + 6.0.300-preview.22109.12 + 6.0.300-preview.22109.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From acdce665b4b114f259380a0e3c4bd2450a79e731 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Feb 2022 06:25:22 +0000 Subject: [PATCH 202/462] Update dependencies from https://github.com/dotnet/sdk build 20220209.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22109.17 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.300-preview.22108.9 (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 212a6f7bf..470b2694f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/sdk - 5e2aa1203036b7d4b160877650771db367d4be4d + eadd2b11cdbd8aa4aa80195f492f4c690187c236 - + https://github.com/dotnet/sdk - 5e2aa1203036b7d4b160877650771db367d4be4d + eadd2b11cdbd8aa4aa80195f492f4c690187c236 diff --git a/eng/Versions.props b/eng/Versions.props index 658b2b5b7..0fc7fc145 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22109.12 - 6.0.300-preview.22109.12 + 6.0.300-preview.22109.17 + 6.0.300-preview.22109.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b493a636c1630e62019bdcc9480c4497d0f59c6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Feb 2022 09:17:46 +0000 Subject: [PATCH 203/462] Update dependencies from https://github.com/dotnet/sdk build 20220210.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22110.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.300-preview.22108.9 (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 470b2694f..af6316dc8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/sdk - eadd2b11cdbd8aa4aa80195f492f4c690187c236 + 3a4752e590f1c4d50b2b99a198d434548daf1f8f - + https://github.com/dotnet/sdk - eadd2b11cdbd8aa4aa80195f492f4c690187c236 + 3a4752e590f1c4d50b2b99a198d434548daf1f8f @@ -130,9 +130,9 @@ 0eefd48f01cb243394ae4257ebb5a87acda54bb0 - + https://github.com/microsoft/vstest - d3c6439b04452047cb62fc645ce341a034bdb5be + 75765f2afc7425f47efde1a59a8eb86cf81658f9 diff --git a/eng/Versions.props b/eng/Versions.props index 0fc7fc145..04449b295 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22109.17 - 6.0.300-preview.22109.17 + 6.0.300-preview.22110.1 + 6.0.300-preview.22110.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-release-20220113-05 + 17.2.0-release-20220209-04 From 5364cdab855131f3e5c963f5b7847577716fa925 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Feb 2022 19:00:34 +0000 Subject: [PATCH 204/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220210.1 (#13214) [release/6.0.3xx] 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 9e8b1f2b4..101a4aaff 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 0f838f433ee5bfd2f7e31d2e20ddb9f7de47a848 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Feb 2022 10:02:56 +0000 Subject: [PATCH 205/462] Update dependencies from https://github.com/dotnet/sdk build 20220211.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22111.2 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.300-preview.22110.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 af6316dc8..64bcc73ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 5e827b260ad9a4b5beb80f375ecdabade64a92d0 + 99727ddbf86a2165d3ba2b7162a8849a23d39de2 - + https://github.com/dotnet/templating - 5e827b260ad9a4b5beb80f375ecdabade64a92d0 + 99727ddbf86a2165d3ba2b7162a8849a23d39de2 - + https://github.com/dotnet/templating - 5e827b260ad9a4b5beb80f375ecdabade64a92d0 + 99727ddbf86a2165d3ba2b7162a8849a23d39de2 - + https://github.com/dotnet/sdk - 3a4752e590f1c4d50b2b99a198d434548daf1f8f + f129632a2fcc566bf1c14689d6a1e9586b47f7a6 - + https://github.com/dotnet/sdk - 3a4752e590f1c4d50b2b99a198d434548daf1f8f + f129632a2fcc566bf1c14689d6a1e9586b47f7a6 diff --git a/eng/Versions.props b/eng/Versions.props index 04449b295..1c4a308c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22108.9 + 6.0.300-preview.22110.1 @@ -56,8 +56,8 @@ - 6.0.300-preview.22110.1 - 6.0.300-preview.22110.1 + 6.0.300-preview.22111.2 + 6.0.300-preview.22111.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22108.9 + 6.0.300-preview.22110.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) 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 206/462] [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 517153982b540643d9f33b8dca19f85b842386af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Feb 2022 22:19:20 +0000 Subject: [PATCH 207/462] Update dependencies from https://github.com/dotnet/sdk build 20220211.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22111.16 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.300-preview.22111.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 64bcc73ef..1342ecc8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 99727ddbf86a2165d3ba2b7162a8849a23d39de2 + 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/templating - 99727ddbf86a2165d3ba2b7162a8849a23d39de2 + 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/templating - 99727ddbf86a2165d3ba2b7162a8849a23d39de2 + 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/sdk - f129632a2fcc566bf1c14689d6a1e9586b47f7a6 + 0aac21f8d4066cc13c17312efba49a537d5435a1 - + https://github.com/dotnet/sdk - f129632a2fcc566bf1c14689d6a1e9586b47f7a6 + 0aac21f8d4066cc13c17312efba49a537d5435a1 diff --git a/eng/Versions.props b/eng/Versions.props index 1c4a308c5..8719685fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22110.1 + 6.0.300-preview.22111.1 @@ -56,8 +56,8 @@ - 6.0.300-preview.22111.2 - 6.0.300-preview.22111.2 + 6.0.300-preview.22111.16 + 6.0.300-preview.22111.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22110.1 + 6.0.300-preview.22111.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 15f196f102a91702ea2a19dddadd81a48cd7c071 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Feb 2022 11:06:18 +0000 Subject: [PATCH 208/462] Update dependencies from https://github.com/dotnet/sdk build 20220214.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22114.3 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.300-preview.22111.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 1342ecc8c..bad0e2855 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/sdk - 0aac21f8d4066cc13c17312efba49a537d5435a1 + e60eb7a1aa6cd6c89d3cf90da3cdbe10eb773a34 - + https://github.com/dotnet/sdk - 0aac21f8d4066cc13c17312efba49a537d5435a1 + e60eb7a1aa6cd6c89d3cf90da3cdbe10eb773a34 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - a29b6ae89a8885856e4c55a0e92ba056e1530458 + 661a1324c832f088f90479344a12cccdadf20721 @@ -151,9 +151,9 @@ 09bdfae164eac3b5c9027d803ffa513efaf91095 - + https://github.com/nuget/nuget.client - 64c2460bf84fd332baf1794a6604d9f6329e313a + a36df4eafb045b5f189e7219a5261f1f34ba768a diff --git a/eng/Versions.props b/eng/Versions.props index 8719685fa..4647de74f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22111.16 - 6.0.300-preview.22111.16 + 6.0.300-preview.22114.3 + 6.0.300-preview.22114.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0ef0d45bdfd99feefb0f0bf3079bf3e4d14bd0cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Feb 2022 15:59:19 +0000 Subject: [PATCH 209/462] 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 --- 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 101a4aaff..3dd9a0ce6 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 e4b687014666351460bc7919e140aa27d2039a16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Feb 2022 15:59:20 +0000 Subject: [PATCH 210/462] 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 574d5237258a8e56700becfb64014c69bebd044e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Feb 2022 20:15:21 +0000 Subject: [PATCH 211/462] Update dependencies from https://github.com/dotnet/sdk build 20220215.10 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22115.10 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.300-preview.22111.1 (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 bad0e2855..7dc321ec4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/sdk - e60eb7a1aa6cd6c89d3cf90da3cdbe10eb773a34 + 756065527754660842cd330f7eb3e260775a9e0f - + https://github.com/dotnet/sdk - e60eb7a1aa6cd6c89d3cf90da3cdbe10eb773a34 + 756065527754660842cd330f7eb3e260775a9e0f @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 0eefd48f01cb243394ae4257ebb5a87acda54bb0 + d6b8f5acdc13330db5434fc3b9ea02a120aec97b - + https://github.com/dotnet/fsharp - 0eefd48f01cb243394ae4257ebb5a87acda54bb0 + d6b8f5acdc13330db5434fc3b9ea02a120aec97b @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 661a1324c832f088f90479344a12cccdadf20721 + e96ba4ed8c46c52194bc5eb59f13f56fded10254 diff --git a/eng/Versions.props b/eng/Versions.props index 4647de74f..ca1506952 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22114.3 - 6.0.300-preview.22114.3 + 6.0.300-preview.22115.10 + 6.0.300-preview.22115.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ec79e28c68e348b611ed5e5bf6134dbb04792f7c Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 16 Feb 2022 01:47:06 -0800 Subject: [PATCH 212/462] 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 25ef8a120ab55515362ada239ff82aeb7d36f902 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Feb 2022 11:17:58 +0000 Subject: [PATCH 213/462] Update dependencies from https://github.com/dotnet/sdk build 20220216.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22116.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.300-preview.22111.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 7dc321ec4..5f13ae39e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/sdk - 756065527754660842cd330f7eb3e260775a9e0f + 1c2d5571a1cdcd71f8201bd3095ba0d1a548cf48 - + https://github.com/dotnet/sdk - 756065527754660842cd330f7eb3e260775a9e0f + 1c2d5571a1cdcd71f8201bd3095ba0d1a548cf48 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - d6b8f5acdc13330db5434fc3b9ea02a120aec97b + e20b18e3307d5d4127e46bab55cfe2f0650971a0 - + https://github.com/dotnet/fsharp - d6b8f5acdc13330db5434fc3b9ea02a120aec97b + e20b18e3307d5d4127e46bab55cfe2f0650971a0 diff --git a/eng/Versions.props b/eng/Versions.props index ca1506952..f6ad4b2a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22115.10 - 6.0.300-preview.22115.10 + 6.0.300-preview.22116.1 + 6.0.300-preview.22116.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c1072fb83abd992ac6daf9720f5f42760954eec6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 08:01:19 +0000 Subject: [PATCH 214/462] Update dependencies from https://github.com/dotnet/sdk build 20220216.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22116.39 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.300-preview.22111.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 5f13ae39e..5b103bde3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/sdk - 1c2d5571a1cdcd71f8201bd3095ba0d1a548cf48 + 8dc72f8834fd0c11cc5d2cbf002e61e588c15e11 - + https://github.com/dotnet/sdk - 1c2d5571a1cdcd71f8201bd3095ba0d1a548cf48 + 8dc72f8834fd0c11cc5d2cbf002e61e588c15e11 @@ -146,9 +146,9 @@ e96ba4ed8c46c52194bc5eb59f13f56fded10254 - + https://github.com/dotnet/msbuild - 09bdfae164eac3b5c9027d803ffa513efaf91095 + def4fbb8675b5b1e3afc6a2613921953a542a9a9 diff --git a/eng/Versions.props b/eng/Versions.props index f6ad4b2a0..03c24897d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22116.1 - 6.0.300-preview.22116.1 + 6.0.300-preview.22116.39 + 6.0.300-preview.22116.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 691bfda71ec41065451b1c8a4d621be93b6e5484 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 10:23:26 +0000 Subject: [PATCH 215/462] Update dependencies from https://github.com/dotnet/sdk build 20220217.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22117.2 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.300-preview.22116.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 5b103bde3..90a73282f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 + 271daf347a6a2842497437aad531b1320e299ca3 - + https://github.com/dotnet/templating - 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 + 271daf347a6a2842497437aad531b1320e299ca3 - + https://github.com/dotnet/templating - 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 + 271daf347a6a2842497437aad531b1320e299ca3 - + https://github.com/dotnet/sdk - 8dc72f8834fd0c11cc5d2cbf002e61e588c15e11 + 4c6407290c78e13cdf785d69140845e14dc99099 - + https://github.com/dotnet/sdk - 8dc72f8834fd0c11cc5d2cbf002e61e588c15e11 + 4c6407290c78e13cdf785d69140845e14dc99099 diff --git a/eng/Versions.props b/eng/Versions.props index 03c24897d..4a21e42db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22111.1 + 6.0.300-preview.22116.5 @@ -56,8 +56,8 @@ - 6.0.300-preview.22116.39 - 6.0.300-preview.22116.39 + 6.0.300-preview.22117.2 + 6.0.300-preview.22117.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22111.1 + 6.0.300-preview.22116.5 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From d0537179f9e9906686bf506193d5bd349b177f0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 16:32:18 +0000 Subject: [PATCH 216/462] 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.22115.1 -> To Version 6.0.0-servicing.22117.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 3dd9a0ce6..93db93edf 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 332641837ae9e14cc995072e502330503c378991 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 16:32:23 +0000 Subject: [PATCH 217/462] 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 5ff8e00aaf3bc9cb03a3d5c0dc773bb80f479351 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 17 Feb 2022 19:12:35 +0000 Subject: [PATCH 218/462] Merged PR 21263: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22116.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22116.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22115.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.200 to 6.0.200 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.200-rtm.22103.10 to 6.0.200-rtm.22116.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.200 to 6.0.200 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.2-servicing.22064.7 to 6.0.3-servicing.22115.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.2-servicing.22064.8 to 6.0.3-servicing.22115.10 (parent: Micr... --- NuGet.config | 30 ++--- eng/Version.Details.xml | 112 +++++++++--------- eng/Versions.props | 44 +++---- ...uild-App.Ref-and-the-targeting-packs.patch | 32 ----- 4 files changed, 89 insertions(+), 129 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch diff --git a/NuGet.config b/NuGet.config index 605398339..deb21b652 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,22 @@ - - - + - + - - - + - + - - - + @@ -47,21 +41,15 @@ - - - + + - + - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2eb7b2625..6d9896797 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 30b96c6f9f788aee704113c6765c56810faa382a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 30b96c6f9f788aee704113c6765c56810faa382a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 30b96c6f9f788aee704113c6765c56810faa382a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 30b96c6f9f788aee704113c6765c56810faa382a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + 10db7350e1288caf09e684e1b219f8f5b08eca02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + 10db7350e1288caf09e684e1b219f8f5b08eca02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + 10db7350e1288caf09e684e1b219f8f5b08eca02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + 10db7350e1288caf09e684e1b219f8f5b08eca02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + 10db7350e1288caf09e684e1b219f8f5b08eca02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + 10db7350e1288caf09e684e1b219f8f5b08eca02 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + 10db7350e1288caf09e684e1b219f8f5b08eca02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e6d9bf1868c4aa2808714ada839018a8506bd7dd + 5a191c3f5cf233cd4eec14411da4ab9faeb05e50 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e6d9bf1868c4aa2808714ada839018a8506bd7dd + 5a191c3f5cf233cd4eec14411da4ab9faeb05e50 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e6d9bf1868c4aa2808714ada839018a8506bd7dd + 5a191c3f5cf233cd4eec14411da4ab9faeb05e50 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f9b6be31b19097cb47125075ca2e8322bf591fc0 + b2b2897587848c79d435dbc5b9fa5c5333c021cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f9b6be31b19097cb47125075ca2e8322bf591fc0 + b2b2897587848c79d435dbc5b9fa5c5333c021cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5ad241b9633924db40503de19cb502bb0aca7718 + ba13948446da002973d174e3d1c8843f844e6fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fb76229895cae74c1adc62c2411a0730a2f3759b + d974f4b15a6baa1235d4e8e80728b3e3d0899277 https://github.com/dotnet/fsharp @@ -135,15 +135,15 @@ d3c6439b04452047cb62fc645ce341a034bdb5be - + https://github.com/dotnet/linker - cc3dc76c374152f86ff73aa02f35782b713908c6 + bd4c0de8ffed062f9614b06c8f5390d834e30a07 linker - + https://github.com/dotnet/roslyn - 592501cbb9c9394072a245c15b3458ff88155d85 + 260d16a8ee0ab42d94d8dfdfe85a1279c85dcffd @@ -166,13 +166,17 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 1ec2e17fcfd86bdd6f7e7246b6d527e94e34c15a + ee0a97a0009c0e048789126253fea7994db676ac - + + https://github.com/dotnet/emsdk + ee0a97a0009c0e048789126253fea7994db676ac + + https://github.com/dotnet/source-build - 10d0f7e94aa45889155c312f51cfc01bf326b853 + 90bdf447e1b97605f109b34243ab8c9f215308e9 diff --git a/eng/Versions.props b/eng/Versions.props index aad8526a9..fed54488b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.2-servicing.22064.7 + 6.0.3-servicing.22115.6 - 6.0.2-servicing.22064.8 + 6.0.3-servicing.22115.10 @@ -44,44 +44,44 @@ - 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 + 6.0.3 + 6.0.3 + 6.0.3-servicing.22116.12 + 6.0.3-servicing.22116.12 + 6.0.3-servicing.22116.12 + 6.0.3-servicing.22116.12 0.2.0 - 6.0.200-rtm.22104.9 - 6.0.200-rtm.22104.9 + 6.0.201-servicing.22116.30 + 6.0.201-servicing.22116.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.1 + 6.0.2 - 6.0.2-servicing.22064.6 - 6.0.2-servicing.22064.6 - 6.0.2 - 6.0.2 - 6.0.2 - 6.0.2 + 6.0.3-servicing.22115.5 + 6.0.3-servicing.22115.5 + 6.0.3 + 6.0.3 + 6.0.3 + 6.0.3 2.1.0 - 6.0.2-servicing.22064.6 - 6.0.2-servicing.22064.6 - 6.0.2 - 6.0.2 + 6.0.3-servicing.22116.1 + 6.0.3-servicing.22116.1 + 6.0.3 + 6.0.3 @@ -183,7 +183,7 @@ 12.1.301-preview.13.2 15.2.301-preview.13.2 6.0.2-mauipre.1.22102.15 - 6.0.1 + 6.0.2 $(MicrosoftNETWorkloadEmscriptenManifest60200Version) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch b/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch deleted file mode 100644 index ef507ed95..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c5211f8557f2fb019416cf1f6c01142965270479 Mon Sep 17 00:00:00 2001 -From: Doug Bunting <6431421+dougbu@users.noreply.github.com> -Date: Sun, 16 Jan 2022 22:55:10 -0800 -Subject: [PATCH] Always build App.Ref and the targeting packs - set - `$(IsTargetingPackBuilding)` to `true` unconditionally - leave all _use_ of - `$(IsTargetingPackBuilding)` - -See https://github.com/dotnet/aspnetcore/issues/39471 for details and backporting. ---- - Directory.Build.props | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index e100d883e9..d71b308905 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -138,11 +138,7 @@ - Microsoft.AspNetCore.App.Ref - aspnetcore-runtime - aspnetcore-targeting-pack -- -- -- false -- true -+ true - - diff --git a/eng/Versions.props b/eng/Versions.props index 4a21e42db..08ad9fc18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22117.2 - 6.0.300-preview.22117.2 + 6.0.300-preview.22117.12 + 6.0.300-preview.22117.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8485bd3353e801db3d5167b0c25fa085eb9086ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 21:29:21 +0000 Subject: [PATCH 221/462] Update dependencies from https://github.com/dotnet/sdk build 20220217.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22117.14 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.300-preview.22117.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 e7ccc03e5..9994b0f8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 271daf347a6a2842497437aad531b1320e299ca3 + ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/templating - 271daf347a6a2842497437aad531b1320e299ca3 + ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/templating - 271daf347a6a2842497437aad531b1320e299ca3 + ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - ae49884f786f05ac22cff838d260b6ad82c5a6dc + 8083ce50af04881424fb68cdae3afa97fbfdcd19 - + https://github.com/dotnet/sdk - ae49884f786f05ac22cff838d260b6ad82c5a6dc + 8083ce50af04881424fb68cdae3afa97fbfdcd19 diff --git a/eng/Versions.props b/eng/Versions.props index 08ad9fc18..1e14c9ed3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22116.5 + 6.0.300-preview.22117.1 @@ -56,8 +56,8 @@ - 6.0.300-preview.22117.12 - 6.0.300-preview.22117.12 + 6.0.300-preview.22117.14 + 6.0.300-preview.22117.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22116.5 + 6.0.300-preview.22117.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 301e8298334a7713b6123de934475e4a1041a6f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 02:57:39 +0000 Subject: [PATCH 222/462] 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.22115.1 -> To Version 6.0.0-servicing.22117.5 --- 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 93db93edf..621ebe0f5 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 d06545cb1b1da6ba1619af3afe339a3358612b64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 03:57:20 +0000 Subject: [PATCH 223/462] Update dependencies from https://github.com/dotnet/sdk build 20220217.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22117.14 -> To Version 6.0.300-preview.22117.23 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.2.0-1.22114.14 -> To Version 4.2.0-1.22116.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 210a351e8..c122f621f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - 8083ce50af04881424fb68cdae3afa97fbfdcd19 + 12b20ac8e33d01ad0f168fb04a0343ea75c262e7 - + https://github.com/dotnet/sdk - 8083ce50af04881424fb68cdae3afa97fbfdcd19 + 12b20ac8e33d01ad0f168fb04a0343ea75c262e7 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - e96ba4ed8c46c52194bc5eb59f13f56fded10254 + cb93a990bf3e8e8ae71ac75e9db7e549a3a44221 diff --git a/eng/Versions.props b/eng/Versions.props index aae378137..1f6e41598 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22117.14 - 6.0.300-preview.22117.14 + 6.0.300-preview.22117.23 + 6.0.300-preview.22117.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7581d578500b52633bbc12aae75f6fcd7145d10b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 06:04:10 +0000 Subject: [PATCH 224/462] 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 d9459875a0b47a389caa31f0795121a311177afa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 06:59:39 +0000 Subject: [PATCH 225/462] Update dependencies from https://github.com/dotnet/sdk build 20220217.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22117.23 -> To Version 6.0.300-preview.22117.29 Dependency coherency updates Microsoft.Build From Version 17.2.0-preview-22116-02 -> To Version 17.2.0-preview-22117-01 (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 d52653b21..a700583cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - 12b20ac8e33d01ad0f168fb04a0343ea75c262e7 + 8d3915ee7509649ac7138e5712d44ed01007ecdf - + https://github.com/dotnet/sdk - 12b20ac8e33d01ad0f168fb04a0343ea75c262e7 + 8d3915ee7509649ac7138e5712d44ed01007ecdf @@ -146,9 +146,9 @@ cb93a990bf3e8e8ae71ac75e9db7e549a3a44221 - + https://github.com/dotnet/msbuild - def4fbb8675b5b1e3afc6a2613921953a542a9a9 + 7aa73b7de55e59d0ffdd4c6326d211a36239a81c diff --git a/eng/Versions.props b/eng/Versions.props index 1f6e41598..e7e11ad3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22117.23 - 6.0.300-preview.22117.23 + 6.0.300-preview.22117.29 + 6.0.300-preview.22117.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2bd864a550843a36550f9812af075669fa904f9d Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 17 Feb 2022 23:59:48 -0800 Subject: [PATCH 226/462] 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 422a487b65bd2cd000cde870d304996557829724 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 11:16:58 +0000 Subject: [PATCH 227/462] Update dependencies from https://github.com/dotnet/sdk build 20220218.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22117.29 -> To Version 6.0.300-preview.22118.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.2-beta.22115.2 -> To Version 12.0.2-beta.22117.5 (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 a700583cc..be47314f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - 8d3915ee7509649ac7138e5712d44ed01007ecdf + 30455a60095304f035077bbb8616d2dd017d10fa - + https://github.com/dotnet/sdk - 8d3915ee7509649ac7138e5712d44ed01007ecdf + 30455a60095304f035077bbb8616d2dd017d10fa @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - e20b18e3307d5d4127e46bab55cfe2f0650971a0 + 6fa08d82a953b639a73a9a2ba2b8f2478f22e18c - + https://github.com/dotnet/fsharp - e20b18e3307d5d4127e46bab55cfe2f0650971a0 + 6fa08d82a953b639a73a9a2ba2b8f2478f22e18c diff --git a/eng/Versions.props b/eng/Versions.props index e7e11ad3f..1e120bac7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22117.29 - 6.0.300-preview.22117.29 + 6.0.300-preview.22118.1 + 6.0.300-preview.22118.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f526beb25d83e95301d9628381df38581fe0c070 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 16:35:27 +0000 Subject: [PATCH 228/462] Update dependencies from https://github.com/dotnet/sdk build 20220218.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22117.29 -> To Version 6.0.300-preview.22118.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.2-beta.22115.2 -> To Version 12.0.2-beta.22117.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 be47314f1..28a480dc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - 30455a60095304f035077bbb8616d2dd017d10fa + 4ba25b3558f2f3eeb27e45e4138a4090b546538e - + https://github.com/dotnet/sdk - 30455a60095304f035077bbb8616d2dd017d10fa + 4ba25b3558f2f3eeb27e45e4138a4090b546538e diff --git a/eng/Versions.props b/eng/Versions.props index 1e120bac7..0f0612fec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22118.1 - 6.0.300-preview.22118.1 + 6.0.300-preview.22118.3 + 6.0.300-preview.22118.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a39efcaa9b05c3965b241a0016bb035c7c9b2321 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 20:16:53 +0000 Subject: [PATCH 229/462] Update dependencies from https://github.com/dotnet/sdk build 20220218.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22117.29 -> To Version 6.0.300-preview.22118.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.2-beta.22115.2 -> To Version 12.0.2-beta.22118.2 (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 28a480dc3..c99e6ff8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - 4ba25b3558f2f3eeb27e45e4138a4090b546538e + e0dec3025a26241d76910a434cb964d8d8ad9cfa - + https://github.com/dotnet/sdk - 4ba25b3558f2f3eeb27e45e4138a4090b546538e + e0dec3025a26241d76910a434cb964d8d8ad9cfa @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 6fa08d82a953b639a73a9a2ba2b8f2478f22e18c + b00fd2eba4e85875014a7bfbb5a69aba7fbd05d3 - + https://github.com/dotnet/fsharp - 6fa08d82a953b639a73a9a2ba2b8f2478f22e18c + b00fd2eba4e85875014a7bfbb5a69aba7fbd05d3 diff --git a/eng/Versions.props b/eng/Versions.props index 0f0612fec..5385fa28c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22118.3 - 6.0.300-preview.22118.3 + 6.0.300-preview.22118.6 + 6.0.300-preview.22118.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7d058428b0d22d4aab5274ef9726372a30c0cb30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 21:39:25 +0000 Subject: [PATCH 230/462] Update dependencies from https://github.com/dotnet/sdk build 20220218.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22117.29 -> To Version 6.0.300-preview.22118.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.2-beta.22115.2 -> To Version 12.0.2-beta.22118.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 c99e6ff8d..9a182f592 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - e0dec3025a26241d76910a434cb964d8d8ad9cfa + 07b2ee3df1abbe92d30b9d22901b4c09ffb78867 - + https://github.com/dotnet/sdk - e0dec3025a26241d76910a434cb964d8d8ad9cfa + 07b2ee3df1abbe92d30b9d22901b4c09ffb78867 diff --git a/eng/Versions.props b/eng/Versions.props index 5385fa28c..1412e4c74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22118.6 - 6.0.300-preview.22118.6 + 6.0.300-preview.22118.8 + 6.0.300-preview.22118.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dc909647215fda460acc600d1a0256ceb4de7c37 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Feb 2022 10:55:25 +0000 Subject: [PATCH 231/462] Update dependencies from https://github.com/dotnet/sdk build 20220221.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22118.8 -> To Version 6.0.300-preview.22121.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.2-beta.22118.2 -> To Version 12.0.2-beta.22118.5 (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 9a182f592..2417dcd33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - 07b2ee3df1abbe92d30b9d22901b4c09ffb78867 + f6997d5bc9239c83357d0fef91043c2b4ab60c70 - + https://github.com/dotnet/sdk - 07b2ee3df1abbe92d30b9d22901b4c09ffb78867 + f6997d5bc9239c83357d0fef91043c2b4ab60c70 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - b00fd2eba4e85875014a7bfbb5a69aba7fbd05d3 + 39eb9739f44bb587d3b794ef885bf459112e80fb - + https://github.com/dotnet/fsharp - b00fd2eba4e85875014a7bfbb5a69aba7fbd05d3 + 39eb9739f44bb587d3b794ef885bf459112e80fb @@ -146,14 +146,14 @@ cb93a990bf3e8e8ae71ac75e9db7e549a3a44221 - + https://github.com/dotnet/msbuild - 7aa73b7de55e59d0ffdd4c6326d211a36239a81c + 6059fdfd6b4ba70bfa8f636cedc2b98a69909d43 - + https://github.com/nuget/nuget.client - a36df4eafb045b5f189e7219a5261f1f34ba768a + 971b824aa024c136b0d933da9f0f4ad6ddc5dc98 diff --git a/eng/Versions.props b/eng/Versions.props index 1412e4c74..e37c22a4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22118.8 - 6.0.300-preview.22118.8 + 6.0.300-preview.22121.3 + 6.0.300-preview.22121.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8b121c886576884c209092fba70a0f38b80b2fd8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Feb 2022 18:55:59 +0000 Subject: [PATCH 232/462] [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.1.0-5.22114.11 to 4.1.0-5.22116.13 (parent: Microsoft.NET.Sdk) --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index deb21b652..61f7977c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,9 +19,10 @@ - + + @@ -46,10 +47,11 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d9896797..bc8d0a972 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5a191c3f5cf233cd4eec14411da4ab9faeb05e50 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b2b2897587848c79d435dbc5b9fa5c5333c021cc + 1a8eb3bb727a04f0da5a4f519119f9646d18c0e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b2b2897587848c79d435dbc5b9fa5c5333c021cc + 1a8eb3bb727a04f0da5a4f519119f9646d18c0e2 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 260d16a8ee0ab42d94d8dfdfe85a1279c85dcffd + dbffaa4a4e4507b8e8dcf0cae6e3209d32113391 diff --git a/eng/Versions.props b/eng/Versions.props index fed54488b..e26d7cfac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.201-servicing.22116.30 - 6.0.201-servicing.22116.30 + 6.0.201-servicing.22121.5 + 6.0.201-servicing.22121.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 279043cdd76d2ef798e2eeab9c40358f34d74a52 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Feb 2022 20:14:38 +0000 Subject: [PATCH 233/462] Merged PR 21347: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.200 to 6.0.201 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.200-rtm.22116.10 to 6.0.201-servicing.22120.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.200 to 6.0.201 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120 - **Build**: 20220221.8 - **Date Produced**: February 21, 2022 7:13:06 PM UTC - **Commit**: 2380bdfc9ac7b9d6af1a42eacb296b729c8fcd80 - **Branch**: refs/heads/internal/release/6.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.201-servicing.22121.5 to 6.0.201-servicing.22121.8][1] - **Microsoft.NET.Sdk**: [from 6.0.201-servicing.22121.5 to 6.0.201-servicing.22121.8][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.200 to 6.0.201][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.200-rtm.22116.10 to 6.0.201-servicing.22120.1][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.200 to 6.0.201][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1a8eb3b&targetVersion=GC2380bdf&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC5a191c3&targetVersion=GCa4fcd0c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120) --- NuGet.config | 2 ++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 61f7977c6..0ab2a433c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,6 +19,7 @@ + @@ -47,6 +48,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc8d0a972..3f3535e08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5a191c3f5cf233cd4eec14411da4ab9faeb05e50 + a4fcd0cd5cb5a4412b0f617957b38bb9950aa6ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5a191c3f5cf233cd4eec14411da4ab9faeb05e50 + a4fcd0cd5cb5a4412b0f617957b38bb9950aa6ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5a191c3f5cf233cd4eec14411da4ab9faeb05e50 + a4fcd0cd5cb5a4412b0f617957b38bb9950aa6ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1a8eb3bb727a04f0da5a4f519119f9646d18c0e2 + 2380bdfc9ac7b9d6af1a42eacb296b729c8fcd80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1a8eb3bb727a04f0da5a4f519119f9646d18c0e2 + 2380bdfc9ac7b9d6af1a42eacb296b729c8fcd80 diff --git a/eng/Versions.props b/eng/Versions.props index e26d7cfac..6addce9a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200 + 6.0.201 @@ -56,8 +56,8 @@ - 6.0.201-servicing.22121.5 - 6.0.201-servicing.22121.5 + 6.0.201-servicing.22121.8 + 6.0.201-servicing.22121.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.200 + 6.0.201 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From d319fea8dec6d14f186f5bc7ead95fea188166de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Feb 2022 10:31:17 +0000 Subject: [PATCH 234/462] Update dependencies from https://github.com/dotnet/sdk build 20220222.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22121.3 -> To Version 6.0.300-preview.22122.1 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.300-preview.22117.1 -> To Version 6.0.300-preview.22121.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2417dcd33..c21ba3875 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - ae80bff914f34ef76920e93d87a7805483abae27 + 75c0e799bb68adb0a5dbc196fcf597bad8e4aeb1 - + https://github.com/dotnet/templating - ae80bff914f34ef76920e93d87a7805483abae27 + 75c0e799bb68adb0a5dbc196fcf597bad8e4aeb1 - + https://github.com/dotnet/templating - ae80bff914f34ef76920e93d87a7805483abae27 + 75c0e799bb68adb0a5dbc196fcf597bad8e4aeb1 - + https://github.com/dotnet/sdk - f6997d5bc9239c83357d0fef91043c2b4ab60c70 + 749f8ebab4d5a120e125f95cfc10008e3f6a64d0 - + https://github.com/dotnet/sdk - f6997d5bc9239c83357d0fef91043c2b4ab60c70 + 749f8ebab4d5a120e125f95cfc10008e3f6a64d0 diff --git a/eng/Versions.props b/eng/Versions.props index e37c22a4b..d8e04a619 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22117.1 + 6.0.300-preview.22121.6 @@ -56,8 +56,8 @@ - 6.0.300-preview.22121.3 - 6.0.300-preview.22121.3 + 6.0.300-preview.22122.1 + 6.0.300-preview.22122.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22117.1 + 6.0.300-preview.22121.6 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From f326fb6cc02c373792c7712917ac0e0505d0f8fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Feb 2022 01:22:07 +0000 Subject: [PATCH 235/462] Update dependencies from https://github.com/dotnet/sdk build 20220222.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22121.3 -> To Version 6.0.300-preview.22122.7 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.300-preview.22117.1 -> To Version 6.0.300-preview.22121.6 (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 c21ba3875..0c7eae90a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 75c0e799bb68adb0a5dbc196fcf597bad8e4aeb1 - + https://github.com/dotnet/sdk - 749f8ebab4d5a120e125f95cfc10008e3f6a64d0 + 7e0c4280a712ce68ab2105c07a0ceb6a05609725 - + https://github.com/dotnet/sdk - 749f8ebab4d5a120e125f95cfc10008e3f6a64d0 + 7e0c4280a712ce68ab2105c07a0ceb6a05609725 diff --git a/eng/Versions.props b/eng/Versions.props index d8e04a619..560463bf9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22122.1 - 6.0.300-preview.22122.1 + 6.0.300-preview.22122.7 + 6.0.300-preview.22122.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aa3019aa7d26dd31480d7862ff55988d34829d6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Feb 2022 04:20:45 +0000 Subject: [PATCH 236/462] Update dependencies from https://github.com/dotnet/sdk build 20220222.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22122.7 -> To Version 6.0.300-preview.22122.9 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 6.0.300-preview.22121.6 -> To Version 6.0.300-preview.22122.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c7eae90a..f1157096e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 75c0e799bb68adb0a5dbc196fcf597bad8e4aeb1 + 3e441597e4d6d360f29e705b3278a36f6632de3a - + https://github.com/dotnet/templating - 75c0e799bb68adb0a5dbc196fcf597bad8e4aeb1 + 3e441597e4d6d360f29e705b3278a36f6632de3a - + https://github.com/dotnet/templating - 75c0e799bb68adb0a5dbc196fcf597bad8e4aeb1 + 3e441597e4d6d360f29e705b3278a36f6632de3a - + https://github.com/dotnet/sdk - 7e0c4280a712ce68ab2105c07a0ceb6a05609725 + 0195cb65cb81fff543727e63ade68c1000438333 - + https://github.com/dotnet/sdk - 7e0c4280a712ce68ab2105c07a0ceb6a05609725 + 0195cb65cb81fff543727e63ade68c1000438333 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 39eb9739f44bb587d3b794ef885bf459112e80fb + 6f71fa012e0558f1106ff9d830ffcd8553a65455 - + https://github.com/dotnet/fsharp - 39eb9739f44bb587d3b794ef885bf459112e80fb + 6f71fa012e0558f1106ff9d830ffcd8553a65455 diff --git a/eng/Versions.props b/eng/Versions.props index 560463bf9..a79eceea8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22121.6 + 6.0.300-preview.22122.2 @@ -56,8 +56,8 @@ - 6.0.300-preview.22122.7 - 6.0.300-preview.22122.7 + 6.0.300-preview.22122.9 + 6.0.300-preview.22122.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22121.6 + 6.0.300-preview.22122.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 8c7b70ac81e18ebb58d63fbb760553e588d95bb3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Feb 2022 16:08:53 +0000 Subject: [PATCH 237/462] 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.22117.5 -> 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 f1157096e..9ca5af222 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 694b7a52ec8e06e471036202e68cf80f87c0efcf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Feb 2022 16:09:02 +0000 Subject: [PATCH 238/462] 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 cfe1f59cbc94707ef6b8ee321ebc2028063806ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Feb 2022 03:51:05 +0000 Subject: [PATCH 239/462] Update dependencies from https://github.com/dotnet/sdk build 20220223.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22122.9 -> To Version 6.0.300-preview.22123.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.0.2-beta.22122.1 -> To Version 12.0.2-beta.22123.2 (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 9ca5af222..4d9fcbeec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 3e441597e4d6d360f29e705b3278a36f6632de3a - + https://github.com/dotnet/sdk - 0195cb65cb81fff543727e63ade68c1000438333 + a9ef7cdcfbd9b7f2fb826daa5318e80fc25ea76e - + https://github.com/dotnet/sdk - 0195cb65cb81fff543727e63ade68c1000438333 + a9ef7cdcfbd9b7f2fb826daa5318e80fc25ea76e @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 6f71fa012e0558f1106ff9d830ffcd8553a65455 + 506fc08d8051bd924066afc34d44577f787b3d40 - + https://github.com/dotnet/fsharp - 6f71fa012e0558f1106ff9d830ffcd8553a65455 + 506fc08d8051bd924066afc34d44577f787b3d40 @@ -146,9 +146,9 @@ cb93a990bf3e8e8ae71ac75e9db7e549a3a44221 - + https://github.com/dotnet/msbuild - 6059fdfd6b4ba70bfa8f636cedc2b98a69909d43 + 047227bd7da32799676c63059b4c430b4bd51bd6 diff --git a/eng/Versions.props b/eng/Versions.props index a79eceea8..9fd6b6c8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22122.9 - 6.0.300-preview.22122.9 + 6.0.300-preview.22123.6 + 6.0.300-preview.22123.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cf6602fa89ebf8a04c5926a3a53fff53fcd769da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Feb 2022 06:53:52 +0000 Subject: [PATCH 240/462] Update dependencies from https://github.com/dotnet/sdk build 20220223.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22123.6 -> To Version 6.0.300-preview.22123.13 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22069.1 -> To Version 6.0.200-1.22122.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 4d9fcbeec..1f71f1072 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 3e441597e4d6d360f29e705b3278a36f6632de3a - + https://github.com/dotnet/sdk - a9ef7cdcfbd9b7f2fb826daa5318e80fc25ea76e + 86f998ca06b4adbc114843d4af3b0a0fbc20a430 - + https://github.com/dotnet/sdk - a9ef7cdcfbd9b7f2fb826daa5318e80fc25ea76e + 86f998ca06b4adbc114843d4af3b0a0fbc20a430 @@ -135,9 +135,9 @@ 75765f2afc7425f47efde1a59a8eb86cf81658f9 - + https://github.com/dotnet/linker - 70dc7f6daaf50e8eb67afb91876b8efc8330103f + 4a231cedcaf6b93b04d07e5f7670e88e5fa937fe linker diff --git a/eng/Versions.props b/eng/Versions.props index 9fd6b6c8b..394d10ad3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22123.6 - 6.0.300-preview.22123.6 + 6.0.300-preview.22123.13 + 6.0.300-preview.22123.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ef40e6aa06a366313f36e1eb80290498a5ed27c8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 24 Feb 2022 23:08:47 +0000 Subject: [PATCH 241/462] Merged PR 21378: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.201 to 6.0.201 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.201-servicing.22120.1 to 6.0.201-servicing.22123.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.201 to 6.0.201 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.3-servicing.22115.10 to 6.0.3-servicing.22124.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.221... --- NuGet.config | 22 ++++++------ eng/Version.Details.xml | 78 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 61 insertions(+), 63 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0ab2a433c..774c3b7b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,8 @@ - + + @@ -16,15 +17,13 @@ - + - + - - - + @@ -43,17 +42,16 @@ - + + - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f3535e08..5ccaad398 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b96c6f9f788aee704113c6765c56810faa382a + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b96c6f9f788aee704113c6765c56810faa382a + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b96c6f9f788aee704113c6765c56810faa382a + 1217354ca79000178dca5bca83fe6ec490e1d2d6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b96c6f9f788aee704113c6765c56810faa382a + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a4fcd0cd5cb5a4412b0f617957b38bb9950aa6ae + eeae34ecb55d49616c9cd79bebfd6978b9ee54a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a4fcd0cd5cb5a4412b0f617957b38bb9950aa6ae + eeae34ecb55d49616c9cd79bebfd6978b9ee54a0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a4fcd0cd5cb5a4412b0f617957b38bb9950aa6ae + eeae34ecb55d49616c9cd79bebfd6978b9ee54a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2380bdfc9ac7b9d6af1a42eacb296b729c8fcd80 + 11428db5b702966c7750a82c099718a398a1aa15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2380bdfc9ac7b9d6af1a42eacb296b729c8fcd80 + 11428db5b702966c7750a82c099718a398a1aa15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ba13948446da002973d174e3d1c8843f844e6fe2 + 1f426c90a9589dabc16d114aa91bfea9f21f8571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d974f4b15a6baa1235d4e8e80728b3e3d0899277 + 560f243910f407df33fd5cdf06e2a857684f4bc7 https://github.com/dotnet/fsharp @@ -135,9 +135,9 @@ d3c6439b04452047cb62fc645ce341a034bdb5be - + https://github.com/dotnet/linker - bd4c0de8ffed062f9614b06c8f5390d834e30a07 + 4a231cedcaf6b93b04d07e5f7670e88e5fa937fe linker diff --git a/eng/Versions.props b/eng/Versions.props index 6addce9a1..9931f68b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.3-servicing.22115.6 + 6.0.3-servicing.22123.7 - 6.0.3-servicing.22115.10 + 6.0.3-servicing.22124.2 @@ -46,18 +46,18 @@ 6.0.3 6.0.3 - 6.0.3-servicing.22116.12 - 6.0.3-servicing.22116.12 - 6.0.3-servicing.22116.12 - 6.0.3-servicing.22116.12 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 0.2.0 - 6.0.201-servicing.22121.8 - 6.0.201-servicing.22121.8 + 6.0.201-servicing.22124.17 + 6.0.201-servicing.22124.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.3-servicing.22115.5 - 6.0.3-servicing.22115.5 + 6.0.3-servicing.22123.9 + 6.0.3-servicing.22123.9 6.0.3 6.0.3 6.0.3 @@ -78,8 +78,8 @@ - 6.0.3-servicing.22116.1 - 6.0.3-servicing.22116.1 + 6.0.3-servicing.22124.3 + 6.0.3-servicing.22124.3 6.0.3 6.0.3 From fe3018da593cd9903073d8f3c61ab41c2cf0cd1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Feb 2022 09:44:33 +0000 Subject: [PATCH 242/462] Update dependencies from https://github.com/dotnet/sdk build 20220225.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22123.13 -> To Version 6.0.300-preview.22125.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22122.2 -> To Version 6.0.200-1.22124.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 1f71f1072..3e9fb1b14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 3e441597e4d6d360f29e705b3278a36f6632de3a - + https://github.com/dotnet/sdk - 86f998ca06b4adbc114843d4af3b0a0fbc20a430 + 7479313e8276a9e1aa67de23c6dfb5019af733e3 - + https://github.com/dotnet/sdk - 86f998ca06b4adbc114843d4af3b0a0fbc20a430 + 7479313e8276a9e1aa67de23c6dfb5019af733e3 @@ -135,9 +135,9 @@ 75765f2afc7425f47efde1a59a8eb86cf81658f9 - + https://github.com/dotnet/linker - 4a231cedcaf6b93b04d07e5f7670e88e5fa937fe + e9cfb5413a6a7a7b5bfc3b9a73671be2b18642cf linker diff --git a/eng/Versions.props b/eng/Versions.props index 394d10ad3..8ee8291c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22123.13 - 6.0.300-preview.22123.13 + 6.0.300-preview.22125.1 + 6.0.300-preview.22125.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e4d99df28f0621563aa65a7a7cf43e20c5076771 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sun, 27 Feb 2022 22:53:30 -0800 Subject: [PATCH 243/462] 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 244/462] 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 58fd11ce6c2dc11fdf32fe68f942426824e8efac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Mar 2022 19:15:19 +0000 Subject: [PATCH 245/462] 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.22123.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 3e9fb1b14..cf41fbb6c 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 ca993728b60a517db70920298b904a609debf1a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Mar 2022 19:15:30 +0000 Subject: [PATCH 246/462] 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 247/462] 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 f37dbb876487d9030454d0785d3beeae99d18521 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 3 Mar 2022 11:03:02 -0800 Subject: [PATCH 248/462] Fix some downgrades in the version details --- eng/Version.Details.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 645dd691e..cb56ce75b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -130,9 +130,9 @@ 506fc08d8051bd924066afc34d44577f787b3d40 - + https://github.com/microsoft/vstest - d3c6439b04452047cb62fc645ce341a034bdb5be + 75765f2afc7425f47efde1a59a8eb86cf81658f9 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 592501cbb9c9394072a245c15b3458ff88155d85 + cb93a990bf3e8e8ae71ac75e9db7e549a3a44221 @@ -151,9 +151,9 @@ 047227bd7da32799676c63059b4c430b4bd51bd6 - + https://github.com/nuget/nuget.client - f1906d3d581e0ea0bdd282134208d654f8447880 + 971b824aa024c136b0d933da9f0f4ad6ddc5dc98 From 65c3392c6882777a8a434d476f265ad86f4d3124 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 3 Mar 2022 11:03:28 -0800 Subject: [PATCH 249/462] Fix the version stabilization merge --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index b7dbf0c07..648ab4983 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,11 +10,11 @@ 3 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - servicing + preview $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release From abe53ee3e3d44faa7c8d09ad9a82846c6b45b4e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Mar 2022 23:14:49 +0000 Subject: [PATCH 250/462] 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 027567b88bcf925bbd04feb108322db9f21b46e2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 4 Mar 2022 09:17:00 -0800 Subject: [PATCH 251/462] Remove coherency requirement --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb56ce75b..b916c9f6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,7 +166,7 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk e8ffccbd683205bf94e406e43556f8baca07dc5b From 281a4fa189fd58a805221122b689350809c655a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Mar 2022 17:18:09 +0000 Subject: [PATCH 252/462] Update dependencies from https://github.com/dotnet/sdk build 20220303.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22125.1 -> To Version 6.0.300-preview.22153.30 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.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.300-preview.22122.2 -> To Version 6.0.300-preview.22126.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 22 ---------------------- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 8 ++++---- 3 files changed, 24 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 605398339..9a84139e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,16 @@ - - - - - - - - - - - - @@ -47,21 +35,11 @@ - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b916c9f6a..ac0dfcb00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 3e441597e4d6d360f29e705b3278a36f6632de3a + 5b81c13fa3f14b6a0db8ca4a68355de1dc121125 - + https://github.com/dotnet/templating - 3e441597e4d6d360f29e705b3278a36f6632de3a + 5b81c13fa3f14b6a0db8ca4a68355de1dc121125 - + https://github.com/dotnet/templating - 3e441597e4d6d360f29e705b3278a36f6632de3a + 5b81c13fa3f14b6a0db8ca4a68355de1dc121125 - + https://github.com/dotnet/sdk - 7479313e8276a9e1aa67de23c6dfb5019af733e3 + dc5ee9b63f6e5d91177b8ca863b6f1a177f61393 - + https://github.com/dotnet/sdk - 7479313e8276a9e1aa67de23c6dfb5019af733e3 + dc5ee9b63f6e5d91177b8ca863b6f1a177f61393 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - 506fc08d8051bd924066afc34d44577f787b3d40 + 01a02e16fadac22d152f6284bfbbb6881f71b8a2 - + https://github.com/dotnet/fsharp - 506fc08d8051bd924066afc34d44577f787b3d40 + 01a02e16fadac22d152f6284bfbbb6881f71b8a2 @@ -141,19 +141,19 @@ linker - + https://github.com/dotnet/roslyn - cb93a990bf3e8e8ae71ac75e9db7e549a3a44221 + 1bc171cbabbf25ef5abf66075ec7c5de8b87cdc8 - + https://github.com/dotnet/msbuild - 047227bd7da32799676c63059b4c430b4bd51bd6 + 40f49cd8d06ec3ed6933fa66183e8d1615cb2edc - + https://github.com/nuget/nuget.client - 971b824aa024c136b0d933da9f0f4ad6ddc5dc98 + df100b0a5d98a343948454ded7fc2b1a7839b5f7 diff --git a/eng/Versions.props b/eng/Versions.props index 648ab4983..c28032422 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22122.2 + 6.0.300-preview.22126.1 @@ -56,8 +56,8 @@ - 6.0.300-preview.22125.1 - 6.0.300-preview.22125.1 + 6.0.300-preview.22153.30 + 6.0.300-preview.22153.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22122.2 + 6.0.300-preview.22126.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From c3a19ed0e3e0a3dc4aabac596275cee2f4b2ab2c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 4 Mar 2022 12:47:53 -0800 Subject: [PATCH 253/462] Expand template coverage --- src/redist/targets/GenerateMSIs.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 483730f3a..c102a1618 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -415,7 +415,7 @@ Date: Sat, 5 Mar 2022 00:12:07 +0000 Subject: [PATCH 254/462] 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.22151.1 -> 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 ac0dfcb00..26c7c8331 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 + 39632b6f0303b4a3e26fe2ac088f7b501907f5b5 From f63e028333a8f3973ecb5d6d2531db477ab466b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Mar 2022 00:12:11 +0000 Subject: [PATCH 255/462] 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 da93cebfe2a3a8c183b490fc05ca952e92cce19c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Mar 2022 01:47:24 +0000 Subject: [PATCH 256/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220304.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22151.1 -> To Version 6.0.0-servicing.22154.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26c7c8331..664e26d79 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 - 39632b6f0303b4a3e26fe2ac088f7b501907f5b5 + da5f806e2eb4d90302d1289f618012e337ba12f8 From c3da28feba66bf66f664d423d2bccfd210b5acb4 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 4 Mar 2022 18:43:03 -0800 Subject: [PATCH 257/462] 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 8a1feb15b7b5793ade67fdc724e10670d94f422a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Mar 2022 04:15:28 +0000 Subject: [PATCH 258/462] Update dependencies from https://github.com/dotnet/sdk build 20220304.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22153.30 -> To Version 6.0.300-preview.22154.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 ac0dfcb00..97b744331 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5b81c13fa3f14b6a0db8ca4a68355de1dc121125 - + https://github.com/dotnet/sdk - dc5ee9b63f6e5d91177b8ca863b6f1a177f61393 + 331330a5a1de37e94c2eb7929fe1d29b8a7af12e - + https://github.com/dotnet/sdk - dc5ee9b63f6e5d91177b8ca863b6f1a177f61393 + 331330a5a1de37e94c2eb7929fe1d29b8a7af12e diff --git a/eng/Versions.props b/eng/Versions.props index c28032422..15f3c6369 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22153.30 - 6.0.300-preview.22153.30 + 6.0.300-preview.22154.11 + 6.0.300-preview.22154.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ed62baa5cf30016ee5cb6afd303de67ab083df9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Mar 2022 07:39:55 +0000 Subject: [PATCH 259/462] Update dependencies from https://github.com/dotnet/sdk build 20220306.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22154.11 -> To Version 6.0.300-preview.22156.5 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 6.0.300-preview.22126.1 -> To Version 6.0.300-preview.22153.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47ddd9120..6b93ce0eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 5b81c13fa3f14b6a0db8ca4a68355de1dc121125 + df0dbf9fc6f2858107960851116f925af160df21 - + https://github.com/dotnet/templating - 5b81c13fa3f14b6a0db8ca4a68355de1dc121125 + df0dbf9fc6f2858107960851116f925af160df21 - + https://github.com/dotnet/templating - 5b81c13fa3f14b6a0db8ca4a68355de1dc121125 + df0dbf9fc6f2858107960851116f925af160df21 - + https://github.com/dotnet/sdk - 331330a5a1de37e94c2eb7929fe1d29b8a7af12e + 04b0dfecaa667225169c8923007cd565d6cd6aab - + https://github.com/dotnet/sdk - 331330a5a1de37e94c2eb7929fe1d29b8a7af12e + 04b0dfecaa667225169c8923007cd565d6cd6aab @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - 01a02e16fadac22d152f6284bfbbb6881f71b8a2 + 395069997445c1a91d8bfcae23d3df5c5a9c7aaf - + https://github.com/dotnet/fsharp - 01a02e16fadac22d152f6284bfbbb6881f71b8a2 + 395069997445c1a91d8bfcae23d3df5c5a9c7aaf diff --git a/eng/Versions.props b/eng/Versions.props index 15f3c6369..6a40b841e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22126.1 + 6.0.300-preview.22153.2 @@ -56,8 +56,8 @@ - 6.0.300-preview.22154.11 - 6.0.300-preview.22154.11 + 6.0.300-preview.22156.5 + 6.0.300-preview.22156.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22126.1 + 6.0.300-preview.22153.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 04caf3cccc238576830af82532af3ab329196429 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Mar 2022 08:50:22 +0000 Subject: [PATCH 260/462] Update dependencies from https://github.com/dotnet/sdk build 20220306.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22154.11 -> To Version 6.0.300-preview.22156.7 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 6.0.300-preview.22126.1 -> To Version 6.0.300-preview.22153.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 6b93ce0eb..4a0f26f43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating df0dbf9fc6f2858107960851116f925af160df21 - + https://github.com/dotnet/sdk - 04b0dfecaa667225169c8923007cd565d6cd6aab + f6662158f94422c8036655288617849161a69131 - + https://github.com/dotnet/sdk - 04b0dfecaa667225169c8923007cd565d6cd6aab + f6662158f94422c8036655288617849161a69131 @@ -146,9 +146,9 @@ 1bc171cbabbf25ef5abf66075ec7c5de8b87cdc8 - + https://github.com/dotnet/msbuild - 40f49cd8d06ec3ed6933fa66183e8d1615cb2edc + 2e82c9f3f5feaa9444e67c4509c25f98fb1ea500 diff --git a/eng/Versions.props b/eng/Versions.props index 6a40b841e..0b06e1ead 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22156.5 - 6.0.300-preview.22156.5 + 6.0.300-preview.22156.7 + 6.0.300-preview.22156.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e3b515f73e0597ebc078ffff4d241ce6e49b85cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Mar 2022 10:07:07 +0000 Subject: [PATCH 261/462] Update dependencies from https://github.com/dotnet/sdk build 20220307.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22154.11 -> To Version 6.0.300-preview.22157.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.Build From Version 6.0.300-preview.22126.1 -> To Version 6.0.300-preview.22153.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 4a0f26f43..a9f17fba7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating df0dbf9fc6f2858107960851116f925af160df21 - + https://github.com/dotnet/sdk - f6662158f94422c8036655288617849161a69131 + b5affdab42a44d796dd830d6d189f0be9f107d35 - + https://github.com/dotnet/sdk - f6662158f94422c8036655288617849161a69131 + b5affdab42a44d796dd830d6d189f0be9f107d35 diff --git a/eng/Versions.props b/eng/Versions.props index 0b06e1ead..92a27e068 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22156.7 - 6.0.300-preview.22156.7 + 6.0.300-preview.22157.1 + 6.0.300-preview.22157.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 13038443bd5f9de21dd8fe31fcd648b066b2eeab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Mar 2022 03:49:48 +0000 Subject: [PATCH 262/462] Update dependencies from https://github.com/dotnet/sdk build 20220307.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22157.1 -> To Version 6.0.300-preview.22157.12 Dependency coherency updates NuGet.Build.Tasks From Version 6.2.0-preview.2.80 -> To Version 6.2.0-preview.2.91 (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 a9f17fba7..dc8149d45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating df0dbf9fc6f2858107960851116f925af160df21 - + https://github.com/dotnet/sdk - b5affdab42a44d796dd830d6d189f0be9f107d35 + 0e04b1f592936d43c709efdd51ec86feca6f449b - + https://github.com/dotnet/sdk - b5affdab42a44d796dd830d6d189f0be9f107d35 + 0e04b1f592936d43c709efdd51ec86feca6f449b @@ -151,9 +151,9 @@ 2e82c9f3f5feaa9444e67c4509c25f98fb1ea500 - + https://github.com/nuget/nuget.client - df100b0a5d98a343948454ded7fc2b1a7839b5f7 + db1acf828845c4f6177d3acae0abab1ac6b9a1c5 diff --git a/eng/Versions.props b/eng/Versions.props index 92a27e068..38606015c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22157.1 - 6.0.300-preview.22157.1 + 6.0.300-preview.22157.12 + 6.0.300-preview.22157.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 720832be9c4626cb0c0a2455b16a09f046d0f196 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Mar 2022 10:23:24 -0800 Subject: [PATCH 263/462] Update dependencies from https://github.com/dotnet/sdk build 20220307.14 (#13339) Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22157.12 -> To Version 6.0.300-preview.22157.14 Co-authored-by: dotnet-maestro[bot] --- 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 dc8149d45..9ec71481e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating df0dbf9fc6f2858107960851116f925af160df21 - + https://github.com/dotnet/sdk - 0e04b1f592936d43c709efdd51ec86feca6f449b + 25feced96d832693f376fb3c6b043e75bcea828c - + https://github.com/dotnet/sdk - 0e04b1f592936d43c709efdd51ec86feca6f449b + 25feced96d832693f376fb3c6b043e75bcea828c diff --git a/eng/Versions.props b/eng/Versions.props index 38606015c..bd52376b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22157.12 - 6.0.300-preview.22157.12 + 6.0.300-preview.22157.14 + 6.0.300-preview.22157.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c04f96501d28fadb1412466a7adf94a7ba46f52c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Mar 2022 22:55:53 +0000 Subject: [PATCH 264/462] Update dependencies from https://github.com/dotnet/sdk build 20220308.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22157.14 -> To Version 6.0.300-preview.22158.16 --- 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 9ec71481e..60c9ed203 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating df0dbf9fc6f2858107960851116f925af160df21 - + https://github.com/dotnet/sdk - 25feced96d832693f376fb3c6b043e75bcea828c + 6526f6aaa13cbe5641c988dec4fd04a7786ba09a - + https://github.com/dotnet/sdk - 25feced96d832693f376fb3c6b043e75bcea828c + 6526f6aaa13cbe5641c988dec4fd04a7786ba09a diff --git a/eng/Versions.props b/eng/Versions.props index bd52376b0..aebb406cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22157.14 - 6.0.300-preview.22157.14 + 6.0.300-preview.22158.16 + 6.0.300-preview.22158.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) 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 265/462] [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 6cd9dc17f625c66f7077a95bcee0a07a07901bd5 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:55:29 -0600 Subject: [PATCH 266/462] [release/6.0.3xx] Update dependencies from dotnet/arcade (#13313) * 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 +++++++ 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 ------------------ 11 files changed, 104 insertions(+), 187 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 9ec71481e..a20444382 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 bd52376b0..d06e1a07d 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/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 27af8051bc59d57589fa49e90bc2d31ea4d5d49d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Mar 2022 01:27:31 +0000 Subject: [PATCH 267/462] Update dependencies from https://github.com/dotnet/sdk build 20220308.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22157.14 -> To Version 6.0.300-preview.22158.21 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.300-preview.22153.2 -> To Version 6.0.300-preview.22158.11 (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 60c9ed203..9c3ab8fc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - df0dbf9fc6f2858107960851116f925af160df21 + 2cbb8b0266ebdebc0d7cd862e33871637e0d9d76 - + https://github.com/dotnet/templating - df0dbf9fc6f2858107960851116f925af160df21 + 2cbb8b0266ebdebc0d7cd862e33871637e0d9d76 - + https://github.com/dotnet/templating - df0dbf9fc6f2858107960851116f925af160df21 + 2cbb8b0266ebdebc0d7cd862e33871637e0d9d76 - + https://github.com/dotnet/sdk - 6526f6aaa13cbe5641c988dec4fd04a7786ba09a + 7240176bc71653747ef2061416c499a95136e6e5 - + https://github.com/dotnet/sdk - 6526f6aaa13cbe5641c988dec4fd04a7786ba09a + 7240176bc71653747ef2061416c499a95136e6e5 diff --git a/eng/Versions.props b/eng/Versions.props index aebb406cd..ee7a7ccab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22153.2 + 6.0.300-preview.22158.11 @@ -56,8 +56,8 @@ - 6.0.300-preview.22158.16 - 6.0.300-preview.22158.16 + 6.0.300-preview.22158.21 + 6.0.300-preview.22158.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22153.2 + 6.0.300-preview.22158.11 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From a1c108daba68a38c440d500da2cc52d8eb1f7a65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Mar 2022 03:53:24 +0000 Subject: [PATCH 268/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220308.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22154.3 -> To Version 6.0.0-servicing.22158.1 --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e413198db..ec757eac9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,7 +211,7 @@ https://github.com/dotnet/arcade 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/source-build-reference-packages da5f806e2eb4d90302d1289f618012e337ba12f8 From 799616932225dba053e41d90115ca73ce8e8c546 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Mar 2022 04:39:14 +0000 Subject: [PATCH 269/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220308.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22154.3 -> To Version 6.0.0-servicing.22158.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 ec757eac9..4e751a00d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/source-build-reference-packages - da5f806e2eb4d90302d1289f618012e337ba12f8 + 2bd5e08a5ede56b51ea88ac3deecde19c5c520cb From e45c3f920c01032feb0c1d26ab698c707051d122 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Mar 2022 08:01:45 +0000 Subject: [PATCH 270/462] Update dependencies from https://github.com/dotnet/sdk build 20220308.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22158.21 -> To Version 6.0.300-preview.22158.30 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.2-beta.22155.1 -> To Version 12.0.3-beta.22158.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 4e751a00d..b1177caa1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2cbb8b0266ebdebc0d7cd862e33871637e0d9d76 - + https://github.com/dotnet/sdk - 7240176bc71653747ef2061416c499a95136e6e5 + 8434974d4e669e9d28d426052b3735d7d511bfd7 - + https://github.com/dotnet/sdk - 7240176bc71653747ef2061416c499a95136e6e5 + 8434974d4e669e9d28d426052b3735d7d511bfd7 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - 395069997445c1a91d8bfcae23d3df5c5a9c7aaf + dad0089bbcdd9e0adef738c16344cf82890b64ef - + https://github.com/dotnet/fsharp - 395069997445c1a91d8bfcae23d3df5c5a9c7aaf + dad0089bbcdd9e0adef738c16344cf82890b64ef diff --git a/eng/Versions.props b/eng/Versions.props index 78b7cf547..fb8bb15a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22158.21 - 6.0.300-preview.22158.21 + 6.0.300-preview.22158.30 + 6.0.300-preview.22158.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 206a2935843187aeaa036d01d6651c7b3bc35477 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Mar 2022 12:01:18 +0000 Subject: [PATCH 271/462] Update dependencies from https://github.com/dotnet/sdk build 20220309.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22158.30 -> To Version 6.0.300-preview.22159.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.2.0-2.22153.7 -> To Version 4.2.0-2.22158.15 (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 b1177caa1..b3bef184a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2cbb8b0266ebdebc0d7cd862e33871637e0d9d76 - + https://github.com/dotnet/sdk - 8434974d4e669e9d28d426052b3735d7d511bfd7 + d4b9abbfd9e447469eaba8ac0d20cac0ba63a8c9 - + https://github.com/dotnet/sdk - 8434974d4e669e9d28d426052b3735d7d511bfd7 + d4b9abbfd9e447469eaba8ac0d20cac0ba63a8c9 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 1bc171cbabbf25ef5abf66075ec7c5de8b87cdc8 + be223bbc06bdad4ee7e615ad32f18c40a10dea81 diff --git a/eng/Versions.props b/eng/Versions.props index fb8bb15a1..1687712a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22158.30 - 6.0.300-preview.22158.30 + 6.0.300-preview.22159.1 + 6.0.300-preview.22159.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f79133d71244c1c44b1b6ef6e6edf44de3766d77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Mar 2022 15:46:36 +0000 Subject: [PATCH 272/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220309.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22159.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 b1177caa1..bcf5a8db5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/source-build-reference-packages - 2bd5e08a5ede56b51ea88ac3deecde19c5c520cb + 562275e0d453c753f4a887323e298419310f3849 From ad22b53f36a277ac29d3b630077347edbdba8053 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 Mar 2022 10:22:23 -0600 Subject: [PATCH 273/462] 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 274/462] [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 From 67bae3a688f5b560643ad6a101def83854745713 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 9 Mar 2022 12:21:10 -0800 Subject: [PATCH 275/462] [6.0.3xx] Bump aspnetcore template versions (#13367) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index fb8bb15a1..b32208ce4 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 From 54a0c0322dc7a2c3c5ee08130c9731350433d208 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Mar 2022 23:41:33 +0000 Subject: [PATCH 276/462] Update dependencies from https://github.com/dotnet/sdk build 20220309.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22159.1 -> To Version 6.0.300-preview.22159.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.3-beta.22158.8 -> To Version 12.0.3-beta.22159.2 (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 b3bef184a..f57f3c20b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2cbb8b0266ebdebc0d7cd862e33871637e0d9d76 - + https://github.com/dotnet/sdk - d4b9abbfd9e447469eaba8ac0d20cac0ba63a8c9 + 0f2ffcff737674a7dccf4bc1393826e067396c79 - + https://github.com/dotnet/sdk - d4b9abbfd9e447469eaba8ac0d20cac0ba63a8c9 + 0f2ffcff737674a7dccf4bc1393826e067396c79 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - dad0089bbcdd9e0adef738c16344cf82890b64ef + 3dea7433d11e978a85c9079886582cba96721d9e - + https://github.com/dotnet/fsharp - dad0089bbcdd9e0adef738c16344cf82890b64ef + 3dea7433d11e978a85c9079886582cba96721d9e diff --git a/eng/Versions.props b/eng/Versions.props index 03282fdd1..495359535 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22159.1 - 6.0.300-preview.22159.1 + 6.0.300-preview.22159.13 + 6.0.300-preview.22159.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b58bb0b579514e975abf690e62d4e461542cef52 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 Mar 2022 19:43:01 -0600 Subject: [PATCH 277/462] Resolve merge issues in source-build --- .../ExecuteHelper.cs | 1 + .../baselines/MissingXmlDoc.txt | 175 -- .../baselines/MsftToSbSdk.diff | 1481 ----------------- .../smoke-tests/local.NuGet.Config | 8 - .../smoke-tests/online.NuGet.Config | 9 - .../smoke-tests/smoke-test.sh | 534 ------ 6 files changed, 1 insertion(+), 2207 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MissingXmlDoc.txt delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/local.NuGet.Config delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh 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 41df3e75b..5c135b3fe 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 @@ -43,6 +43,7 @@ internal static class ExecuteHelper configure?.Invoke(process); + StringBuilder stdOutput = new(); process.OutputDataReceived += new DataReceivedEventHandler((sender, e) => stdOutput.AppendLine(e.Data)); StringBuilder stdError = new(); diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MissingXmlDoc.txt deleted file mode 100644 index 8db91d9d7..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MissingXmlDoc.txt +++ /dev/null @@ -1,175 +0,0 @@ -Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml -Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml -Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml -Microsoft.NETCore.App.Ref/ref/net6.0/Microsoft.VisualBasic.xml -Microsoft.NETCore.App.Ref/ref/net6.0/mscorlib.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.AppContext.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Buffers.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.ComponentModel.DataAnnotations.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Configuration.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Core.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Data.DataSetExtensions.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Data.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Diagnostics.Debug.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Diagnostics.Tools.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Drawing.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Dynamic.Runtime.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Globalization.Calendars.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Globalization.Extensions.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Globalization.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.IO.Compression.Brotli.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.IO.Compression.FileSystem.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.IO.FileSystem.Primitives.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.IO.FileSystem.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.IO.UnmanagedMemoryStream.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.IO.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Net.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Numerics.Vectors.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Numerics.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Reflection.Extensions.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Reflection.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Resources.Reader.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Resources.ResourceManager.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Runtime.Extensions.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Runtime.Handles.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Runtime.Serialization.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Security.Principal.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Security.SecureString.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Security.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.ServiceModel.Web.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.ServiceProcess.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Text.Encoding.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Threading.Tasks.Extensions.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Threading.Tasks.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Threading.Timer.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Transactions.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.ValueTuple.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Web.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Windows.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Xml.Linq.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Xml.Serialization.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Xml.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Xml.XmlDocument.xml -Microsoft.NETCore.App.Ref/ref/net6.0/WindowsBase.xml -NETStandard.Library.Ref/ref/netstandard2.1/Microsoft.Win32.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/mscorlib.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.AppContext.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Buffers.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.Concurrent.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.NonGeneric.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.Specialized.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.Composition.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.EventBasedAsync.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.TypeConverter.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Console.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Core.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Data.Common.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Data.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Contracts.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Debug.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.FileVersionInfo.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Process.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.StackTrace.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.TextWriterTraceListener.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Tools.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.TraceSource.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Tracing.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Drawing.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Drawing.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Dynamic.Runtime.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.Calendars.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.FileSystem.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.ZipFile.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.DriveInfo.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.Watcher.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.IsolatedStorage.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.MemoryMappedFiles.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Pipes.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.UnmanagedMemoryStream.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Expressions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Parallel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Queryable.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Memory.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Http.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.NameResolution.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.NetworkInformation.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Ping.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Requests.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Security.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Sockets.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebHeaderCollection.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebSockets.Client.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebSockets.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Numerics.Vectors.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Numerics.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ObjectModel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.DispatchProxy.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.ILGeneration.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.Lightweight.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.Reader.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.ResourceManager.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.Writer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.CompilerServices.VisualC.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Handles.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.InteropServices.RuntimeInformation.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.InteropServices.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Numerics.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Formatters.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Json.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Xml.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Claims.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Algorithms.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Csp.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Encoding.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.X509Certificates.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Principal.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.SecureString.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ServiceModel.Web.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.Encoding.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.Encoding.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.RegularExpressions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Overlapped.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.Parallel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Thread.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.ThreadPool.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Timer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Transactions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ValueTuple.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Web.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Windows.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.Linq.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.ReaderWriter.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.Serialization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlSerializer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.XDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.xml 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 deleted file mode 100644 index 0a153ba87..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff +++ /dev/null @@ -1,1481 +0,0 @@ -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/local.NuGet.Config b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/local.NuGet.Config deleted file mode 100644 index 7e093b8fb..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/local.NuGet.Config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config deleted file mode 100644 index 59db1a3f1..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - 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 deleted file mode 100644 index cd08e9f4e..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh +++ /dev/null @@ -1,534 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -SCRIPT_ROOT="$(cd -P "$( dirname "$0" )" && pwd)" -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-rtm.21573.1 -__ROOT_REPO=$(sed 's/\r$//' "$SCRIPT_ROOT/artifacts/obj/rootrepo.txt") # remove CR if mounted repo on Windows drive -executingUserHome=${HOME:-} - -export DOTNET_CLI_TELEMETRY_OPTOUT=1 -export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - -# Use uname to determine what the CPU is. -cpuName=$(uname -p) -# Some Linux platforms report unknown for platform, but the arch for machine. -if [[ "$cpuName" == "unknown" ]]; then - cpuName=$(uname -m) -fi - -case $cpuName in - aarch64) - buildArch=arm64 - ;; - amd64|x86_64) - buildArch=x64 - ;; - armv*l) - buildArch=arm - ;; - i686) - buildArch=x86 - ;; - s390x) - buildArch=s390x - ;; - *) - echo "Unknown CPU $cpuName detected, treating it as x64" - buildArch=x64 - ;; -esac - -projectOutput=false -keepProjects=false -dotnetDir="" -configuration="Release" -excludeNonWebTests=false -excludeWebTests=false -excludeWebNoHttpsTests=false -excludeWebHttpsTests=false -excludeLocalTests=false -excludeOnlineTests=false -excludeOmniSharpTests=${excludeOmniSharpTests:-false} -devCertsVersion="$DEV_CERTS_VERSION_DEFAULT" -testingDir="$SCRIPT_ROOT/testing-smoke-$(date +"%m%d%H%M%S")" -cliDir="$testingDir/builtCli" -logsDir="$testingDir/logs" -logFile="$logsDir/smoke-test.log" -omnisharpLogFile="$logsDir/omnisharp.log" -restoredPackagesDir="$testingDir/packages" -testingHome="$testingDir/home" -archiveRestoredPackages=false -smokeTestPrebuilts="$SCRIPT_ROOT/prereq-packages" -nonSbSmokeTestPrebuilts="$SCRIPT_ROOT/non-source-built-prereq-packages" -runningOnline=false -runningHttps=false - -function usage() { - echo "" - echo "usage:" - echo " --dotnetDir the directory from which to run dotnet" - echo " --configuration the configuration being tested (default=Release)" - echo " --targetRid override the target rid to use when needed (e.g. for self-contained publish tests)" - echo " --projectOutput echo dotnet's output to console" - echo " --keepProjects keep projects after tests are complete" - echo " --minimal run minimal set of tests - local sources only, no web" - echo " --excludeNonWebTests don't run tests for non-web projects" - echo " --excludeWebTests don't run tests for web projects" - echo " --excludeWebNoHttpsTests don't run web project tests with --no-https" - echo " --excludeWebHttpsTests don't run web project tests with https using dotnet-dev-certs" - echo " --excludeLocalTests exclude tests that use local sources for nuget packages" - echo " --excludeOnlineTests exclude test that use online sources for nuget packages" - echo " --excludeOmniSharpTests don't run the OmniSharp tests" - echo " --devCertsVersion use dotnet-dev-certs instead of default $DEV_CERTS_VERSION_DEFAULT" - echo " --archiveRestoredPackages capture all restored packages to $smokeTestPrebuilts" - echo "" -} - -while :; do - if [ $# -le 0 ]; then - break - fi - - lowerI="$(echo "$1" | awk '{print tolower($0)}')" - case $lowerI in - '-?'|-h|--help) - usage - exit 0 - ;; - --dotnetdir) - shift - dotnetDir="$1" - ;; - --configuration) - shift - configuration="$1" - ;; - --targetrid) - shift - targetRid="$1" - ;; - --projectoutput) - projectOutput=true - ;; - --keepprojects) - keepProjects=true - ;; - --minimal) - excludeOnlineTests=true - ;; - --excludenonwebtests) - excludeNonWebTests=true - ;; - --excludewebtests) - excludeWebTests=true - ;; - --excludewebnohttpstests) - excludeWebNoHttpsTests=true - ;; - --excludewebhttpstests) - excludeWebHttpsTests=true - ;; - --excludelocaltests) - excludeLocalTests=true - ;; - --excludeonlinetests) - excludeOnlineTests=true - ;; - --excludeomnisharptests) - excludeOmniSharpTests=true - ;; - --devcertsversion) - shift - devCertsVersion="$1" - ;; - --archiverestoredpackages) - archiveRestoredPackages=true - ;; - *) - echo "Unrecognized argument '$1'" - usage - exit 1 - ;; - esac - - shift -done - -function doCommand() { - lang=$1 - proj=$2 - shift; shift; - - echo "starting language $lang, type $proj" | tee -a smoke-test.log - - dotnetCmd=${dotnetDir}/dotnet - - # rename '#'' to 'Sharp' to workaround https://github.com/dotnet/roslyn/issues/51692 - projectDir="${lang//#/Sharp}_${proj}" - mkdir "${projectDir}" - cd "${projectDir}" - - newArgs="new $proj -lang $lang" - - while :; do - if [ $# -le 0 ]; then - break - fi - case "$1" in - --new-arg) - shift - newArgs="$newArgs $1" - ;; - *) - break - ;; - esac - shift - done - - while :; do - if [ $# -le 0 ]; then - break - fi - - binlogOnlinePart="local" - binlogHttpsPart="nohttps" - if [ "$runningOnline" == "true" ]; then - binlogOnlinePart="online" - fi - if [ "$runningHttps" == "true" ]; then - binlogHttpsPart="https" - fi - - binlogPrefix="$logsDir/${projectDir}_${binlogOnlinePart}_${binlogHttpsPart}_" - binlog="${binlogPrefix}$1.binlog" - echo " running $1" | tee -a "$logFile" - - if [ "$1" == "new" ]; then - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $newArgs --no-restore | tee -a "$logFile" - else - "${dotnetCmd}" $newArgs --no-restore >> "$logFile" 2>&1 - fi - elif [[ "$1" == "run" && "$proj" =~ ^(web|mvc|webapi|razor|blazorwasm|blazorserver)$ ]]; then - # A separate log file that we will over-write all the time. - exitLogFile="$testingDir/exitLogFile" - echo > "$exitLogFile" - # Run an application in the background and redirect its - # stdout+stderr to a separate process (tee). The tee process - # writes its input to 2 files: - # - Either the normal log or stdout - # - A log that's only used to find out when it's safe to kill - # the application. - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 2>&1 > >(tee -a "$exitLogFile") & - else - "${dotnetCmd}" $1 2>&1 > >(tee -a "$logFile" "$exitLogFile" >/dev/null) & - fi - webPid=$! - killCommand="pkill -SIGTERM -P $webPid" - echo " waiting up to 30 seconds for web project with pid $webPid..." - echo " to clean up manually after an interactive cancellation, run: $killCommand" - for seconds in $(seq 30); do - if grep 'Application started. Press Ctrl+C to shut down.' "$exitLogFile"; then - echo " app ready for shutdown after $seconds seconds" - break - fi - sleep 1 - done - echo " stopping $webPid" | tee -a "$logFile" - $killCommand - wait $! - echo " terminated with exit code $?" | tee -a "$logFile" - elif [ "$1" == "multi-rid-publish" ]; then - if [ "$lang" == "F#" ]; then - 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 - } - 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 - runPublishScenarios | tee -a "$logFile" - else - runPublishScenarios >> "$logFile" 2>&1 - fi - else - if [ "$lang" == "F#" ]; then - # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554 - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" - else - "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 - fi - else - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" - else - "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 - fi - fi - fi - if [ $? -eq 0 ]; then - echo " $1 succeeded" >> "$logFile" - else - echo " $1 failed with exit code $?" | tee -a "$logFile" - fi - - shift - done - - cd .. - - if [ "$keepProjects" == "false" ]; then - rm -rf "${projectDir}" - fi - - echo "finished language $lang, type $proj" | tee -a smoke-test.log -} - -function setupDevCerts() { - echo "Setting up dotnet-dev-certs $devCertsVersion to generate dev certificate" | tee -a "$logFile" - ( - set -x - "$dotnetDir/dotnet" tool install -g dotnet-dev-certs --version "$devCertsVersion" --add-source https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json - export DOTNET_ROOT="$dotnetDir" - "$testingHome/.dotnet/tools/dotnet-dev-certs" https - ) >> "$logFile" 2>&1 -} - -function runAllTests() { - # Run tests for each language and template - if [ "$excludeNonWebTests" == "false" ]; then - doCommand C# console new restore build run multi-rid-publish - doCommand C# classlib new restore build multi-rid-publish - doCommand C# xunit new restore test - doCommand C# nunit new restore test - doCommand C# mstest new restore test - - doCommand VB console new restore build run multi-rid-publish - doCommand VB classlib new restore build multi-rid-publish - doCommand VB xunit new restore test - doCommand VB nunit new restore test - doCommand VB mstest new restore test - - doCommand F# console new restore build run multi-rid-publish - doCommand F# classlib new restore build multi-rid-publish - doCommand F# xunit new restore test - doCommand F# nunit new restore test - doCommand F# mstest new restore test - fi - - if [ "$excludeWebTests" == "false" ]; then - if [ "$excludeWebNoHttpsTests" == "false" ]; then - runningHttps=false - runWebTests --new-arg --no-https - fi - - if [ "$excludeWebHttpsTests" == "false" ]; then - runningHttps=true - setupDevCerts - runWebTests - fi - fi -} - -function runWebTests() { - doCommand C# web "$@" new restore build run multi-rid-publish - doCommand C# mvc "$@" new restore build run multi-rid-publish - doCommand C# webapi "$@" new restore build multi-rid-publish - 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 - doCommand F# webapi "$@" new restore build run multi-rid-publish -} - -function runOmniSharpTests() { - dotnetCmd=${dotnetDir}/dotnet - - rm -rf workdir - mkdir workdir - pushd workdir - - curl -sSLO "https://github.com/OmniSharp/omnisharp-roslyn/releases/latest/download/omnisharp-linux-x64.tar.gz" - - mkdir omnisharp - pushd omnisharp - tar xf "../omnisharp-linux-x64.tar.gz" - popd - - for project in blazorwasm blazorserver classlib console mstest mvc nunit web webapp webapi worker xunit ; do - - mkdir hello-$project - pushd hello-$project - - "${dotnetCmd}" new $project - popd - - ./omnisharp/run -s "$(readlink -f hello-$project)" > "$omnisharpLogFile" & - - sleep 5 - - pkill -P $$ - - # Omnisharp spawns off a number of processes. They all include the - # current directory as a process argument, so use that to identify and - # kill them. - pgrep -f "$(pwd)" - - kill "$(pgrep -f "$(pwd)")" - - cat "$omnisharpLogFile" - - if grep ERROR "$omnisharpLogFile"; then - echo "test failed" - exit 1 - else - echo "OK" - fi - - done - - popd -} - -function resetCaches() { - rm -rf "$testingHome" - mkdir "$testingHome" - - HOME="$testingHome" - - # clean restore path - rm -rf "$restoredPackagesDir" - - # Copy NuGet plugins if running user has HOME and we have auth. In particular, the auth plugin. - if [ "${internalPackageFeedPat:-}" ] && [ "${executingUserHome:-}" ]; then - cp -r "$executingUserHome/.nuget/" "$HOME/.nuget/" || : - fi -} - -function setupSmokeTestFeed() { - # Setup smoke-test-packages if they exist - if [ -e "$nonSbSmokeTestPrebuilts" ]; then - sed -i.bakSmokeTestFeed "s|SMOKE_TEST_PACKAGE_FEED|$nonSbSmokeTestPrebuilts|g" "$testingDir/NuGet.Config" - else - sed -i.bakSmokeTestFeed "/SMOKE_TEST_PACKAGE_FEED/d" "$testingDir/NuGet.Config" - fi -} - -function copyRestoredPackages() { - if [ "$archiveRestoredPackages" == "true" ]; then - rm -rf "$smokeTestPrebuilts" - rm -rf "$nonSbSmokeTestPrebuilts" - mkdir -p "$smokeTestPrebuilts" - mkdir -p "$nonSbSmokeTestPrebuilts" - find "$restoredPackagesDir" -iname "*.nupkg" -exec mv {} "$smokeTestPrebuilts" \; - - smokeTestPackages=$(find "$smokeTestPrebuilts" -iname "*.nupkg" -type f -printf "%f\n" | tr '[A-Z]' '[a-z]' | sort) - sourceBuiltPackages=$(find "$SOURCE_BUILT_PKGS_PATH" -iname "*.nupkg" -type f -printf "%f\n" | tr '[A-Z]' '[a-z]' | sort) - - echo "Removing smoke-test prereq packages that are source built:" - comm -23 <(printf "$smokeTestPackages") <(printf "$sourceBuiltPackages") | while read line - do - echo "$line" - cp "$smokeTestPrebuilts/$line" "$nonSbSmokeTestPrebuilts" - done - fi -} - -echo "RID to test: ${targetRid?not specified. Use ./build.sh --run-smoke-test to detect RID, or specify manually.}" - -if [ "$__ROOT_REPO" != "known-good" ]; then - echo "Skipping smoke-tests since cli was not built"; - exit -fi - -# Clean up and create directory -if [ -e "$testingDir" ]; then - rm -rf "$testingDir" -fi - -mkdir -p "$testingDir" -mkdir -p "$logsDir" -cd "$testingDir" - -# Create blank Directory.Build files to avoid traversing to source-build infra. -echo "" | tee Directory.Build.props > Directory.Build.targets - -# Unzip dotnet if the dotnetDir is not specified -if [ "$dotnetDir" == "" ]; then - OUTPUT_DIR="$ARTIFACTS_DIR$buildArch/$configuration/" - DOTNET_TARBALL="$(ls "${OUTPUT_DIR}${TARBALL_PREFIX}${VERSION_PREFIX}"*)" - - mkdir -p "$cliDir" - tar xzf "$DOTNET_TARBALL" -C "$cliDir" - dotnetDir="$cliDir" -else - if ! [[ "$dotnetDir" = /* ]]; then - dotnetDir="$SCRIPT_ROOT/$dotnetDir" - fi -fi - -echo SDK under test is: -"$dotnetDir/dotnet" --info - -# setup restore path -export NUGET_PACKAGES="$restoredPackagesDir" -SOURCE_BUILT_PKGS_PATH="${ARTIFACTS_DIR}obj/$buildArch/$configuration/blob-feed/packages/" -export DOTNET_ROOT="$dotnetDir" -export PATH="$dotnetDir:$PATH" - -# Run all tests, online restore sources first, local restore sources second -if [ "$excludeOnlineTests" == "false" ]; then - resetCaches - runningOnline=true - # Setup NuGet.Config to use online restore sources - if [ -e "$SCRIPT_ROOT/online.NuGet.Config" ]; then - cp "$SCRIPT_ROOT/online.NuGet.Config" "$testingDir/NuGet.Config" - echo "$testingDir/NuGet.Config Contents:" - cat "$testingDir/NuGet.Config" - fi - echo "RUN ALL TESTS - ONLINE RESTORE SOURCE" - runAllTests - copyRestoredPackages - echo "ONLINE RESTORE SOURCE - ALL TESTS PASSED!" -fi - -if [ "$excludeLocalTests" == "false" ]; then - resetCaches - runningOnline=false - # Setup NuGet.Config with local restore source - if [ -e "$SCRIPT_ROOT/local.NuGet.Config" ]; then - cp "$SCRIPT_ROOT/local.NuGet.Config" "$testingDir/NuGet.Config" - sed -i.bak "s|SOURCE_BUILT_PACKAGES|$SOURCE_BUILT_PKGS_PATH|g" "$testingDir/NuGet.Config" - setupSmokeTestFeed - echo "$testingDir/NuGet.Config Contents:" - cat "$testingDir/NuGet.Config" - fi - echo "RUN ALL TESTS - LOCAL RESTORE SOURCE" - runAllTests - echo "LOCAL RESTORE SOURCE - ALL TESTS PASSED!" -fi - -if [ "$excludeOmniSharpTests" == "false" ]; then - runOmniSharpTests -fi - -echo "ALL TESTS PASSED!" From 3cbe72d752f42bbd1e66e9d6622013fce3f80e8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Mar 2022 15:34:39 +0000 Subject: [PATCH 278/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220310.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22159.1 -> To Version 6.0.0-servicing.22160.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 be19beb97..f02b2dc54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/source-build-reference-packages - 562275e0d453c753f4a887323e298419310f3849 + 2125d910fc86ff6cd4f834d32f70f0290b31fd96 From a8d4b43e3464cbfa07a23270e938b19d7cc9a558 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Mar 2022 17:05:31 +0000 Subject: [PATCH 279/462] Update dependencies from https://github.com/dotnet/sdk build 20220310.3 (#13379) [release/6.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.2.0-2.22158.15 to 4.2.0-2.22159.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 f02b2dc54..dd824bf40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2cbb8b0266ebdebc0d7cd862e33871637e0d9d76 - + https://github.com/dotnet/sdk - 0f2ffcff737674a7dccf4bc1393826e067396c79 + a34821e78d1a0fc73ac80ba9ae07178b14894a9e - + https://github.com/dotnet/sdk - 0f2ffcff737674a7dccf4bc1393826e067396c79 + a34821e78d1a0fc73ac80ba9ae07178b14894a9e @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - be223bbc06bdad4ee7e615ad32f18c40a10dea81 + f3a5bad242b7a7b8149ae644de0a61c2f1bffc8d diff --git a/eng/Versions.props b/eng/Versions.props index 495359535..515b8b848 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22159.13 - 6.0.300-preview.22159.13 + 6.0.300-preview.22160.3 + 6.0.300-preview.22160.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 18f1baa6e64eecb415d6ff11aa3380a6949d2735 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 10 Mar 2022 09:08:26 -0800 Subject: [PATCH 280/462] Fix duplicate packages --- src/redist/targets/GenerateMSIs.targets | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index c102a1618..838d09c1d 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -491,7 +491,8 @@ '$(MSBuildExtensionsLayoutDirectory.TrimEnd('\'))' ^ '$(FullNugetVersion)' ^ '$(SdkMSBuildExtensionsNuspecFile)' ^ - '$(SdkMSBuildExtensionsNupkgFile)'" /> + '$(SdkMSBuildExtensionsNupkgFile)' ^ + '$(Architecture)'" /> @@ -511,7 +512,8 @@ '$(VSTemplateLocatorLayoutPath.TrimEnd('\'))' ^ '$(FullNugetVersion)' ^ '$(VSTemplateLocatorNuspecFile)' ^ - '$(VSTemplateLocatorNupkgFile)'" /> + '$(VSTemplateLocatorNupkgFile)' ^ + '$(Architecture)'" /> From bf283dc6868dfb5789052ff43924e39bc6fdd7c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Mar 2022 18:38:02 +0000 Subject: [PATCH 281/462] Update dependencies from https://github.com/dotnet/arcade build 20220309.8 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22159.8 --- eng/Version.Details.xml | 12 ++-- eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 69 +++---------------- eng/common/templates/jobs/codeql-build.yml | 2 +- eng/common/templates/steps/execute-sdl.yml | 68 ++++++++++++++++++ eng/common/templates/steps/source-build.yml | 4 +- .../templates/variables/sdl-variables.yml | 7 ++ global.json | 6 +- 8 files changed, 97 insertions(+), 73 deletions(-) create mode 100644 eng/common/templates/steps/execute-sdl.yml create mode 100644 eng/common/templates/variables/sdl-variables.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd824bf40..da38ae900 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 4f4c8c392d1c51e630f4571e39a095da7fb172c5 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 4f4c8c392d1c51e630f4571e39a095da7fb172c5 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 4f4c8c392d1c51e630f4571e39a095da7fb172c5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 515b8b848..3d67cd428 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22122.7 + 6.0.0-beta.22159.8 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index d0a1ea8b0..24cec0424 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -43,14 +43,9 @@ jobs: value: ${{ parameters.AzDOPipelineId }} - name: AzDOBuildId value: ${{ parameters.AzDOBuildId }} - # 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.110.1 + - template: /eng/common/templates/variables/sdl-variables.yml - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config 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') }}: @@ -126,57 +121,11 @@ jobs: displayName: Extract Archive Artifacts continueOnError: ${{ parameters.sdlContinueOnError }} - - ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - powershell: | - $content = Get-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content was:`n$content" - - $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') - $content | Set-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content updated to:`n$content" - displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages - - - ${{ if ne(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - - ${{ if eq(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) - ${{ parameters.additionalParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - - - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: - # We want to publish the Guardian results and configuration for easy diagnosis. However, the - # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default - # tooling files. Some of these files are large and aren't useful during an investigation, so - # exclude them by simply deleting them before publishing. (As of writing, there is no documented - # way to selectively exclude a dir from the pipeline artifact publish task.) - - task: DeleteFiles@1 - displayName: Delete Guardian dependencies to avoid uploading - inputs: - SourceFolder: $(Agent.BuildDirectory)/.gdn - Contents: | - c - i - condition: succeededOrFailed() - - publish: $(Agent.BuildDirectory)/.gdn - artifact: GuardianConfiguration - displayName: Publish GuardianConfiguration - condition: succeededOrFailed() + - template: /eng/common/templates/steps/execute-sdl.yml + parameters: + overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} + executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} + overrideParameters: ${{ parameters.overrideParameters }} + additionalParameters: ${{ parameters.additionalParameters }} + publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} + sdlContinueOnError: ${{ parameters.sdlContinueOnError }} diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml index f7dc5ea4a..54c393af4 100644 --- a/eng/common/templates/jobs/codeql-build.yml +++ b/eng/common/templates/jobs/codeql-build.yml @@ -21,7 +21,7 @@ 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.109.0 + value: 0.110.1 - name: GuardianPackagesConfigFile value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - name: GuardianVersion diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml new file mode 100644 index 000000000..7b8ee18a2 --- /dev/null +++ b/eng/common/templates/steps/execute-sdl.yml @@ -0,0 +1,68 @@ +parameters: + overrideGuardianVersion: '' + executeAllSdlToolsScript: '' + overrideParameters: '' + additionalParameters: '' + publishGuardianDirectoryToPipeline: false + sdlContinueOnError: false + condition: '' + +steps: +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - powershell: | + $content = Get-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content was:`n$content" + + $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') + $content | Set-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content updated to:`n$content" + displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} + +- task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + +- task: NuGetCommand@2 + displayName: 'Install Guardian' + inputs: + restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + feedsToUse: config + nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config + externalFeedCredentials: GuardianConnect + restoreDirectory: $(Build.SourcesDirectory)\.packages + +- ${{ if ne(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if eq(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} + -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) + ${{ parameters.additionalParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: + # We want to publish the Guardian results and configuration for easy diagnosis. However, the + # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default + # tooling files. Some of these files are large and aren't useful during an investigation, so + # exclude them by simply deleting them before publishing. (As of writing, there is no documented + # way to selectively exclude a dir from the pipeline artifact publish task.) + - task: DeleteFiles@1 + displayName: Delete Guardian dependencies to avoid uploading + inputs: + SourceFolder: $(Agent.BuildDirectory)/.gdn + Contents: | + c + i + condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn + artifact: GuardianConfiguration + displayName: Publish GuardianConfiguration + condition: succeededOrFailed() \ No newline at end of file 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/eng/common/templates/variables/sdl-variables.yml b/eng/common/templates/variables/sdl-variables.yml new file mode 100644 index 000000000..1a860bd04 --- /dev/null +++ b/eng/common/templates/variables/sdl-variables.yml @@ -0,0 +1,7 @@ +variables: +# 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.110.1 +- name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/global.json b/global.json index 8a183c7de..4b8ebdbc7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.101", + "dotnet": "6.0.103", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22122.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22159.8", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22159.8" } } From faa618ce2d190c6b40cb353bcb75cf80fe359db9 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 10 Mar 2022 12:23:35 -0800 Subject: [PATCH 282/462] Ensure finalizer.exe is always cached (#13388) --- src/redist/targets/packaging/windows/clisdk/bundle.wxs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index ac9261a94..c58c6a194 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -216,6 +216,7 @@ being installed. --> Date: Thu, 10 Mar 2022 21:06:40 +0000 Subject: [PATCH 283/462] Update dependencies from https://github.com/dotnet/sdk build 20220310.6 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22160.3 -> To Version 6.0.300-preview.22160.6 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.300-preview.22158.11 -> To Version 6.0.300-preview.22160.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 da38ae900..965dc46e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 2cbb8b0266ebdebc0d7cd862e33871637e0d9d76 + 554c414ebc1b9ae9e876f3d486beeee69370e413 - + https://github.com/dotnet/templating - 2cbb8b0266ebdebc0d7cd862e33871637e0d9d76 + 554c414ebc1b9ae9e876f3d486beeee69370e413 - + https://github.com/dotnet/templating - 2cbb8b0266ebdebc0d7cd862e33871637e0d9d76 + 554c414ebc1b9ae9e876f3d486beeee69370e413 - + https://github.com/dotnet/sdk - a34821e78d1a0fc73ac80ba9ae07178b14894a9e + 11809d681b04ed4d0700437e04e55230f170087d - + https://github.com/dotnet/sdk - a34821e78d1a0fc73ac80ba9ae07178b14894a9e + 11809d681b04ed4d0700437e04e55230f170087d diff --git a/eng/Versions.props b/eng/Versions.props index 3d67cd428..008976290 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22158.11 + 6.0.300-preview.22160.1 @@ -56,8 +56,8 @@ - 6.0.300-preview.22160.3 - 6.0.300-preview.22160.3 + 6.0.300-preview.22160.6 + 6.0.300-preview.22160.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22158.11 + 6.0.300-preview.22160.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 09a60fcb5ff839a7ecf5a9c97f19dd9e69efa004 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 10 Mar 2022 16:47:16 -0800 Subject: [PATCH 284/462] Update the nuspec as well to remove the duplicates --- .../VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec | 4 ++-- .../VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec index 4d5b44e81..ffba8a6d9 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec @@ -1,9 +1,9 @@  - VS.Redist.Common.Net.Core.SDK.MSBuildExtensions + VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$ARCH$ 1.0.0 - VS.Redist.Common.Net.Core.SDK.MSBuildExtensions + VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$ARCH$ Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec index 6b60dae86..5f646a6ce 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec @@ -1,9 +1,9 @@  - VS.Redist.Common.Net.Core.SDK.VSTemplateLocator + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$ARCH$ 1.0.0 - VS.Redist.Common.Net.Core.SDK.VSTemplateLocator + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$ARCH$ Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm From 2cf433858f3442fa5f954c4e575b60afb56bee51 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 10 Mar 2022 20:07:24 -0800 Subject: [PATCH 285/462] Update the nuspec as well to remove the duplicates (#13393) --- .../VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec | 4 ++-- .../VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec index 4d5b44e81..ffba8a6d9 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec @@ -1,9 +1,9 @@  - VS.Redist.Common.Net.Core.SDK.MSBuildExtensions + VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$ARCH$ 1.0.0 - VS.Redist.Common.Net.Core.SDK.MSBuildExtensions + VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$ARCH$ Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec index 6b60dae86..5f646a6ce 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec @@ -1,9 +1,9 @@  - VS.Redist.Common.Net.Core.SDK.VSTemplateLocator + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$ARCH$ 1.0.0 - VS.Redist.Common.Net.Core.SDK.VSTemplateLocator + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$ARCH$ Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm From bc9486b8c31318b9e9eb1007d11a038dce366355 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 10 Mar 2022 22:11:50 -0800 Subject: [PATCH 286/462] Remove duplicate dependencies --- eng/Version.Details.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5988fb015..cfe437819 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,10 +166,6 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - - https://github.com/dotnet/emsdk - ee0a97a0009c0e048789126253fea7994db676ac - https://github.com/dotnet/emsdk ee0a97a0009c0e048789126253fea7994db676ac From da96094fdef80e021d137a6faab06ca623c37d55 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 11 Mar 2022 10:17:05 -0800 Subject: [PATCH 287/462] Only produce one version of the swr file. --- src/redist/targets/GenerateMSIs.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 838d09c1d..c56cf824b 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -494,7 +494,8 @@ '$(SdkMSBuildExtensionsNupkgFile)' ^ '$(Architecture)'" /> - From 16f3836fe670c17391e57f536b61a39d097fe79d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 11 Mar 2022 10:26:41 -0800 Subject: [PATCH 288/462] Update Version.Details.xml --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfe437819..a48761a45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,7 +166,7 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk ee0a97a0009c0e048789126253fea7994db676ac From a623165837acd2b5d3ef2d8f00176ccd1da38142 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 11 Mar 2022 10:29:27 -0800 Subject: [PATCH 289/462] Remove emscripten coherency depedency --- 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 359567ebb..a1798b383 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,11 +166,11 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk ee0a97a0009c0e048789126253fea7994db676ac - + https://github.com/dotnet/emsdk ee0a97a0009c0e048789126253fea7994db676ac From eda631478e9b085acab50cc1a38b8c6cae6a519c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Mar 2022 21:23:50 +0000 Subject: [PATCH 290/462] Update dependencies from https://github.com/dotnet/sdk build 20220311.6 (#13398) Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22160.6 -> To Version 6.0.300-preview.22161.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.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.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.3 -> To Version 6.0.2 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 11 ----- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 42 +++++++++---------- 3 files changed, 67 insertions(+), 78 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d790dc6e..9a84139e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,16 @@ - - - - - - @@ -41,16 +35,11 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a48761a45..c53fd543e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + 3a25a7f1cc446b60678ed25c9d829420d6321eba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 554c414ebc1b9ae9e876f3d486beeee69370e413 - + https://github.com/dotnet/sdk - 11809d681b04ed4d0700437e04e55230f170087d + 335f25cd8f81b6be37f8b7c6e5b76c2ddfc4f02a - + https://github.com/dotnet/sdk - 11809d681b04ed4d0700437e04e55230f170087d + 335f25cd8f81b6be37f8b7c6e5b76c2ddfc4f02a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f426c90a9589dabc16d114aa91bfea9f21f8571 + 5ad241b9633924db40503de19cb502bb0aca7718 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 560f243910f407df33fd5cdf06e2a857684f4bc7 + fb76229895cae74c1adc62c2411a0730a2f3759b https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ f3a5bad242b7a7b8149ae644de0a61c2f1bffc8d - + https://github.com/dotnet/msbuild - 2e82c9f3f5feaa9444e67c4509c25f98fb1ea500 + 9c173296404f9c365cc524569766f16d7cfcf308 @@ -170,9 +170,9 @@ https://github.com/dotnet/emsdk ee0a97a0009c0e048789126253fea7994db676ac - + https://github.com/dotnet/source-build - 90bdf447e1b97605f109b34243ab8c9f215308e9 + 10d0f7e94aa45889155c312f51cfc01bf326b853 diff --git a/eng/Versions.props b/eng/Versions.props index 5f49927c0..227b556f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.3-servicing.22123.7 + 6.0.2-servicing.22064.7 - 6.0.3-servicing.22124.2 + 6.0.2-servicing.22064.8 @@ -44,44 +44,44 @@ - 6.0.3 - 6.0.3 - 6.0.3-servicing.22124.1 - 6.0.3-servicing.22124.1 - 6.0.3-servicing.22124.1 - 6.0.3-servicing.22124.1 + 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.300-preview.22160.6 - 6.0.300-preview.22160.6 + 6.0.300-preview.22161.6 + 6.0.300-preview.22161.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.2 + 6.0.1 - 6.0.3-servicing.22123.9 - 6.0.3-servicing.22123.9 - 6.0.3 - 6.0.3 - 6.0.3 - 6.0.3 + 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.3-servicing.22124.3 - 6.0.3-servicing.22124.3 - 6.0.3 - 6.0.3 + 6.0.2-servicing.22064.6 + 6.0.2-servicing.22064.6 + 6.0.2 + 6.0.2 From 658ce5d408b754c4f073af94c063acaa51741912 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Mar 2022 22:38:04 +0000 Subject: [PATCH 291/462] Update dependencies from https://github.com/dotnet/sdk build 20220311.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22161.6 -> To Version 6.0.300-preview.22161.8 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.300-preview.22160.1 -> To Version 6.0.300-preview.22161.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c53fd543e..31951f2ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 554c414ebc1b9ae9e876f3d486beeee69370e413 + 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/templating - 554c414ebc1b9ae9e876f3d486beeee69370e413 + 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/templating - 554c414ebc1b9ae9e876f3d486beeee69370e413 + 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - 335f25cd8f81b6be37f8b7c6e5b76c2ddfc4f02a + 278b73b5ad73f87786ff0455886052a36c7230d3 - + https://github.com/dotnet/sdk - 335f25cd8f81b6be37f8b7c6e5b76c2ddfc4f02a + 278b73b5ad73f87786ff0455886052a36c7230d3 diff --git a/eng/Versions.props b/eng/Versions.props index 227b556f5..7665cf723 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22160.1 + 6.0.300-preview.22161.3 @@ -56,8 +56,8 @@ - 6.0.300-preview.22161.6 - 6.0.300-preview.22161.6 + 6.0.300-preview.22161.8 + 6.0.300-preview.22161.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22160.1 + 6.0.300-preview.22161.3 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From d1f4e8f5d96ae43df7bd540cc6369aa555c90279 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Mar 2022 23:44:13 +0000 Subject: [PATCH 292/462] Update dependencies from https://github.com/dotnet/sdk build 20220311.10 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22161.6 -> To Version 6.0.300-preview.22161.10 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 6.0.300-preview.22160.1 -> To Version 6.0.300-preview.22161.3 (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 31951f2ce..60a5c895e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - 278b73b5ad73f87786ff0455886052a36c7230d3 + b433e7c6197a981f4b5bb521b813d55d8b46c1d5 - + https://github.com/dotnet/sdk - 278b73b5ad73f87786ff0455886052a36c7230d3 + b433e7c6197a981f4b5bb521b813d55d8b46c1d5 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - 3dea7433d11e978a85c9079886582cba96721d9e + 49727bf5e265946f37dbc7597f86dc5d6716ea22 - + https://github.com/dotnet/fsharp - 3dea7433d11e978a85c9079886582cba96721d9e + 49727bf5e265946f37dbc7597f86dc5d6716ea22 diff --git a/eng/Versions.props b/eng/Versions.props index 7665cf723..bf0666e38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22161.8 - 6.0.300-preview.22161.8 + 6.0.300-preview.22161.10 + 6.0.300-preview.22161.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dbc11b81b3339cf3919e09b3b097c546d0b7a44b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Mar 2022 00:46:20 +0000 Subject: [PATCH 293/462] Update dependencies from https://github.com/dotnet/arcade build 20220311.1 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22159.8 -> To Version 6.0.0-beta.22161.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60a5c895e..5ad893231 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 4f4c8c392d1c51e630f4571e39a095da7fb172c5 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 4f4c8c392d1c51e630f4571e39a095da7fb172c5 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 4f4c8c392d1c51e630f4571e39a095da7fb172c5 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index bf0666e38..b167add0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22159.8 + 6.0.0-beta.22161.1 diff --git a/global.json b/global.json index 4b8ebdbc7..3778b80ba 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.22159.8", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22159.8" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1" } } From 37f553ace2c7a632aac1b7f1094010a9f6db170e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 11 Mar 2022 16:49:39 -0800 Subject: [PATCH 294/462] Add additional architecture --- src/SdkResolver/SdkResolver.csproj | 2 ++ src/VSTemplateLocator/VSTemplateLocator.csproj | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/SdkResolver/SdkResolver.csproj b/src/SdkResolver/SdkResolver.csproj index e923b917e..5dc640f4e 100644 --- a/src/SdkResolver/SdkResolver.csproj +++ b/src/SdkResolver/SdkResolver.csproj @@ -14,6 +14,7 @@ + <_SdkResolverSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> <_SdkResolverSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> + <_SdkResolverSrc Include="$(Pkgruntime_win-arm64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-arm64\native\hostfxr.dll" Arch="arm64\" /> <_SdkResolverSrc Include="$(PkgMicrosoft_DotNet_MSBuildSdkResolver)\lib\net472\**\*.dll" Arch="" /> <_SdkResolverDst Include="@(_SdkResolverSrc->'$(OutputPath)%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" /> diff --git a/src/VSTemplateLocator/VSTemplateLocator.csproj b/src/VSTemplateLocator/VSTemplateLocator.csproj index 5f5b60dff..aa6472a77 100644 --- a/src/VSTemplateLocator/VSTemplateLocator.csproj +++ b/src/VSTemplateLocator/VSTemplateLocator.csproj @@ -14,6 +14,7 @@ + <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> + <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-arm64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-arm64\native\hostfxr.dll" Arch="arm64\" /> <_VSTemplateLocatorSrc Include="$(Pkgmicrosoft_dotnet_templateLocator)\lib\net472\**\*.dll" Arch="" /> <_VSTemplateLocatorDst Include="@(_VSTemplateLocatorSrc->'$(OutputPath)VSTemplateLocator\%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" /> From 74901ba76025d47e8f5cf3717af32fb9bf10e3b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Mar 2022 01:27:23 +0000 Subject: [PATCH 295/462] Update dependencies from https://github.com/dotnet/sdk build 20220311.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22161.10 -> To Version 6.0.300-preview.22161.13 --- 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 60a5c895e..31d6d444e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - b433e7c6197a981f4b5bb521b813d55d8b46c1d5 + 80ee2f92a801a9ed494424bc3b83264178ce5ebb - + https://github.com/dotnet/sdk - b433e7c6197a981f4b5bb521b813d55d8b46c1d5 + 80ee2f92a801a9ed494424bc3b83264178ce5ebb diff --git a/eng/Versions.props b/eng/Versions.props index bf0666e38..0d4e74d64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22161.10 - 6.0.300-preview.22161.10 + 6.0.300-preview.22161.13 + 6.0.300-preview.22161.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 436178eccf5318c4beaf62b45b5c5159efdf5672 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Mar 2022 02:43:56 +0000 Subject: [PATCH 296/462] Update dependencies from https://github.com/dotnet/sdk build 20220311.14 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22161.10 -> To Version 6.0.300-preview.22161.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 31d6d444e..a1f5414b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - 80ee2f92a801a9ed494424bc3b83264178ce5ebb + 37540615cb71a04722fb2a4ff26134950e2b962b - + https://github.com/dotnet/sdk - 80ee2f92a801a9ed494424bc3b83264178ce5ebb + 37540615cb71a04722fb2a4ff26134950e2b962b diff --git a/eng/Versions.props b/eng/Versions.props index 0d4e74d64..8a9c119d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22161.13 - 6.0.300-preview.22161.13 + 6.0.300-preview.22161.14 + 6.0.300-preview.22161.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dd6a10fb459c960e2d1b08f17e00e48b744b683b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Mar 2022 02:56:19 +0000 Subject: [PATCH 297/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22160.1 -> To Version 6.0.0-servicing.22161.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 60a5c895e..f1170903c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 4f4c8c392d1c51e630f4571e39a095da7fb172c5 - + https://github.com/dotnet/source-build-reference-packages - 2125d910fc86ff6cd4f834d32f70f0290b31fd96 + a4550df3cb245c4dfd9601c67f86a27a88aad962 From 2d5f6fc8bd3e3bc055d5a824be9ea5355f2d8744 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 11 Mar 2022 18:57:30 -0800 Subject: [PATCH 298/462] Add additional hostfxr versions (#13404) * Update the nuspec as well to remove the duplicates * Add additional architecture --- src/SdkResolver/SdkResolver.csproj | 2 ++ src/VSTemplateLocator/VSTemplateLocator.csproj | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/SdkResolver/SdkResolver.csproj b/src/SdkResolver/SdkResolver.csproj index e923b917e..5dc640f4e 100644 --- a/src/SdkResolver/SdkResolver.csproj +++ b/src/SdkResolver/SdkResolver.csproj @@ -14,6 +14,7 @@ + <_SdkResolverSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> <_SdkResolverSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> + <_SdkResolverSrc Include="$(Pkgruntime_win-arm64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-arm64\native\hostfxr.dll" Arch="arm64\" /> <_SdkResolverSrc Include="$(PkgMicrosoft_DotNet_MSBuildSdkResolver)\lib\net472\**\*.dll" Arch="" /> <_SdkResolverDst Include="@(_SdkResolverSrc->'$(OutputPath)%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" /> diff --git a/src/VSTemplateLocator/VSTemplateLocator.csproj b/src/VSTemplateLocator/VSTemplateLocator.csproj index 5f5b60dff..aa6472a77 100644 --- a/src/VSTemplateLocator/VSTemplateLocator.csproj +++ b/src/VSTemplateLocator/VSTemplateLocator.csproj @@ -14,6 +14,7 @@ + <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> + <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-arm64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-arm64\native\hostfxr.dll" Arch="arm64\" /> <_VSTemplateLocatorSrc Include="$(Pkgmicrosoft_dotnet_templateLocator)\lib\net472\**\*.dll" Arch="" /> <_VSTemplateLocatorDst Include="@(_VSTemplateLocatorSrc->'$(OutputPath)VSTemplateLocator\%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" /> From d10705cf9094199c37e2d4e46de3f3660d4c5aee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Mar 2022 06:57:01 +0000 Subject: [PATCH 299/462] Update dependencies from https://github.com/dotnet/sdk build 20220313.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22161.14 -> To Version 6.0.300-preview.22163.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.3-beta.22161.2 -> To Version 12.0.3-beta.22161.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 29cbe6381..6e314d6b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - 37540615cb71a04722fb2a4ff26134950e2b962b + 5a3930c1a880b9c7abce72fda22e4505f33b12d9 - + https://github.com/dotnet/sdk - 37540615cb71a04722fb2a4ff26134950e2b962b + 5a3930c1a880b9c7abce72fda22e4505f33b12d9 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - 49727bf5e265946f37dbc7597f86dc5d6716ea22 + 695d8c1e326fd7cfb7fa4c5c8d9c5559a7ef8a63 - + https://github.com/dotnet/fsharp - 49727bf5e265946f37dbc7597f86dc5d6716ea22 + 695d8c1e326fd7cfb7fa4c5c8d9c5559a7ef8a63 diff --git a/eng/Versions.props b/eng/Versions.props index 18a3f7dc2..c6a684c30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22161.14 - 6.0.300-preview.22161.14 + 6.0.300-preview.22163.5 + 6.0.300-preview.22163.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b054be41f99fef02f09c74c9dc9cc5eab35ca4d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Mar 2022 20:14:02 +0000 Subject: [PATCH 300/462] Update dependencies from https://github.com/dotnet/sdk build 20220314.6 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22163.5 -> To Version 6.0.300-preview.22164.6 --- 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 6e314d6b2..f36984653 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - 5a3930c1a880b9c7abce72fda22e4505f33b12d9 + cac66e777a95c83bf4a14608f1ebfda7c10f6083 - + https://github.com/dotnet/sdk - 5a3930c1a880b9c7abce72fda22e4505f33b12d9 + cac66e777a95c83bf4a14608f1ebfda7c10f6083 diff --git a/eng/Versions.props b/eng/Versions.props index c6a684c30..b59542b97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22163.5 - 6.0.300-preview.22163.5 + 6.0.300-preview.22164.6 + 6.0.300-preview.22164.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a2621d473d831e1e1528172c1343e0c6ac616588 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 14:24:26 -0700 Subject: [PATCH 301/462] Update dependencies from https://github.com/dotnet/arcade build 20220311.1 (#13405) Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22161.1 Dependency coherency updates Microsoft.SourceBuild.Intermediate.source-build From Version 0.1.0-alpha.1.21616.4 -> To Version 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 12 ---- eng/Version.Details.xml | 16 ++--- eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 69 +++---------------- eng/common/templates/jobs/codeql-build.yml | 2 +- eng/common/templates/steps/execute-sdl.yml | 68 ++++++++++++++++++ .../templates/variables/sdl-variables.yml | 7 ++ global.json | 6 +- 8 files changed, 97 insertions(+), 85 deletions(-) create mode 100644 eng/common/templates/steps/execute-sdl.yml create mode 100644 eng/common/templates/variables/sdl-variables.yml diff --git a/NuGet.config b/NuGet.config index 774c3b7b8..9a84139e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,16 @@ - - - - - - - @@ -42,16 +35,11 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1798b383..794259a0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,9 +174,9 @@ https://github.com/dotnet/emsdk ee0a97a0009c0e048789126253fea7994db676ac - + https://github.com/dotnet/source-build - 90bdf447e1b97605f109b34243ab8c9f215308e9 + 10d0f7e94aa45889155c312f51cfc01bf326b853 @@ -201,19 +201,19 @@ - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 4e112b3f1..3c5ffbd69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22122.7 + 6.0.0-beta.22161.1 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index d0a1ea8b0..24cec0424 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -43,14 +43,9 @@ jobs: value: ${{ parameters.AzDOPipelineId }} - name: AzDOBuildId value: ${{ parameters.AzDOBuildId }} - # 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.110.1 + - template: /eng/common/templates/variables/sdl-variables.yml - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config 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') }}: @@ -126,57 +121,11 @@ jobs: displayName: Extract Archive Artifacts continueOnError: ${{ parameters.sdlContinueOnError }} - - ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - powershell: | - $content = Get-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content was:`n$content" - - $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') - $content | Set-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content updated to:`n$content" - displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages - - - ${{ if ne(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - - ${{ if eq(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) - ${{ parameters.additionalParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - - - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: - # We want to publish the Guardian results and configuration for easy diagnosis. However, the - # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default - # tooling files. Some of these files are large and aren't useful during an investigation, so - # exclude them by simply deleting them before publishing. (As of writing, there is no documented - # way to selectively exclude a dir from the pipeline artifact publish task.) - - task: DeleteFiles@1 - displayName: Delete Guardian dependencies to avoid uploading - inputs: - SourceFolder: $(Agent.BuildDirectory)/.gdn - Contents: | - c - i - condition: succeededOrFailed() - - publish: $(Agent.BuildDirectory)/.gdn - artifact: GuardianConfiguration - displayName: Publish GuardianConfiguration - condition: succeededOrFailed() + - template: /eng/common/templates/steps/execute-sdl.yml + parameters: + overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} + executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} + overrideParameters: ${{ parameters.overrideParameters }} + additionalParameters: ${{ parameters.additionalParameters }} + publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} + sdlContinueOnError: ${{ parameters.sdlContinueOnError }} diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml index f7dc5ea4a..54c393af4 100644 --- a/eng/common/templates/jobs/codeql-build.yml +++ b/eng/common/templates/jobs/codeql-build.yml @@ -21,7 +21,7 @@ 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.109.0 + value: 0.110.1 - name: GuardianPackagesConfigFile value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - name: GuardianVersion diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml new file mode 100644 index 000000000..7b8ee18a2 --- /dev/null +++ b/eng/common/templates/steps/execute-sdl.yml @@ -0,0 +1,68 @@ +parameters: + overrideGuardianVersion: '' + executeAllSdlToolsScript: '' + overrideParameters: '' + additionalParameters: '' + publishGuardianDirectoryToPipeline: false + sdlContinueOnError: false + condition: '' + +steps: +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - powershell: | + $content = Get-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content was:`n$content" + + $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') + $content | Set-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content updated to:`n$content" + displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} + +- task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + +- task: NuGetCommand@2 + displayName: 'Install Guardian' + inputs: + restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + feedsToUse: config + nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config + externalFeedCredentials: GuardianConnect + restoreDirectory: $(Build.SourcesDirectory)\.packages + +- ${{ if ne(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if eq(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} + -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) + ${{ parameters.additionalParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: + # We want to publish the Guardian results and configuration for easy diagnosis. However, the + # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default + # tooling files. Some of these files are large and aren't useful during an investigation, so + # exclude them by simply deleting them before publishing. (As of writing, there is no documented + # way to selectively exclude a dir from the pipeline artifact publish task.) + - task: DeleteFiles@1 + displayName: Delete Guardian dependencies to avoid uploading + inputs: + SourceFolder: $(Agent.BuildDirectory)/.gdn + Contents: | + c + i + condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn + artifact: GuardianConfiguration + displayName: Publish GuardianConfiguration + condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates/variables/sdl-variables.yml b/eng/common/templates/variables/sdl-variables.yml new file mode 100644 index 000000000..1a860bd04 --- /dev/null +++ b/eng/common/templates/variables/sdl-variables.yml @@ -0,0 +1,7 @@ +variables: +# 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.110.1 +- name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/global.json b/global.json index 8a183c7de..3778b80ba 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.101", + "dotnet": "6.0.103", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22122.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1" } } From a882615ccd6cf0a86ab7d26b99277a6e6f65e5bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 14:26:07 -0700 Subject: [PATCH 302/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1 (#13409) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22161.1 Dependency coherency updates Microsoft.SourceBuild.Intermediate.source-build From Version 0.1.0-alpha.1.21616.4 -> To Version 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk 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 794259a0c..9930299ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -215,9 +215,9 @@ https://github.com/dotnet/arcade 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/source-build-reference-packages - 2bd5e08a5ede56b51ea88ac3deecde19c5c520cb + a4550df3cb245c4dfd9601c67f86a27a88aad962 From ab3ddec440c5bd51661f82650bd949a4b69d35da Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 14 Mar 2022 14:27:34 -0700 Subject: [PATCH 303/462] Revert prior changes as only the first and last change were actually needed. --- src/redist/targets/GenerateMSIs.targets | 13 +++++-------- ...ist.Common.Net.Core.SDK.MSBuildExtensions.nuspec | 4 ++-- ...ist.Common.Net.Core.SDK.VSTemplateLocator.nuspec | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index c56cf824b..d306f311e 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -480,7 +480,7 @@ + '$(SdkMSBuildExtensionsNupkgFile)'" /> - + '$(VSTemplateLocatorNupkgFile)'" /> diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec index ffba8a6d9..4d5b44e81 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec @@ -1,9 +1,9 @@  - VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$ARCH$ + VS.Redist.Common.Net.Core.SDK.MSBuildExtensions 1.0.0 - VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$ARCH$ + VS.Redist.Common.Net.Core.SDK.MSBuildExtensions Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec index 5f646a6ce..6b60dae86 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec @@ -1,9 +1,9 @@  - VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$ARCH$ + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator 1.0.0 - VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$ARCH$ + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm From 681bebd311b4aab93183189f5ef6f252127be654 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Mar 2022 23:55:32 +0000 Subject: [PATCH 304/462] Update dependencies from https://github.com/dotnet/sdk build 20220314.17 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22163.5 -> To Version 6.0.300-preview.22164.17 --- 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 f36984653..5efcc6748 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - cac66e777a95c83bf4a14608f1ebfda7c10f6083 + fa2be1406598f8e473af9061e07488ae0778ea11 - + https://github.com/dotnet/sdk - cac66e777a95c83bf4a14608f1ebfda7c10f6083 + fa2be1406598f8e473af9061e07488ae0778ea11 diff --git a/eng/Versions.props b/eng/Versions.props index b59542b97..6b0c3c14b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22164.6 - 6.0.300-preview.22164.6 + 6.0.300-preview.22164.17 + 6.0.300-preview.22164.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 75bdbcd4e17dc6ab5022a5592dada6913ec5e419 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Mar 2022 08:47:11 +0000 Subject: [PATCH 305/462] Update dependencies from https://github.com/dotnet/sdk build 20220315.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22164.17 -> To Version 6.0.300-preview.22165.1 --- 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 5efcc6748..ce14fae35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - fa2be1406598f8e473af9061e07488ae0778ea11 + 5f2d500e43184a2d173f3a0b4252384016c29eff - + https://github.com/dotnet/sdk - fa2be1406598f8e473af9061e07488ae0778ea11 + 5f2d500e43184a2d173f3a0b4252384016c29eff diff --git a/eng/Versions.props b/eng/Versions.props index 6b0c3c14b..6201d7ee5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22164.17 - 6.0.300-preview.22164.17 + 6.0.300-preview.22165.1 + 6.0.300-preview.22165.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9fd1cb9959407923cec32295ebdb33931b6f38bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Mar 2022 09:54:10 +0000 Subject: [PATCH 306/462] Update dependencies from https://github.com/dotnet/sdk build 20220315.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22164.17 -> To Version 6.0.300-preview.22165.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.0.3-beta.22161.4 -> To Version 12.0.3-beta.22164.2 (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 ce14fae35..764518b7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - 5f2d500e43184a2d173f3a0b4252384016c29eff + 5724adc5c3877bc0b837d9a0f7621b8756023118 - + https://github.com/dotnet/sdk - 5f2d500e43184a2d173f3a0b4252384016c29eff + 5724adc5c3877bc0b837d9a0f7621b8756023118 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - 695d8c1e326fd7cfb7fa4c5c8d9c5559a7ef8a63 + 13747851a1bdc5b4a34fcd1d45279a50638dbc82 - + https://github.com/dotnet/fsharp - 695d8c1e326fd7cfb7fa4c5c8d9c5559a7ef8a63 + 13747851a1bdc5b4a34fcd1d45279a50638dbc82 @@ -146,9 +146,9 @@ f3a5bad242b7a7b8149ae644de0a61c2f1bffc8d - + https://github.com/dotnet/msbuild - 9c173296404f9c365cc524569766f16d7cfcf308 + 08555986596aebc0701a1e1a0b4489b79b0e835a diff --git a/eng/Versions.props b/eng/Versions.props index 6201d7ee5..29653e4d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22165.1 - 6.0.300-preview.22165.1 + 6.0.300-preview.22165.4 + 6.0.300-preview.22165.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7dbbf219236fda95434eb997ae330f4238c20e69 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 15 Mar 2022 09:25:17 -0700 Subject: [PATCH 307/462] [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 08821b070..0c141e3cb 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.23 - 10.0.18362.23 - 10.0.19041.23 - 10.0.20348.23 - 10.0.22000.23 + 10.0.17763.24 + 10.0.18362.24 + 10.0.19041.24 + 10.0.20348.24 + 10.0.22000.24 From 15675c82dfecc889bbb7aa38a5c7aaf61d417d35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Mar 2022 07:24:02 +0000 Subject: [PATCH 308/462] Update dependencies from https://github.com/dotnet/sdk build 20220315.29 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22165.4 -> To Version 6.0.300-preview.22165.29 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.2.0-2.22159.10 -> To Version 4.2.0-2.22165.9 (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 764518b7e..f07a36684 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - 5724adc5c3877bc0b837d9a0f7621b8756023118 + f14f9aa334a79cdf31224ad49ee47be472083c13 - + https://github.com/dotnet/sdk - 5724adc5c3877bc0b837d9a0f7621b8756023118 + f14f9aa334a79cdf31224ad49ee47be472083c13 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - f3a5bad242b7a7b8149ae644de0a61c2f1bffc8d + 09833148cf7ebf664afa60f46476920fd6a0d6e7 diff --git a/eng/Versions.props b/eng/Versions.props index 29653e4d1..28c134048 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22165.4 - 6.0.300-preview.22165.4 + 6.0.300-preview.22165.29 + 6.0.300-preview.22165.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 554e3e4578c957bdb0107a8870242a52cced3e98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Mar 2022 09:35:19 +0000 Subject: [PATCH 309/462] Update dependencies from https://github.com/dotnet/sdk build 20220316.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22165.29 -> To Version 6.0.300-preview.22166.1 Dependency coherency updates NuGet.Build.Tasks From Version 6.2.0-preview.2.91 -> To Version 6.2.0-preview.2.107 (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 f07a36684..f09857939 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - f14f9aa334a79cdf31224ad49ee47be472083c13 + a823a026245b1bad9505bcf6c908b85893ea04d1 - + https://github.com/dotnet/sdk - f14f9aa334a79cdf31224ad49ee47be472083c13 + a823a026245b1bad9505bcf6c908b85893ea04d1 @@ -151,9 +151,9 @@ 08555986596aebc0701a1e1a0b4489b79b0e835a - + https://github.com/nuget/nuget.client - db1acf828845c4f6177d3acae0abab1ac6b9a1c5 + 63b0e919076850705b9a83c5cd36bc50ceb96df3 diff --git a/eng/Versions.props b/eng/Versions.props index 28c134048..c9bef5e5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22165.29 - 6.0.300-preview.22165.29 + 6.0.300-preview.22166.1 + 6.0.300-preview.22166.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5c8b4781708717c01ef42d6ef18f612e9d4a4e64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Mar 2022 10:50:15 +0000 Subject: [PATCH 310/462] Update dependencies from https://github.com/dotnet/sdk build 20220316.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22165.29 -> To Version 6.0.300-preview.22166.3 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.300-preview.22161.3 -> To Version 6.0.300-preview.22165.1 (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 f09857939..98c0cffae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 2380b2f5181ea93893481406f0e37a2159202592 + 00b30f0f3de9cd11bb060bf07b7330c7316578b6 - + https://github.com/dotnet/templating - 2380b2f5181ea93893481406f0e37a2159202592 + 00b30f0f3de9cd11bb060bf07b7330c7316578b6 - + https://github.com/dotnet/templating - 2380b2f5181ea93893481406f0e37a2159202592 + 00b30f0f3de9cd11bb060bf07b7330c7316578b6 - + https://github.com/dotnet/sdk - a823a026245b1bad9505bcf6c908b85893ea04d1 + 75c59fb8ab6f7959d12a0d2e75416c286d629390 - + https://github.com/dotnet/sdk - a823a026245b1bad9505bcf6c908b85893ea04d1 + 75c59fb8ab6f7959d12a0d2e75416c286d629390 @@ -146,9 +146,9 @@ 09833148cf7ebf664afa60f46476920fd6a0d6e7 - + https://github.com/dotnet/msbuild - 08555986596aebc0701a1e1a0b4489b79b0e835a + 45c3fbf900a5db4c175a485e8c9bd93c52ee5975 diff --git a/eng/Versions.props b/eng/Versions.props index c9bef5e5f..4142a45ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22161.3 + 6.0.300-preview.22165.1 @@ -56,8 +56,8 @@ - 6.0.300-preview.22166.1 - 6.0.300-preview.22166.1 + 6.0.300-preview.22166.3 + 6.0.300-preview.22166.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22161.3 + 6.0.300-preview.22165.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 45a7670092c7b86624e21cb4ba126ee44050b2b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Mar 2022 22:35:54 +0000 Subject: [PATCH 311/462] Update dependencies from https://github.com/dotnet/sdk build 20220316.10 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22165.29 -> To Version 6.0.300-preview.22166.10 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.300-preview.22161.3 -> To Version 6.0.300-preview.22166.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98c0cffae..c8bd4a6aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 00b30f0f3de9cd11bb060bf07b7330c7316578b6 + b363e0cd8a3c94f89e6433452c87b55c7f0c1b97 - + https://github.com/dotnet/templating - 00b30f0f3de9cd11bb060bf07b7330c7316578b6 + b363e0cd8a3c94f89e6433452c87b55c7f0c1b97 - + https://github.com/dotnet/templating - 00b30f0f3de9cd11bb060bf07b7330c7316578b6 + b363e0cd8a3c94f89e6433452c87b55c7f0c1b97 - + https://github.com/dotnet/sdk - 75c59fb8ab6f7959d12a0d2e75416c286d629390 + f4c9a89adc94ff7305122c0c60372423f2eaf8c6 - + https://github.com/dotnet/sdk - 75c59fb8ab6f7959d12a0d2e75416c286d629390 + f4c9a89adc94ff7305122c0c60372423f2eaf8c6 diff --git a/eng/Versions.props b/eng/Versions.props index 4142a45ec..a5c8c3ca0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22165.1 + 6.0.300-preview.22166.2 @@ -56,8 +56,8 @@ - 6.0.300-preview.22166.3 - 6.0.300-preview.22166.3 + 6.0.300-preview.22166.10 + 6.0.300-preview.22166.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22165.1 + 6.0.300-preview.22166.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 532bd64d19ba1a7d981a7c81aed6d1de547bfe4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Mar 2022 12:21:11 +0000 Subject: [PATCH 312/462] Update dependencies from https://github.com/dotnet/sdk build 20220316.21 (#13437) [release/6.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.2.0-preview-22165-11 to 17.2.0-preview-22166-02 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.2.0-preview.2.107 to 6.2.0-preview.2.109 (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 c8bd4a6aa..f07e63108 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b363e0cd8a3c94f89e6433452c87b55c7f0c1b97 - + https://github.com/dotnet/sdk - f4c9a89adc94ff7305122c0c60372423f2eaf8c6 + cd6b42c0946f71755a859ec66da7ea26a08bef2d - + https://github.com/dotnet/sdk - f4c9a89adc94ff7305122c0c60372423f2eaf8c6 + cd6b42c0946f71755a859ec66da7ea26a08bef2d @@ -146,14 +146,14 @@ 09833148cf7ebf664afa60f46476920fd6a0d6e7 - + https://github.com/dotnet/msbuild - 45c3fbf900a5db4c175a485e8c9bd93c52ee5975 + e7db3b978eb2a2301c7ed77b3943d20c86d3dfd7 - + https://github.com/nuget/nuget.client - 63b0e919076850705b9a83c5cd36bc50ceb96df3 + 919c7e10ebdcc43235c36cf0b72c389d741835a8 diff --git a/eng/Versions.props b/eng/Versions.props index a5c8c3ca0..932f06c7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22166.10 - 6.0.300-preview.22166.10 + 6.0.300-preview.22166.21 + 6.0.300-preview.22166.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 64addbe5bf19ad47150cb10e8117cb1a11fa3577 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 17 Mar 2022 10:48:26 -0500 Subject: [PATCH 313/462] Fix issue with BundledTemplates condition --- src/redist/targets/BundledTemplates.targets | 173 ++++++++++---------- 1 file changed, 86 insertions(+), 87 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index b1896eb09..371148c02 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -20,94 +20,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg - $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(NuGetPackageRoot)$([System.String]::copy('%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg').ToLower()) + + + From 57292e300ccb59d7512f54d5402747c4b40336c5 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 17 Mar 2022 12:38:23 -0500 Subject: [PATCH 314/462] Make a source-build targetted fix to unblock release --- src/redist/targets/BundledTemplates.targets | 173 ++++++++++---------- 1 file changed, 87 insertions(+), 86 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 371148c02..30f47ce59 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -20,93 +20,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(NuGetPackageRoot)$([System.String]::copy('%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg').ToLower()) - - - From fd8148368c1fc406e0c62b241e88566c0b59050c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Mar 2022 22:18:28 +0000 Subject: [PATCH 315/462] Update dependencies from https://github.com/dotnet/sdk build 20220317.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22166.21 -> To Version 6.0.300-preview.22167.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.3-beta.22164.2 -> To Version 12.0.3-beta.22165.2 (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 f07e63108..8eb3af144 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b363e0cd8a3c94f89e6433452c87b55c7f0c1b97 - + https://github.com/dotnet/sdk - cd6b42c0946f71755a859ec66da7ea26a08bef2d + 949bf3ddefeb15178f22d373c5f0c74e1b751f89 - + https://github.com/dotnet/sdk - cd6b42c0946f71755a859ec66da7ea26a08bef2d + 949bf3ddefeb15178f22d373c5f0c74e1b751f89 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - 13747851a1bdc5b4a34fcd1d45279a50638dbc82 + dc0f9bde13f0986a8e3104bc9f04eb3dac4ddd92 - + https://github.com/dotnet/fsharp - 13747851a1bdc5b4a34fcd1d45279a50638dbc82 + dc0f9bde13f0986a8e3104bc9f04eb3dac4ddd92 diff --git a/eng/Versions.props b/eng/Versions.props index 932f06c7e..0d0a12bf4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22166.21 - 6.0.300-preview.22166.21 + 6.0.300-preview.22167.13 + 6.0.300-preview.22167.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0bdd5cc952ed72d1555db38c0187392ec60c303e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Mar 2022 11:13:08 +0000 Subject: [PATCH 316/462] Update dependencies from https://github.com/dotnet/sdk build 20220318.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22167.13 -> To Version 6.0.300-preview.22168.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.2.0-2.22165.9 -> To Version 4.2.0-2.22167.6 (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 8eb3af144..ccae9d91a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b363e0cd8a3c94f89e6433452c87b55c7f0c1b97 - + https://github.com/dotnet/sdk - 949bf3ddefeb15178f22d373c5f0c74e1b751f89 + c9f7d252636345d8c5968dc3f5641a2668b8516e - + https://github.com/dotnet/sdk - 949bf3ddefeb15178f22d373c5f0c74e1b751f89 + c9f7d252636345d8c5968dc3f5641a2668b8516e @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 09833148cf7ebf664afa60f46476920fd6a0d6e7 + eaf9823eb18af4972cb5b8e299a350d1985be33d diff --git a/eng/Versions.props b/eng/Versions.props index 0d0a12bf4..4f09f46a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22167.13 - 6.0.300-preview.22167.13 + 6.0.300-preview.22168.1 + 6.0.300-preview.22168.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4ff8f79c3d19dd742f0b2b184a23759727673632 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Mar 2022 01:08:23 +0000 Subject: [PATCH 317/462] Merged PR 21732: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.201 to 6.0.202 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.201-servicing.22123.7 to 6.0.202-servicing.22165.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.201 to 6.0.202 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0... --- NuGet.config | 10 ++ eng/Version.Details.xml | 116 +++++++++--------- eng/Versions.props | 50 ++++---- eng/common/templates/steps/source-build.yml | 4 +- ...lectionMetadataLoadContextVersion-pr.patch | 44 ------- src/redist/targets/GenerateLayout.targets | 4 +- 6 files changed, 98 insertions(+), 130 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch diff --git a/NuGet.config b/NuGet.config index 9a84139e5..58f43c70c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,22 @@ + + + + + + @@ -35,11 +41,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9930299ff..93bf591cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 167140c0529a64c91f7a82249583ce27e52d28dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 167140c0529a64c91f7a82249583ce27e52d28dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 167140c0529a64c91f7a82249583ce27e52d28dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 167140c0529a64c91f7a82249583ce27e52d28dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeae34ecb55d49616c9cd79bebfd6978b9ee54a0 + 65f76a98c392556c2c395b78a9e4ab2bd9750bbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeae34ecb55d49616c9cd79bebfd6978b9ee54a0 + 65f76a98c392556c2c395b78a9e4ab2bd9750bbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeae34ecb55d49616c9cd79bebfd6978b9ee54a0 + 65f76a98c392556c2c395b78a9e4ab2bd9750bbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 11428db5b702966c7750a82c099718a398a1aa15 + a980151203a073b56b87d3ffe92ee6af68a27494 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 11428db5b702966c7750a82c099718a398a1aa15 + a980151203a073b56b87d3ffe92ee6af68a27494 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f426c90a9589dabc16d114aa91bfea9f21f8571 + 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 560f243910f407df33fd5cdf06e2a857684f4bc7 + fcb07d637abf53791e2c55c63d9207fc3232fe83 https://github.com/dotnet/fsharp @@ -135,20 +135,20 @@ d3c6439b04452047cb62fc645ce341a034bdb5be - + https://github.com/dotnet/linker - 4a231cedcaf6b93b04d07e5f7670e88e5fa937fe + e9cfb5413a6a7a7b5bfc3b9a73671be2b18642cf linker - + https://github.com/dotnet/roslyn - dbffaa4a4e4507b8e8dcf0cae6e3209d32113391 + 5d10d428050c0d6afef30a072c4ae68776621877 - + https://github.com/dotnet/msbuild - ae57d105c6094d8d59fe42f557ad0dcb46ec285e + a02f73656613e752c73ff442cdd72540f4b09f57 @@ -166,13 +166,13 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - ee0a97a0009c0e048789126253fea7994db676ac + 52e9452f82e26f9fcae791e84c082ae22f1ef66f - + https://github.com/dotnet/emsdk - ee0a97a0009c0e048789126253fea7994db676ac + 52e9452f82e26f9fcae791e84c082ae22f1ef66f https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index b1a71dbe8..5e18e0d67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.3-servicing.22123.7 + 6.0.4-servicing.22164.7 - 6.0.3-servicing.22124.2 + 6.0.4-servicing.22165.3 - 6.0.201 + 6.0.202 @@ -44,44 +44,44 @@ - 6.0.3 - 6.0.3 - 6.0.3-servicing.22124.1 - 6.0.3-servicing.22124.1 - 6.0.3-servicing.22124.1 - 6.0.3-servicing.22124.1 + 6.0.4 + 6.0.4 + 6.0.4-servicing.22167.10 + 6.0.4-servicing.22167.10 + 6.0.4-servicing.22167.10 + 6.0.4-servicing.22167.10 0.2.0 - 6.0.201-servicing.22124.17 - 6.0.201-servicing.22124.17 + 6.0.202-servicing.22168.4 + 6.0.202-servicing.22168.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.2 + 6.0.3 - 6.0.3-servicing.22123.9 - 6.0.3-servicing.22123.9 - 6.0.3 - 6.0.3 - 6.0.3 - 6.0.3 + 6.0.4-servicing.22164.4 + 6.0.4-servicing.22164.4 + 6.0.4 + 6.0.4 + 6.0.4 + 6.0.4 2.1.0 - 6.0.3-servicing.22124.3 - 6.0.3-servicing.22124.3 - 6.0.3 - 6.0.3 + 6.0.4-servicing.22165.2 + 6.0.4-servicing.22165.2 + 6.0.4 + 6.0.4 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.201 + 6.0.202 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) @@ -182,8 +182,8 @@ 15.2.301-preview.13.2 12.1.301-preview.13.2 15.2.301-preview.13.2 - 6.0.2-mauipre.1.22102.15 - 6.0.2 + $(MicrosoftNETCoreAppRefPackageVersion) + 6.0.4 $(MicrosoftNETWorkloadEmscriptenManifest60200Version) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ba40dc82f..abb1b2bcd 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 [ '$(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)' + 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)' fi buildConfig=Release diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch b/src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch deleted file mode 100644 index 721dc2879..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Sat, 19 Feb 2022 12:12:32 +0000 -Subject: [PATCH] Define SystemReflectionMetadataLoadContextVersion property - for package references - -System.Reflection.MetadataLoadContext references were using an incorrect version.props property which breaks source-build. -In 6.0.3 SystemReflectionMetadataVersion was revved but not SystemReflectionMetadataLoadContextVersion therefore breaking -the build because a System.Reflection.MetadataLoadContext with the SystemReflectionMetadataVersion does not exist. ---- - eng/Versions.props | 1 + - src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 5e9d0039096..34034aa87ba 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -86,6 +86,7 @@ - 5.0.0 - - 5.0.0 -+ 5.0.0 - 4.7.0 - 4.7.0 - 4.7.0 -diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -index 358de5541e3..abf6d26d9ef 100644 ---- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -@@ -23,11 +23,11 @@ - - - -- -+ - - - -- -+ - - - diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index a6a968ae9..5c9b2f490 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -85,13 +85,15 @@ $(SharedFrameworkRid) linux-x64 $(AspNetCoreSharedFxInstallerRid) - x64 + x64 + aarch64 aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension) aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension) From 785ff022a12a6763ea3d3ed16c81ac916acdb68e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Mar 2022 18:15:09 +0000 Subject: [PATCH 318/462] Update dependencies from https://github.com/dotnet/sdk build 20220321.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22168.1 -> To Version 6.0.300-preview.22171.8 --- 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 ccae9d91a..01db4e9ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b363e0cd8a3c94f89e6433452c87b55c7f0c1b97 - + https://github.com/dotnet/sdk - c9f7d252636345d8c5968dc3f5641a2668b8516e + 2d28237f86981d8dea964615e6872bd89112576d - + https://github.com/dotnet/sdk - c9f7d252636345d8c5968dc3f5641a2668b8516e + 2d28237f86981d8dea964615e6872bd89112576d diff --git a/eng/Versions.props b/eng/Versions.props index 4f09f46a0..87fc44cae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22168.1 - 6.0.300-preview.22168.1 + 6.0.300-preview.22171.8 + 6.0.300-preview.22171.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7eccbbbf343b0228f98968c5a029e8afee16fb31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Mar 2022 19:24:03 +0000 Subject: [PATCH 319/462] Update dependencies from https://github.com/dotnet/sdk build 20220321.10 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22168.1 -> To Version 6.0.300-preview.22171.10 --- 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 01db4e9ab..eb7ed2ba1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b363e0cd8a3c94f89e6433452c87b55c7f0c1b97 - + https://github.com/dotnet/sdk - 2d28237f86981d8dea964615e6872bd89112576d + f1e4eb674e104da11741fc95f2754abd3243adfd - + https://github.com/dotnet/sdk - 2d28237f86981d8dea964615e6872bd89112576d + f1e4eb674e104da11741fc95f2754abd3243adfd diff --git a/eng/Versions.props b/eng/Versions.props index 87fc44cae..13847da17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22171.8 - 6.0.300-preview.22171.8 + 6.0.300-preview.22171.10 + 6.0.300-preview.22171.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e1a3ae032d270843401a8e38642e81320bb02b34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Mar 2022 23:19:39 +0000 Subject: [PATCH 320/462] Update dependencies from https://github.com/dotnet/sdk build 20220321.21 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22168.1 -> To Version 6.0.300-preview.22171.21 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.300-preview.22166.2 -> To Version 6.0.300-preview.22171.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb7ed2ba1..4652eecc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - b363e0cd8a3c94f89e6433452c87b55c7f0c1b97 + cb240f758a119d5a99d886c68b903fb1850a01c7 - + https://github.com/dotnet/templating - b363e0cd8a3c94f89e6433452c87b55c7f0c1b97 + cb240f758a119d5a99d886c68b903fb1850a01c7 - + https://github.com/dotnet/templating - b363e0cd8a3c94f89e6433452c87b55c7f0c1b97 + cb240f758a119d5a99d886c68b903fb1850a01c7 - + https://github.com/dotnet/sdk - f1e4eb674e104da11741fc95f2754abd3243adfd + 44db9d5855391341cb41610838949ecaaf5b28b9 - + https://github.com/dotnet/sdk - f1e4eb674e104da11741fc95f2754abd3243adfd + 44db9d5855391341cb41610838949ecaaf5b28b9 diff --git a/eng/Versions.props b/eng/Versions.props index 13847da17..58f363d42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22166.2 + 6.0.300-preview.22171.2 @@ -56,8 +56,8 @@ - 6.0.300-preview.22171.10 - 6.0.300-preview.22171.10 + 6.0.300-preview.22171.21 + 6.0.300-preview.22171.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22166.2 + 6.0.300-preview.22171.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 322355cbc9cc064eb1b7cd3c11091e0bcb39bf06 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Mar 2022 01:09:30 +0000 Subject: [PATCH 321/462] Merged PR 21900: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120 - **Build**: 20220321.27 - **Date Produced**: March 22, 2022 12:41:39 AM UTC - **Commit**: bee413db0346cd7d46697e5ef00267cf4234c355 - **Branch**: refs/heads/internal/release/6.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.202-servicing.22168.4 to 6.0.202-servicing.22171.27][2] - **Microsoft.NET.Sdk**: [from 6.0.202-servicing.22168.4 to 6.0.202-servicing.22171.27][2] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][3] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][3] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3] - **dotnet-dev-certs**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3] - **dotnet-user-secrets**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa980151&targetVersion=GCbee413d&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC578ba6d&targetVersion=GCcdabbaa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 58f43c70c..4205579dd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93bf591cf..5180e1313 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 65f76a98c392556c2c395b78a9e4ab2bd9750bbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a980151203a073b56b87d3ffe92ee6af68a27494 + bee413db0346cd7d46697e5ef00267cf4234c355 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a980151203a073b56b87d3ffe92ee6af68a27494 + bee413db0346cd7d46697e5ef00267cf4234c355 diff --git a/eng/Versions.props b/eng/Versions.props index 5e18e0d67..3de1c20c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.4 6.0.4 - 6.0.4-servicing.22167.10 - 6.0.4-servicing.22167.10 - 6.0.4-servicing.22167.10 - 6.0.4-servicing.22167.10 + 6.0.4-servicing.22171.7 + 6.0.4-servicing.22171.7 + 6.0.4-servicing.22171.7 + 6.0.4-servicing.22171.7 0.2.0 - 6.0.202-servicing.22168.4 - 6.0.202-servicing.22168.4 + 6.0.202-servicing.22171.27 + 6.0.202-servicing.22171.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3d1b624a8817c66a16181493670b1ebddc2e2281 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Mar 2022 11:13:38 +0000 Subject: [PATCH 322/462] Update dependencies from https://github.com/dotnet/sdk build 20220322.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22171.21 -> To Version 6.0.300-preview.22172.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.3-beta.22165.2 -> To Version 12.0.3-beta.22171.1 (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 4652eecc3..8d52e7c98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating cb240f758a119d5a99d886c68b903fb1850a01c7 - + https://github.com/dotnet/sdk - 44db9d5855391341cb41610838949ecaaf5b28b9 + 6bd29f91ee75ae6e235bef10796710ee546958b9 - + https://github.com/dotnet/sdk - 44db9d5855391341cb41610838949ecaaf5b28b9 + 6bd29f91ee75ae6e235bef10796710ee546958b9 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - dc0f9bde13f0986a8e3104bc9f04eb3dac4ddd92 + 39df6b9cd8f107a9d3b6a022ddea1bda86f7601c - + https://github.com/dotnet/fsharp - dc0f9bde13f0986a8e3104bc9f04eb3dac4ddd92 + 39df6b9cd8f107a9d3b6a022ddea1bda86f7601c @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - eaf9823eb18af4972cb5b8e299a350d1985be33d + 9ca68121101710b36c12a3c165482ce16144d3e3 - + https://github.com/dotnet/msbuild - e7db3b978eb2a2301c7ed77b3943d20c86d3dfd7 + a32366d8051ae27a3690476bb0f2b70adbe7470f diff --git a/eng/Versions.props b/eng/Versions.props index 58f363d42..50e5a29d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22171.21 - 6.0.300-preview.22171.21 + 6.0.300-preview.22172.2 + 6.0.300-preview.22172.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f8a55617d250f5db711e7425428671da5f1967a3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Mar 2022 20:11:28 +0000 Subject: [PATCH 323/462] Merged PR 21938: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120 - **Build**: 20220322.7 - **Date Produced**: March 22, 2022 7:37:17 PM UTC - **Commit**: 48cdb7a16e8277e63c5bb52f97bb02198d1a9759 - **Branch**: refs/heads/internal/release/6.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.202-servicing.22171.27 to 6.0.202-servicing.22172.7][1] - **Microsoft.NET.Sdk**: [from 6.0.202-servicing.22171.27 to 6.0.202-servicing.22172.7][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2] - **dotnet-dev-certs**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2] - **dotnet-user-secrets**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbee413d&targetVersion=GC48cdb7a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCcdabbaa&targetVersion=GCf9ae0f5&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4205579dd..e885f4e2b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5180e1313..4d2b4672a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 65f76a98c392556c2c395b78a9e4ab2bd9750bbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bee413db0346cd7d46697e5ef00267cf4234c355 + 48cdb7a16e8277e63c5bb52f97bb02198d1a9759 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bee413db0346cd7d46697e5ef00267cf4234c355 + 48cdb7a16e8277e63c5bb52f97bb02198d1a9759 diff --git a/eng/Versions.props b/eng/Versions.props index 3de1c20c5..94207a722 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.4 6.0.4 - 6.0.4-servicing.22171.7 - 6.0.4-servicing.22171.7 - 6.0.4-servicing.22171.7 - 6.0.4-servicing.22171.7 + 6.0.4-servicing.22172.4 + 6.0.4-servicing.22172.4 + 6.0.4-servicing.22172.4 + 6.0.4-servicing.22172.4 0.2.0 - 6.0.202-servicing.22171.27 - 6.0.202-servicing.22171.27 + 6.0.202-servicing.22172.7 + 6.0.202-servicing.22172.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6791ff652bd2d5d007b92a66203d3483ca1948cf Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 25 Mar 2022 09:58:21 -0700 Subject: [PATCH 324/462] [automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx' (#13461) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220309.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22159.1 * Update source-build with 6.0.103 artifacts * Disable public source-build tarball ci (#13377) * Fix invalid pipeline trigger. * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220310.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22159.1 -> To Version 6.0.0-servicing.22160.1 * Update dependencies from https://github.com/dotnet/arcade build 20220309.8 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22159.8 * Remove maui workloads from 6.0.100 The old workloads break MU so we either have to update them or remove them. * Only do signcheck if there are files to sign check * Remove template text-only packages which are alread included in source-build (#13380) * Update dependencies from https://github.com/dotnet/arcade build 20220311.1 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22159.8 -> To Version 6.0.0-beta.22161.1 * Update source-build MsftToSbSdk.diff baseline (#13400) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22160.1 -> To Version 6.0.0-servicing.22161.1 * [release/6.0.1xx] Windows SDK projection update * [release/6.0.1xx] dotnet watch smoke test (#13392) * add dotnet watch smoke test * Fix issue with BundledTemplates condition * Make a source-build targetted fix to unblock release * Fix issue with BundledTemplates condition * Make a source-build targetted fix to unblock release * Refactor build.sh to optimize PackageVersions.props retrieval (#13443) * Update NuGet path issue in Run Tests CI step (#13453) * Refactor SdkContentTests to warn on diffs when run in CI (#13432) * Revert the Versions.props file * Revert the Versions.props file Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Marc Paine Co-authored-by: Jason Zhai Co-authored-by: Manodasan Wignarajah Co-authored-by: Logan Bussell --- eng/source-build-tarball-build.yml | 2 +- .../steps/source-build-build-tarball.yml | 8 +-- .../Arcade/tools/TextOnlyPackages.csproj | 2 - src/SourceBuild/tarball/content/build.proj | 4 +- src/SourceBuild/tarball/content/build.sh | 10 ++-- .../BaselineHelper.cs | 20 +++++-- .../Config.cs | 3 + .../DotNetHelper.cs | 29 +++++---- .../DotNetWatchTests.cs | 60 +++++++++++++++++++ .../ExecuteHelper.cs | 4 +- .../SdkContentTests.cs | 4 +- .../assets/baselines/MsftToSbSdk.diff | 32 ++++++---- src/redist/targets/BundledManifests.targets | 3 +- src/redist/targets/BundledTemplates.targets | 8 +-- 14 files changed, 139 insertions(+), 50 deletions(-) create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml index 18dbe8324..da87d93cf 100644 --- a/eng/source-build-tarball-build.yml +++ b/eng/source-build-tarball-build.yml @@ -4,7 +4,7 @@ resources: pipelines: - pipeline: installer-build-resource source: installer - trigger: true + trigger: none stages: - stage: build 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 e76a80dc3..1cec502ab 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 @@ -87,11 +87,11 @@ steps: set -x # Use installer repo's NuGet.config during online testing to utilize internal feeds - rm -f ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config - cp $(Build.SourcesDirectory)/NuGet.config ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config + rm -f ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + cp $(Build.SourcesDirectory)/NuGet.config ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config dockerVolumeArgs="-v ${{ parameters.tarballDir }}:/tarball" - dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=${{ parameters.excludeOmniSharpTests}}" + dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=${{ parameters.excludeOmniSharpTests}} -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" if [[ '${{ parameters.isBootstrapped }}' != 'true' && '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" @@ -99,7 +99,7 @@ steps: dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" fi - docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} + docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} -- /p:SmokeTestConsoleVerbosity=detailed 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/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj index e4ad12e49..6fc81bf3d 100644 --- a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj +++ b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj @@ -11,9 +11,7 @@ should be added to source-build-reference-packages. --> - - diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index fffc76ce7..c9310fa6c 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -93,9 +93,11 @@ %(SdkTarballItem.Identity) + normal - + ? additionalProcessConfigCallback = null, int expectedExitCode = 0, int millisecondTimeout = -1) { + Action configureProcess = (Process process, string? workingDirectory) => { + ConfigureProcess(process, workingDirectory); + + if (additionalProcessConfigCallback != null) + { + additionalProcessConfigCallback(process); + } + }; + (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( DotNetPath, args, OutputHelper, - configure: (process) => ConfigureProcess(process, workingDirectory)); - ExecuteHelper.ValidateExitCode(executeResult); + configure: (process) => configureProcess(process, workingDirectory), + millisecondTimeout: millisecondTimeout); + + ExecuteHelper.ValidateExitCode(executeResult, expectedExitCode); } public static void ConfigureProcess(Process process, string? workingDirectory, bool setPath = false) @@ -170,18 +181,14 @@ internal class DotNetHelper public void ExecuteRunWeb(string projectName) { - (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( - DotNetPath, + ExecuteCmd( $"run {GetBinLogOption(projectName, "run")}", - OutputHelper, - configure: configureProcess, + GetProjectDirectory(projectName), + additionalProcessConfigCallback: processConfigCallback, millisecondTimeout: 30000); - ExecuteHelper.ValidateExitCode(executeResult); - void configureProcess(Process process) + void processConfigCallback(Process process) { - ConfigureProcess(process, GetProjectDirectory(projectName)); - process.OutputDataReceived += new DataReceivedEventHandler((sender, e) => { if (e.Data?.Contains("Application started. Press Ctrl+C to shut down.") ?? false) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs new file mode 100644 index 000000000..183311037 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -0,0 +1,60 @@ +// 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.Diagnostics; +using System.IO; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +public class DotNetWatchTests : SmokeTests +{ + public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { } + + [Fact] + public void WatchTests() + { + string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests)); + bool outputChanged = false; + + // We expect an exit code of 143 (128 + 15, i.e. SIGTERM) because we are killing the process manually + DotNetHelper.ExecuteCmd( + "watch run", + workingDirectory: projectDirectory, + additionalProcessConfigCallback: processConfigCallback, + expectedExitCode: 143, + millisecondTimeout: 30000); + + Assert.True(outputChanged); + + void processConfigCallback(Process process) + { + const string waitingString = "Waiting for a file to change before restarting dotnet..."; + const string expectedString = "Hello from dotnet watch!"; + + bool fileChanged = false; + + process.OutputDataReceived += new DataReceivedEventHandler((sender, e) => + { + if (e.Data?.Contains(waitingString) ?? false) + { + if (!fileChanged) { + OutputHelper.WriteLine("Program started, changing file on disk to trigger restart..."); + File.WriteAllText( + Path.Combine(projectDirectory, "Program.cs"), + File.ReadAllText(Path.Combine(projectDirectory, "Program.cs")).Replace("Hello, World!", expectedString)); + fileChanged = true; + } + } + else if (e.Data?.Contains(expectedString) ?? false) + { + outputChanged = true; + OutputHelper.WriteLine("Successfully re-ran program after code change."); + ExecuteHelper.ExecuteProcessValidateExitCode("kill", $"-s TERM {process.Id}", 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 5c135b3fe..4a7b87750 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 @@ -84,9 +84,9 @@ internal static class ExecuteHelper return result.StdOut; } - public static void ValidateExitCode((Process Process, string StdOut, string StdErr) result) + public static void ValidateExitCode((Process Process, string StdOut, string StdErr) result, int expectedExitCode = 0) { - if (result.Process.ExitCode != 0) + if (result.Process.ExitCode != expectedExitCode) { ProcessStartInfo startInfo = result.Process.StartInfo; string msg = $"Failed to execute {startInfo.FileName} {startInfo.Arguments}" + 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 index e9f97c826..74657726c 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs @@ -22,7 +22,7 @@ public class SdkContentTests : SmokeTests /// This makes the baseline durable between releases. This does mean however, entries /// in the baseline may appear identical if the diff is version specific. /// - [SkippableFact(new[] { Config.MsftSdkTarballPathEnv, Config.MsftSdkTarballPathEnv }, skipOnNullOrWhiteSpace: true)] + [SkippableFact(new[] { Config.MsftSdkTarballPathEnv, Config.SdkTarballPathEnv }, skipOnNullOrWhiteSpace: true)] public void CompareMsftToSb() { const string msftFileListingFileName = "msftSdkFiles.txt"; @@ -34,7 +34,7 @@ public class SdkContentTests : SmokeTests diff = RemoveVersionedPaths(diff); diff = RemoveDiffMarkers(diff); diff = RemoveRids(diff); - BaselineHelper.CompareContents("MsftToSbSdk.diff", diff, OutputHelper); + BaselineHelper.CompareContents("MsftToSbSdk.diff", diff, OutputHelper, Config.WarnOnSdkContentDiffs); } private void WriteTarballFileList(string? tarballPath, string outputFileName) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index ec672a047..6418004c8 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -47,18 +47,18 @@ index ------------ +./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.Host.banana.rid/ ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/ ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/ ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/ ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/ ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/apphost ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/coreclr_delegates.h ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/hostfxr.h ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/libnethost.a ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/libnethost.so ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/nethost.h ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.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/ @@ -764,6 +764,14 @@ index ------------ ./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 diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 6e8361d80..3618623f1 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -58,7 +58,8 @@ - Count())' != '0'" + Command="$(SignCheckExe) ^ --recursive ^ -f UnsignedFiles ^ -i @(SignCheckWorkloadManifestMsiInputFiles, ' ') ^ diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index b1896eb09..30f47ce59 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -26,7 +26,7 @@ - + @@ -39,7 +39,7 @@ --> - + @@ -97,7 +97,7 @@ - + @@ -106,7 +106,7 @@ $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) - + From 75b3006c8a04fee749c28b273f3bf30ba0284def Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 09:16:59 -0700 Subject: [PATCH 325/462] [release/6.0.3xx] Update dependencies from dotnet/sdk (#13455) * Update dependencies from https://github.com/dotnet/sdk build 20220323.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.4 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.2.0-2.22171.5 -> To Version 4.2.0-2.22172.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220323.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220323.10 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220323.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220323.16 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.16 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220323.17 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.17 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220324.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22174.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk * Fix test for api change in sdk. * Update dependencies from https://github.com/dotnet/sdk build 20220324.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22174.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220324.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22174.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22173.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220325.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22175.2 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 From Version 6.0.300-preview.22171.2 -> To Version 6.0.300-preview.22174.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220325.7 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22175.7 * Update dependencies from https://github.com/dotnet/sdk build 20220325.9 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22175.7 -> To Version 6.0.300-preview.22175.9 * Update dependencies from https://github.com/dotnet/sdk build 20220325.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22175.9 -> To Version 6.0.300-preview.22175.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.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.300-preview.22171.2 -> To Version 6.0.300-preview.22174.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220328.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22178.3 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.300-preview.22171.2 -> To Version 6.0.300-preview.22174.5 (parent: Microsoft.NET.Sdk * Remove NuGet.Client source-build patches that were backported Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marc Paine Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 44 +-- eng/Versions.props | 8 +- ...ed-source-build-patches-and-re-patch.patch | 287 ------------------ .../0010-Re-enable-fullfx-TFM-in-NuGet.patch | 43 --- test/EndToEnd/ValidateInsertedManifests.cs | 2 +- 5 files changed, 27 insertions(+), 357 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0010-Re-enable-fullfx-TFM-in-NuGet.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d52e7c98..bd871c04e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - cb240f758a119d5a99d886c68b903fb1850a01c7 + 50565d62db55b5c74f1f1dd014375e30f7ff52e5 - + https://github.com/dotnet/templating - cb240f758a119d5a99d886c68b903fb1850a01c7 + 50565d62db55b5c74f1f1dd014375e30f7ff52e5 - + https://github.com/dotnet/templating - cb240f758a119d5a99d886c68b903fb1850a01c7 + 50565d62db55b5c74f1f1dd014375e30f7ff52e5 - + https://github.com/dotnet/sdk - 6bd29f91ee75ae6e235bef10796710ee546958b9 + 7dc1fe2fe407840bcef5f6eb4bb35484743f7e17 - + https://github.com/dotnet/sdk - 6bd29f91ee75ae6e235bef10796710ee546958b9 + 7dc1fe2fe407840bcef5f6eb4bb35484743f7e17 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - 39df6b9cd8f107a9d3b6a022ddea1bda86f7601c + c8bf29b9ccb528e38802dac1383260ba2bd2886d - + https://github.com/dotnet/fsharp - 39df6b9cd8f107a9d3b6a022ddea1bda86f7601c + c8bf29b9ccb528e38802dac1383260ba2bd2886d @@ -135,25 +135,25 @@ 75765f2afc7425f47efde1a59a8eb86cf81658f9 - + https://github.com/dotnet/linker - e9cfb5413a6a7a7b5bfc3b9a73671be2b18642cf + eab62f9046510f4dce671103470e0be9bc68b04b linker - + https://github.com/dotnet/roslyn - 9ca68121101710b36c12a3c165482ce16144d3e3 + f81a859bb414665faafaf9f48b15d76c30df06a0 - + https://github.com/dotnet/msbuild - a32366d8051ae27a3690476bb0f2b70adbe7470f + b88097615cc49fa050465aff72fd38ca2644117a - + https://github.com/nuget/nuget.client - 919c7e10ebdcc43235c36cf0b72c389d741835a8 + 8bda466765accefccf516850745ad30dceeab381 diff --git a/eng/Versions.props b/eng/Versions.props index 50e5a29d8..d00e86ef1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22171.2 + 6.0.300-preview.22174.5 @@ -56,8 +56,8 @@ - 6.0.300-preview.22172.2 - 6.0.300-preview.22172.2 + 6.0.300-preview.22178.3 + 6.0.300-preview.22178.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22171.2 + 6.0.300-preview.22174.5 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) 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 deleted file mode 100644 index 65f3fbca5..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch +++ /dev/null @@ -1,287 +0,0 @@ -From 157de59d479f2ed179b9b777eaf2b769871e3bf6 Mon Sep 17 00:00:00 2001 -From: Matt Mitchell -Date: Sat, 23 Oct 2021 16:41:24 -0700 -Subject: [PATCH] Remove uneeded source build patches and re-patch - ---- - build/common.project.props | 16 ++++++---------- - build/packages.targets | 3 ++- - .../NuGet.Build.Tasks.Pack.csproj | 4 ++-- - .../NuGet.CommandLine.XPlat.csproj | 2 +- - .../SignCommand/CertificateProvider.cs | 4 ++-- - src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 1 - - .../NuGet.Configuration.csproj | 3 +-- - .../NuGet.Frameworks/NuGet.Frameworks.csproj | 3 +-- - .../NuGet.PackageManagement.csproj | 2 +- - .../Signing/Authoring/SignPackageRequest.cs | 2 ++ - .../NuGet.Packaging/Signing/Cms/NativeUtility.cs | 2 ++ - .../HttpSource/HttpRequestMessageExtensions.cs | 6 +++--- - .../HttpSource/HttpRetryHandler.cs | 2 +- - .../HttpSourceAuthenticationHandler.cs | 2 +- - .../NuGet.Versioning/NuGet.Versioning.csproj | 1 - - 15 files changed, 25 insertions(+), 28 deletions(-) - -diff --git a/build/common.project.props b/build/common.project.props -index 79a935391..65e482b83 100644 ---- a/build/common.project.props -+++ b/build/common.project.props -@@ -10,24 +10,20 @@ - - - -- $(DotNetBuildFromSource) - PackageReference - v4.7.2 - net472 -- netcoreapp3.1 -- net6.0 -+ net6.0 - netcoreapp5.0 -- netstandard2.0 -- net6.0 -+ $(DotNetBuildFromSource) -+ netstandard2.0;net6.0 - $(NETFXTargetFramework);$(NETCoreTargetFramework) - $(NETCoreTargetFramework) -- $(TargetFrameworksExe);netcoreapp5.0 -- $(NETCoreTargetFramework);netcoreapp5.0 -- $(TargetFrameworksExe);net6.0 -+ $(TargetFrameworksExe);net6.0 -+ $(NETCoreTargetFramework);net6.0 - $(NETFXTargetFramework);$(NetStandardVersion) - $(NetStandardVersion) -- $(TargetFrameworksLibrary);netcoreapp5.0 -- $(TargetFrameworksLibrary);net6.0 -+ $(TargetFrameworksLibrary);net6.0 - $(NETFXTargetFramework);netcoreapp5.0 - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ - $(RepositoryRootDirectory)build\ -diff --git a/build/packages.targets b/build/packages.targets -index c11557248..0e7dd7861 100644 ---- a/build/packages.targets -+++ b/build/packages.targets -@@ -10,6 +10,7 @@ - 5.0.0 - 2.14.0-rtm-832 - 17.0.0-beta1-10402-05 -+ 5.0.1-rtm.21063.7 - - - -@@ -33,7 +34,7 @@ - - - -- -+ - - - -diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -index c94acffd8..f4d083e52 100644 ---- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -+++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -@@ -177,7 +177,7 @@ - - ilmerge\ - Desktop/ -- CoreCLR/ -+ CoreCLR/ - - - -diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj -index 21015c00a..e306cdee4 100644 ---- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj -+++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj -@@ -18,7 +18,7 @@ - - - -- -+ - - - -diff --git a/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs b/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs -index c6ea71243..beac41889 100644 ---- a/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs -+++ b/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs -@@ -115,7 +115,7 @@ public static async Task GetCertificatesAsync(Certif - - return resultCollection; - } -- -+#pragma warning disable CS1998 - private static async Task LoadCertificateFromFileAsync(CertificateSourceOptions options) - { - X509Certificate2 cert; -@@ -154,7 +154,7 @@ private static async Task LoadCertificateFromFileAsync(Certifi - - return cert; - } -- -+#pragma warning restore CS1998 - private static X509Certificate2Collection LoadCertificateFromStore(CertificateSourceOptions options) - { - X509Certificate2Collection resultCollection = null; -diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj -index e30a079eb..c2b8fe241 100644 ---- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj -+++ b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj -@@ -5,7 +5,6 @@ - - Common utilities and interfaces for all NuGet libraries. - $(TargetFrameworksLibrary) -- $(TargetFrameworks);net45 - - $(NoWarn);CS1591;CS1574 - true -diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -index bbc5ba480..18b597c74 100644 ---- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -+++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -@@ -6,7 +6,6 @@ - NuGet's configuration settings implementation. - $(NoWarn);CS1591 - $(TargetFrameworksLibrary) -- $(TargetFrameworks);net45 - - true - true -@@ -29,7 +28,7 @@ - - - -- -+ - - - -diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -index b78b1f2ea..a89b516c6 100644 ---- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -+++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -@@ -4,8 +4,7 @@ - - - NuGet's understanding of target frameworks. -- $(TargetFrameworksLibrary);netstandard2.0 -- $(TargetFrameworksLibrary);net40 -+ $(TargetFrameworksLibrary);netstandard2.0 - - $(NoWarn);CS1591;CS1574;CS1573 - true -diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -index dfbfcaa8d..a6bb51d6b 100644 ---- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -+++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -@@ -35,7 +35,7 @@ - - - -- -+ - - - -diff --git a/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs b/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs -index e0cfae99f..ce19f2d6e 100644 ---- a/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs -+++ b/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs -@@ -98,7 +98,9 @@ protected virtual void Dispose(bool disposing) - Chain?.Dispose(); - - #if IS_SIGNING_SUPPORTED -+#pragma warning disable CA1416 - PrivateKey?.Dispose(); -+#pragma warning restore CA1416 - #endif - } - -diff --git a/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs b/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs -index 565ac60b7..d57e38a65 100644 ---- a/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs -+++ b/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs -@@ -120,7 +120,9 @@ internal static SignedCms NativeSign(CmsSigner cmsSigner, byte[] data, CngKey pr - - signerInfo.cbSize = (uint)Marshal.SizeOf(signerInfo); - signerInfo.pCertInfo = MarshalUtility.PtrToStructure(cmsSigner.Certificate.Handle).pCertInfo; -+#pragma warning disable CA1416 - signerInfo.hCryptProvOrhNCryptKey = privateKey.Handle.DangerousGetHandle(); -+#pragma warning restore CA1416 - signerInfo.HashAlgorithm.pszObjId = cmsSigner.DigestAlgorithm.Value; - - if (cmsSigner.SignerIdentifierType == SubjectIdentifierType.SubjectKeyIdentifier) -diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs -index 7c9595268..1ca751850 100644 ---- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs -+++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs -@@ -34,7 +34,7 @@ internal static HttpRequestMessage Clone(this HttpRequestMessage request) - clone.Headers.TryAddWithoutValidation(header.Key, header.Value); - } - --#if NET5_0 -+#if NET5_0 || NET6_0 - var clonedOptions = (IDictionary)clone.Options; - foreach (var option in request.Options) - { -@@ -118,7 +118,7 @@ public static void SetConfiguration(this HttpRequestMessage request, HttpRequest - throw new ArgumentNullException(nameof(configuration)); - } - --#if NET5_0 -+#if NET5_0 || NET6_0 - request.Options.Set(new HttpRequestOptionsKey(NuGetConfigurationKey), configuration); - #else - request.Properties[NuGetConfigurationKey] = configuration; -@@ -128,7 +128,7 @@ public static void SetConfiguration(this HttpRequestMessage request, HttpRequest - private static T GetProperty(this HttpRequestMessage request, string key) - { - --#if NET5_0 -+#if NET5_0 || NET6_0 - if (request.Options.TryGetValue(new HttpRequestOptionsKey(key), out T result)) - #else - object result; -diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs -index c7bcb54bb..30d86fcc9 100644 ---- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs -+++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs -@@ -113,7 +113,7 @@ internal HttpRetryHandler(IEnvironmentVariableReader environmentVariableReader) - headerStopwatch = new Stopwatch(); - stopwatches.Add(headerStopwatch); - } --#if NET5_0 -+#if NET5_0 || NET6_0 - requestMessage.Options.Set(new HttpRequestOptionsKey>(StopwatchPropertyName), stopwatches); - #else - requestMessage.Properties[StopwatchPropertyName] = stopwatches; -diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs -index b9ab58ce7..ebf738e52 100644 ---- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs -+++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs -@@ -98,7 +98,7 @@ protected override async Task SendAsync(HttpRequestMessage - { - List stopwatches = null; - --#if NET5_0 -+#if NET5_0 || NET6_0 - if (request.Options.TryGetValue( - new HttpRequestOptionsKey>(HttpRetryHandler.StopwatchPropertyName), - out stopwatches)) -diff --git a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj -index 180293944..8498664b9 100644 ---- a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj -+++ b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj -@@ -4,7 +4,6 @@ - - - $(TargetFrameworksLibrary) -- $(TargetFrameworks);net45 - - NuGet's implementation of Semantic Versioning. - semver;semantic versioning --- -2.31.1 - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0010-Re-enable-fullfx-TFM-in-NuGet.patch b/src/SourceBuild/tarball/patches/nuget-client/0010-Re-enable-fullfx-TFM-in-NuGet.patch deleted file mode 100644 index b71f75cb9..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0010-Re-enable-fullfx-TFM-in-NuGet.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7f35d623761748721496abcbae2d6f11d4cf1ca8 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Fri, 22 Oct 2021 21:12:51 -0500 -Subject: [PATCH] Re-enable fullfx TFM in NuGet. - ---- - build/common.project.props | 3 +-- - .../NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/build/common.project.props b/build/common.project.props -index 000702f58..b29968eaf 100644 ---- a/build/common.project.props -+++ b/build/common.project.props -@@ -18,11 +18,10 @@ - $(DotNetBuildFromSource) - netstandard2.0;net6.0 - $(NETFXTargetFramework);$(NETCoreTargetFramework) -- $(NETCoreTargetFramework) -+ $(NETCoreTargetFramework) - $(TargetFrameworksExe);net6.0 - $(NETCoreTargetFramework);net6.0 - $(NETFXTargetFramework);$(NetStandardVersion) -- $(NetStandardVersion) - $(TargetFrameworksLibrary);net6.0 - $(NETFXTargetFramework);netcoreapp5.0 - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ -diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -index f4d083e52..c4eb79b4c 100644 ---- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -+++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -@@ -176,7 +176,7 @@ - - - ilmerge\ -- Desktop/ -+ Desktop/ - CoreCLR/ - - --- -2.31.1 - diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs index 1d9ec8a94..5d9b44df0 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -34,7 +34,7 @@ namespace EndToEnd.Tests File.Exists(manifestFile).Should().BeTrue(); using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read); - Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream); + Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile); readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid"); } From 717986129d223c914975b094ab87bfb81ef17f26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Mar 2022 17:26:05 +0000 Subject: [PATCH 326/462] Update dependencies from https://github.com/dotnet/sdk build 20220328.7 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22178.3 -> To Version 6.0.300-preview.22178.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.3-beta.22175.4 -> To Version 12.0.3-beta.22176.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 bd871c04e..c63679f7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 50565d62db55b5c74f1f1dd014375e30f7ff52e5 - + https://github.com/dotnet/sdk - 7dc1fe2fe407840bcef5f6eb4bb35484743f7e17 + 07ec58e1db9eafa13ee8eb02e1007312e7ae533f - + https://github.com/dotnet/sdk - 7dc1fe2fe407840bcef5f6eb4bb35484743f7e17 + 07ec58e1db9eafa13ee8eb02e1007312e7ae533f @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - c8bf29b9ccb528e38802dac1383260ba2bd2886d + 17f2bc5e7a620204148150a536cb37a68ce03f1e - + https://github.com/dotnet/fsharp - c8bf29b9ccb528e38802dac1383260ba2bd2886d + 17f2bc5e7a620204148150a536cb37a68ce03f1e diff --git a/eng/Versions.props b/eng/Versions.props index d00e86ef1..f72e9f46e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22178.3 - 6.0.300-preview.22178.3 + 6.0.300-preview.22178.7 + 6.0.300-preview.22178.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f5fdfe82e635a51267c629c0bc973bba2f70b420 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 19:16:00 +0000 Subject: [PATCH 327/462] Update dependencies from https://github.com/dotnet/sdk build 20220328.8 (#13477) [release/6.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.2.0-preview-22172-04 to 17.2.0-preview-22175-02 (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 c63679f7a..7b928d799 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 50565d62db55b5c74f1f1dd014375e30f7ff52e5 - + https://github.com/dotnet/sdk - 07ec58e1db9eafa13ee8eb02e1007312e7ae533f + 24e38f35e21aa86e33211bccef2d60673d62ce66 - + https://github.com/dotnet/sdk - 07ec58e1db9eafa13ee8eb02e1007312e7ae533f + 24e38f35e21aa86e33211bccef2d60673d62ce66 @@ -146,9 +146,9 @@ f81a859bb414665faafaf9f48b15d76c30df06a0 - + https://github.com/dotnet/msbuild - b88097615cc49fa050465aff72fd38ca2644117a + 058a0262c6b37fba7bb55ec03315232d5d83be6e diff --git a/eng/Versions.props b/eng/Versions.props index f72e9f46e..30056fc82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22178.7 - 6.0.300-preview.22178.7 + 6.0.300-preview.22178.8 + 6.0.300-preview.22178.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e8a1742faf95cd3048445ed24fe269bccda37e71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 22:53:58 +0000 Subject: [PATCH 328/462] Update dependencies from https://github.com/dotnet/sdk build 20220328.11 (#13479) [release/6.0.3xx] 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 7b928d799..8473875a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 50565d62db55b5c74f1f1dd014375e30f7ff52e5 - + https://github.com/dotnet/sdk - 24e38f35e21aa86e33211bccef2d60673d62ce66 + 84b9882ed6bf24c128e2919baa06ffc28a6b638d - + https://github.com/dotnet/sdk - 24e38f35e21aa86e33211bccef2d60673d62ce66 + 84b9882ed6bf24c128e2919baa06ffc28a6b638d diff --git a/eng/Versions.props b/eng/Versions.props index 30056fc82..e8531dbff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22178.8 - 6.0.300-preview.22178.8 + 6.0.300-preview.22178.11 + 6.0.300-preview.22178.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5eaa033de552d8a06d5e2c07273b7749d419796c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Mar 2022 23:11:10 +0000 Subject: [PATCH 329/462] Update dependencies from https://github.com/dotnet/sdk build 20220328.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22178.11 -> To Version 6.0.300-preview.22178.12 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.300-preview.22174.5 -> To Version 6.0.300-preview.22178.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8473875a8..0fac4c52d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 50565d62db55b5c74f1f1dd014375e30f7ff52e5 + e9956e12143288613ffd82b759e4bd615e94f3bc - + https://github.com/dotnet/templating - 50565d62db55b5c74f1f1dd014375e30f7ff52e5 + e9956e12143288613ffd82b759e4bd615e94f3bc - + https://github.com/dotnet/templating - 50565d62db55b5c74f1f1dd014375e30f7ff52e5 + e9956e12143288613ffd82b759e4bd615e94f3bc - + https://github.com/dotnet/sdk - 84b9882ed6bf24c128e2919baa06ffc28a6b638d + 8b054513807e6e62dc0c6135cd93ec6813adb72e - + https://github.com/dotnet/sdk - 84b9882ed6bf24c128e2919baa06ffc28a6b638d + 8b054513807e6e62dc0c6135cd93ec6813adb72e diff --git a/eng/Versions.props b/eng/Versions.props index e8531dbff..dfaae54ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22174.5 + 6.0.300-preview.22178.2 @@ -56,8 +56,8 @@ - 6.0.300-preview.22178.11 - 6.0.300-preview.22178.11 + 6.0.300-preview.22178.12 + 6.0.300-preview.22178.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22174.5 + 6.0.300-preview.22178.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 00f8bcd9ceced8b8be0a22a09820c027f9343a1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Mar 2022 06:55:39 +0000 Subject: [PATCH 330/462] Update dependencies from https://github.com/dotnet/sdk build 20220328.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22178.12 -> To Version 6.0.300-preview.22178.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 12.0.3-beta.22176.1 -> To Version 12.0.3-beta.22178.3 (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 0fac4c52d..b3d280ca9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating e9956e12143288613ffd82b759e4bd615e94f3bc - + https://github.com/dotnet/sdk - 8b054513807e6e62dc0c6135cd93ec6813adb72e + 8fd04f4a194748c54ea7e0f6e39a12f8b0d02cb4 - + https://github.com/dotnet/sdk - 8b054513807e6e62dc0c6135cd93ec6813adb72e + 8fd04f4a194748c54ea7e0f6e39a12f8b0d02cb4 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - 17f2bc5e7a620204148150a536cb37a68ce03f1e + 6da0245a7ce4bb8483b8d1f2993c8ecaea967ad9 - + https://github.com/dotnet/fsharp - 17f2bc5e7a620204148150a536cb37a68ce03f1e + 6da0245a7ce4bb8483b8d1f2993c8ecaea967ad9 @@ -135,9 +135,9 @@ 75765f2afc7425f47efde1a59a8eb86cf81658f9 - + https://github.com/dotnet/linker - eab62f9046510f4dce671103470e0be9bc68b04b + 01c4f5905959c29f86781b85187bb676fc517ee9 linker @@ -146,9 +146,9 @@ f81a859bb414665faafaf9f48b15d76c30df06a0 - + https://github.com/dotnet/msbuild - 058a0262c6b37fba7bb55ec03315232d5d83be6e + 1160f4e0e21969ec6db1529439a9e029ea256b2b diff --git a/eng/Versions.props b/eng/Versions.props index dfaae54ac..8ab302437 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22178.12 - 6.0.300-preview.22178.12 + 6.0.300-preview.22178.13 + 6.0.300-preview.22178.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 50f7e4f570c61b00dd2d5fd8912a74852cb1e42c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 08:21:22 -0700 Subject: [PATCH 331/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220329.1 (#13488) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22161.1 -> To Version 6.0.0-servicing.22179.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 9930299ff..905170bbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -215,9 +215,9 @@ https://github.com/dotnet/arcade 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/source-build-reference-packages - a4550df3cb245c4dfd9601c67f86a27a88aad962 + dfdfa4ee297fe8daa90cd623c5b612abf3f60873 From 197e06982e566f26ad1b150d66b725c57df99ff5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 29 Mar 2022 10:22:40 -0700 Subject: [PATCH 332/462] Update implicit version for March release --- 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 1cf223da9..1bbe3f77b 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,8 +26,8 @@ 30 - $([MSBuild]::Add($(VersionFeature), 22)) - $([MSBuild]::Add($(VersionFeature), 14)) + $([MSBuild]::Add($(VersionFeature), 23)) + $([MSBuild]::Add($(VersionFeature), 15)) From d1a04c77336d9ab659a8f57cf5a97d3a712e7ae1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 19:56:54 +0000 Subject: [PATCH 333/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220329.1 (#13487) [release/6.0.3xx] 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 b3d280ca9..267a51ed3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/source-build-reference-packages - a4550df3cb245c4dfd9601c67f86a27a88aad962 + dfdfa4ee297fe8daa90cd623c5b612abf3f60873 From b68528f6e4638d6512e70d2d9dd11462daf68f23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Mar 2022 21:21:04 +0000 Subject: [PATCH 334/462] Update dependencies from https://github.com/dotnet/sdk build 20220329.7 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22178.13 -> To Version 6.0.300-preview.22179.7 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.300-preview.22178.2 -> To Version 6.0.300-preview.22179.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 267a51ed3..e08e70d88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - e9956e12143288613ffd82b759e4bd615e94f3bc + a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/templating - e9956e12143288613ffd82b759e4bd615e94f3bc + a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/templating - e9956e12143288613ffd82b759e4bd615e94f3bc + a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/sdk - 8fd04f4a194748c54ea7e0f6e39a12f8b0d02cb4 + a794c8e3eed9c28e6bf076837c0647353d0e3088 - + https://github.com/dotnet/sdk - 8fd04f4a194748c54ea7e0f6e39a12f8b0d02cb4 + a794c8e3eed9c28e6bf076837c0647353d0e3088 diff --git a/eng/Versions.props b/eng/Versions.props index 8ab302437..34ab4da3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22178.2 + 6.0.300-preview.22179.3 @@ -56,8 +56,8 @@ - 6.0.300-preview.22178.13 - 6.0.300-preview.22178.13 + 6.0.300-preview.22179.7 + 6.0.300-preview.22179.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22178.2 + 6.0.300-preview.22179.3 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From ed92a34e14cdea16556f3c55886ede2611593647 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Mar 2022 22:22:57 +0000 Subject: [PATCH 335/462] Update dependencies from https://github.com/dotnet/sdk build 20220329.9 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22178.13 -> To Version 6.0.300-preview.22179.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.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.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 From Version 6.0.2 -> To Version 6.0.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++----------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e08e70d88..66ccd23ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://github.com/dotnet/templating a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/sdk - a794c8e3eed9c28e6bf076837c0647353d0e3088 + 395ee52bf2672f1f30eff393fb9823b249d1be31 - + https://github.com/dotnet/sdk - a794c8e3eed9c28e6bf076837c0647353d0e3088 + 395ee52bf2672f1f30eff393fb9823b249d1be31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5ad241b9633924db40503de19cb502bb0aca7718 + 1f426c90a9589dabc16d114aa91bfea9f21f8571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fb76229895cae74c1adc62c2411a0730a2f3759b + 560f243910f407df33fd5cdf06e2a857684f4bc7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 34ab4da3a..711a619ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.2-servicing.22064.7 + 6.0.3-servicing.22123.7 - 6.0.2-servicing.22064.8 + 6.0.3-servicing.22124.2 @@ -44,44 +44,44 @@ - 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 + 6.0.3 + 6.0.3 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 0.2.0 - 6.0.300-preview.22179.7 - 6.0.300-preview.22179.7 + 6.0.300-preview.22179.9 + 6.0.300-preview.22179.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.1 + 6.0.2 - 6.0.2-servicing.22064.6 - 6.0.2-servicing.22064.6 - 6.0.2 - 6.0.2 - 6.0.2 - 6.0.2 + 6.0.3-servicing.22123.9 + 6.0.3-servicing.22123.9 + 6.0.3 + 6.0.3 + 6.0.3 + 6.0.3 2.1.0 - 6.0.2-servicing.22064.6 - 6.0.2-servicing.22064.6 - 6.0.2 - 6.0.2 + 6.0.3-servicing.22124.3 + 6.0.3-servicing.22124.3 + 6.0.3 + 6.0.3 From be1de896246c96a53474e69ae7f11b02943f1995 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Mar 2022 01:06:28 +0000 Subject: [PATCH 336/462] Update dependencies from https://github.com/dotnet/sdk build 20220329.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22178.13 -> To Version 6.0.300-preview.22179.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.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.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 From Version 6.0.2 -> To Version 6.0.3 (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 66ccd23ee..f780e5e7c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/sdk - 395ee52bf2672f1f30eff393fb9823b249d1be31 + 83fa3101fc591e536182a3d7e11afb2af4451053 - + https://github.com/dotnet/sdk - 395ee52bf2672f1f30eff393fb9823b249d1be31 + 83fa3101fc591e536182a3d7e11afb2af4451053 diff --git a/eng/Versions.props b/eng/Versions.props index 711a619ba..24219dd38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22179.9 - 6.0.300-preview.22179.9 + 6.0.300-preview.22179.12 + 6.0.300-preview.22179.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3552c0c745ccb599966cb939f827259c7cce412c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Mar 2022 03:05:53 +0000 Subject: [PATCH 337/462] Update dependencies from https://github.com/dotnet/sdk build 20220329.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22179.12 -> To Version 6.0.300-preview.22179.13 Dependency coherency updates NuGet.Build.Tasks From Version 6.2.0-preview.2.123 -> To Version 6.2.0-preview.3.131 (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 f780e5e7c..1882e1c32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/sdk - 83fa3101fc591e536182a3d7e11afb2af4451053 + 1bdcbe784bba3c3a2b5782e2895648cccd51057c - + https://github.com/dotnet/sdk - 83fa3101fc591e536182a3d7e11afb2af4451053 + 1bdcbe784bba3c3a2b5782e2895648cccd51057c @@ -151,9 +151,9 @@ 1160f4e0e21969ec6db1529439a9e029ea256b2b - + https://github.com/nuget/nuget.client - 8bda466765accefccf516850745ad30dceeab381 + bc4b41f3ca294ccc8aedc8af5159c215943e1ed2 diff --git a/eng/Versions.props b/eng/Versions.props index 24219dd38..e4a91c645 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22179.12 - 6.0.300-preview.22179.12 + 6.0.300-preview.22179.13 + 6.0.300-preview.22179.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dfc566c7d5b9fe3db00726f5446edefaa95fc4fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Mar 2022 05:32:24 +0000 Subject: [PATCH 338/462] Update dependencies from https://github.com/dotnet/sdk build 20220329.17 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22179.12 -> To Version 6.0.300-preview.22179.17 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 4.2.0-2.22172.6 -> To Version 4.2.0-3.22179.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 1882e1c32..92dbc7294 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/sdk - 1bdcbe784bba3c3a2b5782e2895648cccd51057c + 499994760294854e9c5e479e9ccddcd6342fcbc1 - + https://github.com/dotnet/sdk - 1bdcbe784bba3c3a2b5782e2895648cccd51057c + 499994760294854e9c5e479e9ccddcd6342fcbc1 @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - f81a859bb414665faafaf9f48b15d76c30df06a0 + 8525a1e194a1624dd4f3cb58c4e516745fb4cd63 - + https://github.com/dotnet/msbuild - 1160f4e0e21969ec6db1529439a9e029ea256b2b + ce7523296d7ddb70fb61a68e84bc2ff38e012e35 diff --git a/eng/Versions.props b/eng/Versions.props index e4a91c645..df871dfda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22179.13 - 6.0.300-preview.22179.13 + 6.0.300-preview.22179.17 + 6.0.300-preview.22179.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 14f2cf31bd480bcbf023015dcad26642992235c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Mar 2022 19:15:24 +0000 Subject: [PATCH 339/462] Update dependencies from https://github.com/dotnet/sdk build 20220330.6 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22179.12 -> To Version 6.0.300-preview.22180.6 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 4.2.0-2.22172.6 -> To Version 4.2.0-3.22179.8 (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 92dbc7294..1e310aa3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/sdk - 499994760294854e9c5e479e9ccddcd6342fcbc1 + 8d98fcc1b94921ff366ae9c91b0ecefb3308c35b - + https://github.com/dotnet/sdk - 499994760294854e9c5e479e9ccddcd6342fcbc1 + 8d98fcc1b94921ff366ae9c91b0ecefb3308c35b diff --git a/eng/Versions.props b/eng/Versions.props index df871dfda..07d446f53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22179.17 - 6.0.300-preview.22179.17 + 6.0.300-preview.22180.6 + 6.0.300-preview.22180.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From abff1f8b19adce3b6dff1b55a90c4c3a1ca61e8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Mar 2022 00:19:52 +0000 Subject: [PATCH 340/462] Update dependencies from https://github.com/dotnet/sdk build 20220330.9 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22179.12 -> To Version 6.0.300-preview.22180.9 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.300-preview.22179.3 -> To Version 6.0.300-preview.22180.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e310aa3e..5f9605f5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - a3441bf58ca476d7415197bcf86349d254abe120 + b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/templating - a3441bf58ca476d7415197bcf86349d254abe120 + b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/templating - a3441bf58ca476d7415197bcf86349d254abe120 + b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/sdk - 8d98fcc1b94921ff366ae9c91b0ecefb3308c35b + eb5e7c9a4e3be4190ae62c0b390e529514e17415 - + https://github.com/dotnet/sdk - 8d98fcc1b94921ff366ae9c91b0ecefb3308c35b + eb5e7c9a4e3be4190ae62c0b390e529514e17415 diff --git a/eng/Versions.props b/eng/Versions.props index 07d446f53..6d0f78ba9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22179.3 + 6.0.300-preview.22180.3 @@ -56,8 +56,8 @@ - 6.0.300-preview.22180.6 - 6.0.300-preview.22180.6 + 6.0.300-preview.22180.9 + 6.0.300-preview.22180.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22179.3 + 6.0.300-preview.22180.3 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 5ad51d6f86b1f6f9b246d91c62c47af34cdad975 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Thu, 31 Mar 2022 00:35:58 +0000 Subject: [PATCH 341/462] Remove source-build patches that were backported --- ...tem.Threading.Tasks.DataFlow-version.patch | 28 ------------- ...03-remove-Microsoft.DotNet-prebuilts.patch | 25 ----------- ...st-build-of-csi-vbi-for-source-build.patch | 41 ------------------- 3 files changed, 94 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch b/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch deleted file mode 100644 index f48a864fe..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 23 Nov 2021 16:13:36 +0000 -Subject: [PATCH] Update System.Threading.Tasks.DataFlow version - -Addresses: -NuGet.Build.Tasks.csproj : error NU1605: Detected package downgrade: System.Threading.Tasks.Dataflow from 6.0.0 to 4.9.0. Reference the package directly from the project to select a different version. [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets] -NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> Microsoft.Build.Tasks.Core 17.1.0-preview-21572-15 -> System.Threading.Tasks.Dataflow (>= 6.0.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets] -NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> System.Threading.Tasks.Dataflow (>= 4.9.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets] - -Backport issue: https://github.com/dotnet/source-build/issues/2311 ---- - build/packages.targets | 2 +- - 1 file changed, 1 insertions(+), 1 deletions(-) - -diff --git a/build/packages.targets b/build/packages.targets -index a0aa4cc..ef5a1cc 100644 ---- a/build/packages.targets -+++ b/build/packages.targets -@@ -58,7 +59,7 @@ - - - -- -+ - - - diff --git a/src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch b/src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch deleted file mode 100644 index 28d60fc27..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7260c572b1ce424f7ff3a64aa3227417c6a7a676 Mon Sep 17 00:00:00 2001 -From: Logan Bussell <36081148+lbussell@users.noreply.github.com> -Date: Fri, 8 Oct 2021 00:56:41 +0000 -Subject: [PATCH] remove Microsoft.DotNet prebuilts - -Pull request for applying this patch: https://github.com/dotnet/roslyn/pull/57159 ---- - eng/Tools.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Tools.props b/eng/Tools.props -index 1579b510558..944448855ee 100644 ---- a/eng/Tools.props -+++ b/eng/Tools.props -@@ -1,6 +1,6 @@ - - -- -+ - @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 560f243910f407df33fd5cdf06e2a857684f4bc7 - + https://github.com/dotnet/fsharp - 6da0245a7ce4bb8483b8d1f2993c8ecaea967ad9 + 429f69989460da0182a5d4ba40ee2036856d8921 - + https://github.com/dotnet/fsharp - 6da0245a7ce4bb8483b8d1f2993c8ecaea967ad9 + 429f69989460da0182a5d4ba40ee2036856d8921 diff --git a/eng/Versions.props b/eng/Versions.props index 6d0f78ba9..8dec04b5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22180.9 - 6.0.300-preview.22180.9 + 6.0.300-preview.22180.11 + 6.0.300-preview.22180.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26e840968cf5b05e0ef8b1d7e246134cb7cec2c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Mar 2022 07:24:21 +0000 Subject: [PATCH 343/462] Update dependencies from https://github.com/dotnet/sdk build 20220330.16 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22180.11 -> To Version 6.0.300-preview.22180.16 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.2.0-3.22179.8 -> To Version 4.2.0-3.22180.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 7d4300d15..faccbc7a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/sdk - 7fe555728a1155edccd4fdf11c09b56234050834 + dfa35eac27123ef399db82ddbb8ef4d328c2c4e6 - + https://github.com/dotnet/sdk - 7fe555728a1155edccd4fdf11c09b56234050834 + dfa35eac27123ef399db82ddbb8ef4d328c2c4e6 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 8525a1e194a1624dd4f3cb58c4e516745fb4cd63 + 35147593da2bc070e3387ac911ea5a94a25e728a diff --git a/eng/Versions.props b/eng/Versions.props index 8dec04b5d..6b7ace69c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22180.11 - 6.0.300-preview.22180.11 + 6.0.300-preview.22180.16 + 6.0.300-preview.22180.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e2d9f8ffe043235cb4af48ab4e695aee36f8b2e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Mar 2022 08:32:40 +0000 Subject: [PATCH 344/462] Update dependencies from https://github.com/dotnet/sdk build 20220331.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22180.16 -> To Version 6.0.300-preview.22181.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.3-beta.22180.1 -> To Version 12.0.3-beta.22180.5 (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 faccbc7a3..79c64c2f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/sdk - dfa35eac27123ef399db82ddbb8ef4d328c2c4e6 + cfa916bd13d864a4a34a1f1cf9fad011184ebbc1 - + https://github.com/dotnet/sdk - dfa35eac27123ef399db82ddbb8ef4d328c2c4e6 + cfa916bd13d864a4a34a1f1cf9fad011184ebbc1 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 560f243910f407df33fd5cdf06e2a857684f4bc7 - + https://github.com/dotnet/fsharp - 429f69989460da0182a5d4ba40ee2036856d8921 + be6a759c8ccba73450b30b9dfd87a02de0118de9 - + https://github.com/dotnet/fsharp - 429f69989460da0182a5d4ba40ee2036856d8921 + be6a759c8ccba73450b30b9dfd87a02de0118de9 diff --git a/eng/Versions.props b/eng/Versions.props index 6b7ace69c..1e42a9cee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22180.16 - 6.0.300-preview.22180.16 + 6.0.300-preview.22181.1 + 6.0.300-preview.22181.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 587fffbb44a201c7f6a20204e7e232f34c256cd0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Mar 2022 17:59:59 +0000 Subject: [PATCH 345/462] Update dependencies from https://github.com/dotnet/sdk build 20220331.9 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22181.1 -> To Version 6.0.300-preview.22181.9 --- 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 79c64c2f6..d1407be7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/sdk - cfa916bd13d864a4a34a1f1cf9fad011184ebbc1 + fa4348445cda3385b4622660e22f9cbf79f1101a - + https://github.com/dotnet/sdk - cfa916bd13d864a4a34a1f1cf9fad011184ebbc1 + fa4348445cda3385b4622660e22f9cbf79f1101a diff --git a/eng/Versions.props b/eng/Versions.props index 1e42a9cee..ea47b30dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22181.1 - 6.0.300-preview.22181.1 + 6.0.300-preview.22181.9 + 6.0.300-preview.22181.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9571022bdd9eefc1e4c86d01bfc57ca6446f26be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Mar 2022 19:13:12 +0000 Subject: [PATCH 346/462] Update dependencies from https://github.com/dotnet/sdk build 20220331.10 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22181.1 -> To Version 6.0.300-preview.22181.10 --- 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 d1407be7f..99ac4b1a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/sdk - fa4348445cda3385b4622660e22f9cbf79f1101a + 502b7739ac53d91ff036499ca6d01412aa04f8b5 - + https://github.com/dotnet/sdk - fa4348445cda3385b4622660e22f9cbf79f1101a + 502b7739ac53d91ff036499ca6d01412aa04f8b5 diff --git a/eng/Versions.props b/eng/Versions.props index ea47b30dd..aa4ffca08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22181.9 - 6.0.300-preview.22181.9 + 6.0.300-preview.22181.10 + 6.0.300-preview.22181.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6221a4e760a5ee4e2ac09ea89f6dd57dceaad270 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Mar 2022 21:31:53 +0000 Subject: [PATCH 347/462] Update dependencies from https://github.com/dotnet/sdk build 20220331.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22181.10 -> To Version 6.0.300-preview.22181.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 99ac4b1a3..0061730bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/sdk - 502b7739ac53d91ff036499ca6d01412aa04f8b5 + 6f1b22247968f14de64307bf658337ee3429c278 - + https://github.com/dotnet/sdk - 502b7739ac53d91ff036499ca6d01412aa04f8b5 + 6f1b22247968f14de64307bf658337ee3429c278 diff --git a/eng/Versions.props b/eng/Versions.props index aa4ffca08..f312a1075 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22181.10 - 6.0.300-preview.22181.10 + 6.0.300-preview.22181.11 + 6.0.300-preview.22181.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bbbdd190c3f2f84517bad309634f3c91e20f1407 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 31 Mar 2022 22:53:54 -0700 Subject: [PATCH 348/462] Revert the version.details.xml file --- 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 a241e63d7..dfb68c294 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/source-build-reference-packages - dfdfa4ee297fe8daa90cd623c5b612abf3f60873 + a4550df3cb245c4dfd9601c67f86a27a88aad962 From 87a9d03d8b909043329583e9930359d2abc1a21c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Apr 2022 05:55:53 +0000 Subject: [PATCH 349/462] Update dependencies from https://github.com/dotnet/sdk build 20220331.16 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22181.11 -> To Version 6.0.300-preview.22181.16 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.0.3-beta.22180.5 -> To Version 12.0.3-beta.22181.2 (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 0061730bb..e7660f12a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/sdk - 6f1b22247968f14de64307bf658337ee3429c278 + f41b846622272a679da7c246de414f67ce3e91a0 - + https://github.com/dotnet/sdk - 6f1b22247968f14de64307bf658337ee3429c278 + f41b846622272a679da7c246de414f67ce3e91a0 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 560f243910f407df33fd5cdf06e2a857684f4bc7 - + https://github.com/dotnet/fsharp - be6a759c8ccba73450b30b9dfd87a02de0118de9 + 31803ec27047f57c3fd06f3becddf2d369424d62 - + https://github.com/dotnet/fsharp - be6a759c8ccba73450b30b9dfd87a02de0118de9 + 31803ec27047f57c3fd06f3becddf2d369424d62 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 35147593da2bc070e3387ac911ea5a94a25e728a + a59a22c6f3c2cc1883e20cece412209f18f4a29f diff --git a/eng/Versions.props b/eng/Versions.props index f312a1075..75d93025b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22181.11 - 6.0.300-preview.22181.11 + 6.0.300-preview.22181.16 + 6.0.300-preview.22181.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ea6e3dd4d3f14a10477424aa8db16c3978500e5d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 09:24:01 -0700 Subject: [PATCH 350/462] Update dependencies from https://github.com/dotnet/sdk build 20220331.18 (#13519) Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22181.16 -> To Version 6.0.300-preview.22181.18 Co-authored-by: dotnet-maestro[bot] --- 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 e7660f12a..ace3e0bb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/sdk - f41b846622272a679da7c246de414f67ce3e91a0 + b5be3701cead90f8d00afa5dbde0e55e1d908ee1 - + https://github.com/dotnet/sdk - f41b846622272a679da7c246de414f67ce3e91a0 + b5be3701cead90f8d00afa5dbde0e55e1d908ee1 diff --git a/eng/Versions.props b/eng/Versions.props index 75d93025b..33db32f4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22181.16 - 6.0.300-preview.22181.16 + 6.0.300-preview.22181.18 + 6.0.300-preview.22181.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 77153bb6e2c75e55cad41fe248af757b498a25e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Apr 2022 18:08:49 +0000 Subject: [PATCH 351/462] Update dependencies from https://github.com/dotnet/sdk build 20220401.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22181.18 -> To Version 6.0.300-preview.22201.4 --- 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 ace3e0bb4..1c052db2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/sdk - b5be3701cead90f8d00afa5dbde0e55e1d908ee1 + b546656d52d6221f78e51172f4feac68c46c51b7 - + https://github.com/dotnet/sdk - b5be3701cead90f8d00afa5dbde0e55e1d908ee1 + b546656d52d6221f78e51172f4feac68c46c51b7 diff --git a/eng/Versions.props b/eng/Versions.props index 33db32f4d..32d7c17e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22181.18 - 6.0.300-preview.22181.18 + 6.0.300-preview.22201.4 + 6.0.300-preview.22201.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5599709ad41d711f5a094a901ac10bc6e686c044 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 21:12:36 +0000 Subject: [PATCH 352/462] Update dependencies from https://github.com/dotnet/sdk build 20220401.6 (#13525) [release/6.0.3xx] 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 1c052db2b..9af00e2f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/sdk - b546656d52d6221f78e51172f4feac68c46c51b7 + 9dc5b2e62e113d121235d80e9cfd8336d2eb335a - + https://github.com/dotnet/sdk - b546656d52d6221f78e51172f4feac68c46c51b7 + 9dc5b2e62e113d121235d80e9cfd8336d2eb335a diff --git a/eng/Versions.props b/eng/Versions.props index 32d7c17e5..9cd0227a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22201.4 - 6.0.300-preview.22201.4 + 6.0.300-preview.22201.6 + 6.0.300-preview.22201.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f23310c97de1ef680d1093ce0f32f40a23f6c76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 20:21:46 -0700 Subject: [PATCH 353/462] [release/6.0.3xx] Update dependencies from dotnet/sdk (#13528) * Update dependencies from https://github.com/dotnet/sdk build 20220404.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22201.6 -> To Version 6.0.300-preview.22204.2 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 6.0.300-preview.22180.3 -> To Version 6.0.300-preview.22201.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220404.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22201.6 -> To Version 6.0.300-preview.22204.3 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 6.0.300-preview.22180.3 -> To Version 6.0.300-preview.22201.5 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9af00e2f8..2b00cee5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - b0eac7f0c4a40316aa4e5004e597e217035cbcc9 + 5ad577ee814db3c7473d904888c7db31129cf435 - + https://github.com/dotnet/templating - b0eac7f0c4a40316aa4e5004e597e217035cbcc9 + 5ad577ee814db3c7473d904888c7db31129cf435 - + https://github.com/dotnet/templating - b0eac7f0c4a40316aa4e5004e597e217035cbcc9 + 5ad577ee814db3c7473d904888c7db31129cf435 - + https://github.com/dotnet/sdk - 9dc5b2e62e113d121235d80e9cfd8336d2eb335a + 3c2c2e186f91025bc78ded47b35ddf3b765ee43e - + https://github.com/dotnet/sdk - 9dc5b2e62e113d121235d80e9cfd8336d2eb335a + 3c2c2e186f91025bc78ded47b35ddf3b765ee43e @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - a59a22c6f3c2cc1883e20cece412209f18f4a29f + 4f4a757510f260eb8ac121dd9f8e7706d13751fb @@ -151,9 +151,9 @@ ce7523296d7ddb70fb61a68e84bc2ff38e012e35 - + https://github.com/nuget/nuget.client - bc4b41f3ca294ccc8aedc8af5159c215943e1ed2 + 6f54dbd49fcda01ca8d71eb4fa4eea6ef54379ab diff --git a/eng/Versions.props b/eng/Versions.props index 9cd0227a2..ec440eb5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22180.3 + 6.0.300-preview.22201.5 @@ -56,8 +56,8 @@ - 6.0.300-preview.22201.6 - 6.0.300-preview.22201.6 + 6.0.300-preview.22204.3 + 6.0.300-preview.22204.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22180.3 + 6.0.300-preview.22201.5 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 9ab192a3a9b84df50585773dcc404b1f38ae832a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Apr 2022 12:59:02 -0700 Subject: [PATCH 354/462] Update branding to 6.0.203 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b1a71dbe8..acb24212e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 2 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 284bcacb8aba7b24c1cafa960c70e67990b99729 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Apr 2022 20:31:26 +0000 Subject: [PATCH 355/462] Update dependencies from https://github.com/dotnet/arcade build 20220328.5 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22161.1 -> To Version 6.0.0-beta.22178.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/steps/source-build.yml | 4 ++-- global.json | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 905170bbb..1ef6d6a36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,19 +201,19 @@ - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b1a71dbe8..8937945e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22161.1 + 6.0.0-beta.22178.5 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ba40dc82f..abb1b2bcd 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 [ '$(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)' + 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)' fi buildConfig=Release diff --git a/global.json b/global.json index 3778b80ba..b5bee2e33 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.22161.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22178.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22178.5" } } From e0053fd69a309e657a86e617b0922c6dc55a2617 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Apr 2022 20:33:34 +0000 Subject: [PATCH 356/462] Update dependencies from https://github.com/dotnet/arcade build 20220328.5 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22161.1 -> To Version 6.0.0-beta.22178.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/steps/source-build.yml | 4 ++-- global.json | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b00cee5d..95c591503 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ec440eb5b..980b7746f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22161.1 + 6.0.0-beta.22178.5 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ba40dc82f..abb1b2bcd 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 [ '$(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)' + 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)' fi buildConfig=Release diff --git a/global.json b/global.json index 3778b80ba..b5bee2e33 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.22161.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22178.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22178.5" } } From faff72a1b7d227c97981228ad65eb1c0311df66d Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 5 Apr 2022 19:53:04 -0700 Subject: [PATCH 357/462] Restore the changes for the files in the eng/folder --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ef6d6a36..905170bbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,19 +201,19 @@ - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8937945e6..b1a71dbe8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22178.5 + 6.0.0-beta.22161.1 From 7f8493cb0ad74361f3be4bf058ab6326a6befcfa Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 5 Apr 2022 19:54:04 -0700 Subject: [PATCH 358/462] Restore the changes for the global.json file --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index b5bee2e33..3778b80ba 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.22178.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22178.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1" } } From ecc445fffcea7861447cde0d1c34d10210d168ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Apr 2022 03:39:15 +0000 Subject: [PATCH 359/462] Update dependencies from https://github.com/dotnet/sdk build 20220405.16 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22204.3 -> To Version 6.0.300-preview.22205.16 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.0.3-beta.22181.2 -> To Version 12.0.3-beta.22203.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95c591503..9f93453a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5ad577ee814db3c7473d904888c7db31129cf435 - + https://github.com/dotnet/sdk - 3c2c2e186f91025bc78ded47b35ddf3b765ee43e + 59d589e341c47593db9a9c503bdc4f53242fba48 - + https://github.com/dotnet/sdk - 3c2c2e186f91025bc78ded47b35ddf3b765ee43e + 59d589e341c47593db9a9c503bdc4f53242fba48 @@ -121,18 +121,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 560f243910f407df33fd5cdf06e2a857684f4bc7 - + https://github.com/dotnet/fsharp - 31803ec27047f57c3fd06f3becddf2d369424d62 + 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 - + https://github.com/dotnet/fsharp - 31803ec27047f57c3fd06f3becddf2d369424d62 + 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 - + https://github.com/microsoft/vstest - 75765f2afc7425f47efde1a59a8eb86cf81658f9 + fd7a89629c321b139d393a224dde2021a98e7888 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 4f4a757510f260eb8ac121dd9f8e7706d13751fb + 0167599e0e1634ea3ed8d0e41390a3c0d9b3e4e9 diff --git a/eng/Versions.props b/eng/Versions.props index 980b7746f..69e7e3b22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22204.3 - 6.0.300-preview.22204.3 + 6.0.300-preview.22205.16 + 6.0.300-preview.22205.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-release-20220209-04 + 17.2.0-release-20220404-03 From 5e334c550af1d1cb04c379991380048273c02d8b Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 5 Apr 2022 22:53:12 -0700 Subject: [PATCH 360/462] Restore the changes for the files in the eng/folder --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 497d1dbc8..a241e63d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3b6297a53..6a0c76e05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22178.5 + 6.0.0-beta.22161.1 From b2d2cb081ca65c35eb8531c40c4b74885c802352 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 5 Apr 2022 22:54:28 -0700 Subject: [PATCH 361/462] Restore the global.json file --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index b5bee2e33..3778b80ba 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.22178.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22178.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1" } } From 3bdac4d8372bf25b1c7c5fceb15cd9b3b165b1ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Apr 2022 06:47:59 +0000 Subject: [PATCH 362/462] Update dependencies from https://github.com/dotnet/sdk build 20220405.30 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22204.3 -> To Version 6.0.300-preview.22205.30 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.Compilers.Toolset From Version 6.0.300-preview.22201.5 -> To Version 6.0.300-preview.22204.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 9f93453a8..2654f15e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 5ad577ee814db3c7473d904888c7db31129cf435 + 897d00731c4f89d2adbf174a32fe658ae415fe36 - + https://github.com/dotnet/templating - 5ad577ee814db3c7473d904888c7db31129cf435 + 897d00731c4f89d2adbf174a32fe658ae415fe36 - + https://github.com/dotnet/templating - 5ad577ee814db3c7473d904888c7db31129cf435 + 897d00731c4f89d2adbf174a32fe658ae415fe36 - + https://github.com/dotnet/sdk - 59d589e341c47593db9a9c503bdc4f53242fba48 + 79124b91b7abd4f5ce51c488ed65cf0fd61848cb - + https://github.com/dotnet/sdk - 59d589e341c47593db9a9c503bdc4f53242fba48 + 79124b91b7abd4f5ce51c488ed65cf0fd61848cb diff --git a/eng/Versions.props b/eng/Versions.props index 69e7e3b22..7f3fb2b1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22201.5 + 6.0.300-preview.22204.1 @@ -56,8 +56,8 @@ - 6.0.300-preview.22205.16 - 6.0.300-preview.22205.16 + 6.0.300-preview.22205.30 + 6.0.300-preview.22205.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22201.5 + 6.0.300-preview.22204.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From d277a44e4c44461f2ad13b98cf0dfcf06bab2746 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Wed, 6 Apr 2022 21:52:48 +0000 Subject: [PATCH 363/462] Removed backported vstest source-build patch --- ...oject-target-frameworks-for-source-b.patch | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch diff --git a/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch b/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch deleted file mode 100644 index 729c76c4e..000000000 --- a/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 23 Nov 2021 17:45:25 +0000 -Subject: [PATCH] Update nuspec project target frameworks for source-build - -This patch removes prebuilts caused from targetting netcoreapp1.0 - -Backported with https://github.com/microsoft/vstest/pull/3188 ---- - src/package/nuspec/Microsoft.TestPlatform.Build.csproj | 3 ++- - src/package/nuspec/Microsoft.TestPlatform.CLI.csproj | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj -index 038fbf8..57cde8e 100644 ---- a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj -+++ b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj -@@ -1,7 +1,8 @@ - - - Exe -- netcoreapp1.0 -+ netcoreapp1.0 -+ net6.0 - false - TestPlatform.Build.nuspec - version=$(Version) -diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj -index 29198ba..19386eb 100644 ---- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj -+++ b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj -@@ -1,7 +1,8 @@ - - - Exe -- netcoreapp1.0 -+ netcoreapp1.0 -+ net6.0 - false - TestPlatform.CLI.nuspec - version=$(Version) From 91745daffd1931bb3fb57474e3d031aa20b43d02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Apr 2022 09:52:51 +0000 Subject: [PATCH 364/462] Update dependencies from https://github.com/dotnet/sdk build 20220407.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22205.30 -> To Version 6.0.300-preview.22207.3 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.2.0-3.22205.5 -> To Version 4.2.0-3.22206.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 2654f15e7..6ab1f843b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 897d00731c4f89d2adbf174a32fe658ae415fe36 - + https://github.com/dotnet/sdk - 79124b91b7abd4f5ce51c488ed65cf0fd61848cb + 2d63b9580af02442d348a30e5bdead467ff4f0ae - + https://github.com/dotnet/sdk - 79124b91b7abd4f5ce51c488ed65cf0fd61848cb + 2d63b9580af02442d348a30e5bdead467ff4f0ae @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 0167599e0e1634ea3ed8d0e41390a3c0d9b3e4e9 + 52c2528edc70439991e0aaedd97b1e0e6f69a6c7 diff --git a/eng/Versions.props b/eng/Versions.props index 7f3fb2b1c..94d347af6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22205.30 - 6.0.300-preview.22205.30 + 6.0.300-preview.22207.3 + 6.0.300-preview.22207.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 476e38ade4274bf143df49334f7c0e0c5417bdca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Apr 2022 14:34:21 +0000 Subject: [PATCH 365/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220407.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22179.1 -> To Version 6.0.0-servicing.22207.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 6ab1f843b..329c39e6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/source-build-reference-packages - dfdfa4ee297fe8daa90cd623c5b612abf3f60873 + faf0b236201ff5d2ed8b9bc18b13cbc7cebdcd9b From 53cc42576b84c3fca10169aae7dd0282f1a7e417 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Apr 2022 14:34:24 +0000 Subject: [PATCH 366/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220407.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22179.1 -> To Version 6.0.0-servicing.22207.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 1ef6d6a36..bb0597acf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -215,9 +215,9 @@ https://github.com/dotnet/arcade f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/source-build-reference-packages - dfdfa4ee297fe8daa90cd623c5b612abf3f60873 + faf0b236201ff5d2ed8b9bc18b13cbc7cebdcd9b From 82adc310332d8a49b207d0cd6944df0407bde2a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Apr 2022 15:16:20 +0000 Subject: [PATCH 367/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220407.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22179.1 -> To Version 6.0.0-servicing.22207.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 bb0597acf..6191cf3c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -215,9 +215,9 @@ https://github.com/dotnet/arcade f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/source-build-reference-packages - faf0b236201ff5d2ed8b9bc18b13cbc7cebdcd9b + 7cdb7a26c89847fcd5dc72ef5eba659030f57666 From bf3a0af993d9a5e5e3f025ecd3b0529b1bd492e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Apr 2022 15:21:19 +0000 Subject: [PATCH 368/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220407.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22179.1 -> To Version 6.0.0-servicing.22207.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 329c39e6f..01194a8d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/source-build-reference-packages - faf0b236201ff5d2ed8b9bc18b13cbc7cebdcd9b + 7cdb7a26c89847fcd5dc72ef5eba659030f57666 From b209a1c1462dc04c2412b9f9880b1458ac6b25d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Apr 2022 15:51:20 +0000 Subject: [PATCH 369/462] Update dependencies from https://github.com/dotnet/arcade build 20220406.7 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22178.5 -> To Version 6.0.0-beta.22206.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ef6d6a36..d9fd9b4f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,19 +201,19 @@ - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 254113fd7c3ee04f832c165d6aec1a6077de0d63 - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 254113fd7c3ee04f832c165d6aec1a6077de0d63 - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 254113fd7c3ee04f832c165d6aec1a6077de0d63 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8937945e6..e3a05c662 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22178.5 + 6.0.0-beta.22206.7 diff --git a/global.json b/global.json index b5bee2e33..b50ccb2be 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.22178.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22178.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22206.7" } } From 4a7532f9b8aaa775454a9026e728305a26cc240c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Apr 2022 15:54:38 +0000 Subject: [PATCH 370/462] Update dependencies from https://github.com/dotnet/arcade build 20220406.7 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22178.5 -> To Version 6.0.0-beta.22206.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ab1f843b..01b4d9768 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 254113fd7c3ee04f832c165d6aec1a6077de0d63 - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 254113fd7c3ee04f832c165d6aec1a6077de0d63 - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 254113fd7c3ee04f832c165d6aec1a6077de0d63 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 94d347af6..d16f6af8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22178.5 + 6.0.0-beta.22206.7 diff --git a/global.json b/global.json index b5bee2e33..b50ccb2be 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.22178.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22178.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22206.7" } } From c4566eaf2d73907661d2e319a29ba862912c3032 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Apr 2022 03:04:24 +0000 Subject: [PATCH 371/462] Update dependencies from https://github.com/dotnet/sdk build 20220407.14 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22207.3 -> To Version 6.0.300-preview.22207.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 814b5afe7..0eb69828c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 897d00731c4f89d2adbf174a32fe658ae415fe36 - + https://github.com/dotnet/sdk - 2d63b9580af02442d348a30e5bdead467ff4f0ae + 5bd830af47b00fdd07af7a860f20a129db6a9192 - + https://github.com/dotnet/sdk - 2d63b9580af02442d348a30e5bdead467ff4f0ae + 5bd830af47b00fdd07af7a860f20a129db6a9192 diff --git a/eng/Versions.props b/eng/Versions.props index d16f6af8f..19958444b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22207.3 - 6.0.300-preview.22207.3 + 6.0.300-preview.22207.14 + 6.0.300-preview.22207.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f33f0a4b2eb360a35aac333b6ab5fc1e03260f47 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Apr 2022 04:10:16 +0000 Subject: [PATCH 372/462] Update dependencies from https://github.com/dotnet/sdk build 20220407.19 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22207.3 -> To Version 6.0.300-preview.22207.19 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.300-preview.22204.1 -> To Version 6.0.300-preview.22207.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0eb69828c..3dda1b885 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 897d00731c4f89d2adbf174a32fe658ae415fe36 + 23849eac83759e337493c1e60264543482303366 - + https://github.com/dotnet/templating - 897d00731c4f89d2adbf174a32fe658ae415fe36 + 23849eac83759e337493c1e60264543482303366 - + https://github.com/dotnet/templating - 897d00731c4f89d2adbf174a32fe658ae415fe36 + 23849eac83759e337493c1e60264543482303366 - + https://github.com/dotnet/sdk - 5bd830af47b00fdd07af7a860f20a129db6a9192 + 2bfe7e9e1bd45def8c991106024c0861d6bd52c2 - + https://github.com/dotnet/sdk - 5bd830af47b00fdd07af7a860f20a129db6a9192 + 2bfe7e9e1bd45def8c991106024c0861d6bd52c2 diff --git a/eng/Versions.props b/eng/Versions.props index 19958444b..457d694a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22204.1 + 6.0.300-preview.22207.2 @@ -56,8 +56,8 @@ - 6.0.300-preview.22207.14 - 6.0.300-preview.22207.14 + 6.0.300-preview.22207.19 + 6.0.300-preview.22207.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22204.1 + 6.0.300-preview.22207.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From db4de9426a122d3b8fe4aae3888592a6989d7bb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Apr 2022 05:14:50 +0000 Subject: [PATCH 373/462] Update dependencies from https://github.com/dotnet/sdk build 20220407.25 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22207.3 -> To Version 6.0.300-preview.22207.25 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Build From Version 6.0.300-preview.22204.1 -> To Version 6.0.300-preview.22207.2 (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 9a84139e5..642de6d11 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,6 +11,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dda1b885..a1b22e8d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 23849eac83759e337493c1e60264543482303366 - + https://github.com/dotnet/sdk - 2bfe7e9e1bd45def8c991106024c0861d6bd52c2 + af88d8be4cd0a459d31a47ea3ba3fe1ca6171950 - + https://github.com/dotnet/sdk - 2bfe7e9e1bd45def8c991106024c0861d6bd52c2 + af88d8be4cd0a459d31a47ea3ba3fe1ca6171950 @@ -146,9 +146,9 @@ 52c2528edc70439991e0aaedd97b1e0e6f69a6c7 - + https://github.com/dotnet/msbuild - ce7523296d7ddb70fb61a68e84bc2ff38e012e35 + 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b diff --git a/eng/Versions.props b/eng/Versions.props index 457d694a9..5a8f9443c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22207.19 - 6.0.300-preview.22207.19 + 6.0.300-preview.22207.25 + 6.0.300-preview.22207.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8af385c881ecc7e686bca6509c0da378e9574369 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Apr 2022 14:08:45 +0000 Subject: [PATCH 374/462] Update dependencies from https://github.com/dotnet/test-templates build 20220407.1 (#13561) [release/6.0.3xx] Update dependencies from dotnet/test-templates --- 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 814b5afe7..5ac02653f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,17 +77,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c911002ab43b7b989ed67090f2a48d9073d5118d - + https://github.com/dotnet/test-templates - c40ef7e056b48e011c43a21354d6790ba6b8b4fc + 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/test-templates - c40ef7e056b48e011c43a21354d6790ba6b8b4fc + 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/test-templates - c40ef7e056b48e011c43a21354d6790ba6b8b4fc + 9388790ba9ed8fef11584b2c74fe6789782a1592 diff --git a/eng/Versions.props b/eng/Versions.props index d16f6af8f..4c0d91574 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,8 +35,8 @@ - 1.0.2-beta4.22064.3 - 1.0.2-beta4.22064.3 + 1.0.2-beta4.22207.1 + 1.0.2-beta4.22207.1 @@ -143,7 +143,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.22064.3 + 1.0.2-beta4.22207.1 2.1.30 From 2191fb7009c6332f40d889bdcff36689dd66471d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Apr 2022 15:11:32 +0000 Subject: [PATCH 375/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220408.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22207.2 -> To Version 6.0.0-servicing.22208.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 5ac02653f..7d2b01205 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 254113fd7c3ee04f832c165d6aec1a6077de0d63 - + https://github.com/dotnet/source-build-reference-packages - 7cdb7a26c89847fcd5dc72ef5eba659030f57666 + e5429803f3e9064da8a857b561a07489800f3f29 From 8d174cfc31c21da6e9b5d6a6ac098093d90b42b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Apr 2022 15:11:36 +0000 Subject: [PATCH 376/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220408.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22207.2 -> To Version 6.0.0-servicing.22208.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 c8a1dad2b..47d349cab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -215,9 +215,9 @@ https://github.com/dotnet/arcade 254113fd7c3ee04f832c165d6aec1a6077de0d63 - + https://github.com/dotnet/source-build-reference-packages - 7cdb7a26c89847fcd5dc72ef5eba659030f57666 + e5429803f3e9064da8a857b561a07489800f3f29 From d4412426a76f934bfc5ed2b5c50d01ab950b7c28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Apr 2022 15:25:03 +0000 Subject: [PATCH 377/462] Update dependencies from https://github.com/dotnet/sdk build 20220408.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22207.3 -> To Version 6.0.300-preview.22208.4 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Build From Version 6.0.300-preview.22204.1 -> To Version 6.0.300-preview.22207.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 a1b22e8d6..23b6fe1a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 23849eac83759e337493c1e60264543482303366 - + https://github.com/dotnet/sdk - af88d8be4cd0a459d31a47ea3ba3fe1ca6171950 + d1637ec3304e8f4a3fc9c9c8425a640a540b54d4 - + https://github.com/dotnet/sdk - af88d8be4cd0a459d31a47ea3ba3fe1ca6171950 + d1637ec3304e8f4a3fc9c9c8425a640a540b54d4 diff --git a/eng/Versions.props b/eng/Versions.props index 5a8f9443c..287c46b60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22207.25 - 6.0.300-preview.22207.25 + 6.0.300-preview.22208.4 + 6.0.300-preview.22208.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6a49bdbb9625d06f6c8968d3f06aa992a85665d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Apr 2022 04:36:02 +0000 Subject: [PATCH 378/462] Update dependencies from https://github.com/dotnet/sdk build 20220408.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22207.3 -> To Version 6.0.300-preview.22208.8 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Build From Version 6.0.300-preview.22204.1 -> To Version 6.0.300-preview.22208.4 (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 23b6fe1a0..a3b3a2d43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 23849eac83759e337493c1e60264543482303366 + 115aeb115de1387d8ba427b9bfdf072d7dd64914 - + https://github.com/dotnet/templating - 23849eac83759e337493c1e60264543482303366 + 115aeb115de1387d8ba427b9bfdf072d7dd64914 - + https://github.com/dotnet/templating - 23849eac83759e337493c1e60264543482303366 + 115aeb115de1387d8ba427b9bfdf072d7dd64914 - + https://github.com/dotnet/sdk - d1637ec3304e8f4a3fc9c9c8425a640a540b54d4 + ae78185ce1b1afae4fceeee4742437124dbdc3de - + https://github.com/dotnet/sdk - d1637ec3304e8f4a3fc9c9c8425a640a540b54d4 + ae78185ce1b1afae4fceeee4742437124dbdc3de diff --git a/eng/Versions.props b/eng/Versions.props index 287c46b60..a3446de6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22207.2 + 6.0.300-preview.22208.4 @@ -56,8 +56,8 @@ - 6.0.300-preview.22208.4 - 6.0.300-preview.22208.4 + 6.0.300-preview.22208.8 + 6.0.300-preview.22208.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22207.2 + 6.0.300-preview.22208.4 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From c0fd61cd739323c1a90ce61f6481bd6826b455de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Apr 2022 03:06:16 +0000 Subject: [PATCH 379/462] Update dependencies from https://github.com/dotnet/sdk build 20220410.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22208.8 -> To Version 6.0.300-preview.22210.3 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 17.2.0-release-20220404-03 -> To Version 17.2.0-release-20220408-11 (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 0f8177199..08ee2ea66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 115aeb115de1387d8ba427b9bfdf072d7dd64914 - + https://github.com/dotnet/sdk - ae78185ce1b1afae4fceeee4742437124dbdc3de + 61048fd02362ba19f468d4456573b1aa79171a28 - + https://github.com/dotnet/sdk - ae78185ce1b1afae4fceeee4742437124dbdc3de + 61048fd02362ba19f468d4456573b1aa79171a28 @@ -130,9 +130,9 @@ 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 - + https://github.com/microsoft/vstest - fd7a89629c321b139d393a224dde2021a98e7888 + 717d0cf94925e9cf67466dbee46c1019930eb212 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 52c2528edc70439991e0aaedd97b1e0e6f69a6c7 + 9a3459303679328da9ccc529888e3c576ce3efec diff --git a/eng/Versions.props b/eng/Versions.props index b5d99216d..20585d3b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22208.8 - 6.0.300-preview.22208.8 + 6.0.300-preview.22210.3 + 6.0.300-preview.22210.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-release-20220404-03 + 17.2.0-release-20220408-11 From 56d30baaa2e843dff5d4a2af6ad022c742720846 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sun, 10 Apr 2022 21:29:05 -0700 Subject: [PATCH 380/462] Restore the version.details.xml file --- 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 0f8177199..f8f6d1786 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 254113fd7c3ee04f832c165d6aec1a6077de0d63 - + https://github.com/dotnet/source-build-reference-packages - e5429803f3e9064da8a857b561a07489800f3f29 + 7cdb7a26c89847fcd5dc72ef5eba659030f57666 From e021414cb1fb378dccd6354f6888bede20799632 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Apr 2022 05:52:41 +0000 Subject: [PATCH 381/462] Update dependencies from https://github.com/dotnet/sdk build 20220410.6 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22210.3 -> To Version 6.0.300-preview.22210.6 --- 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 08ee2ea66..edfe0e86a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 115aeb115de1387d8ba427b9bfdf072d7dd64914 - + https://github.com/dotnet/sdk - 61048fd02362ba19f468d4456573b1aa79171a28 + ed5ce6df3d8aa7a9685f36c2462776ff9e5669ce - + https://github.com/dotnet/sdk - 61048fd02362ba19f468d4456573b1aa79171a28 + ed5ce6df3d8aa7a9685f36c2462776ff9e5669ce diff --git a/eng/Versions.props b/eng/Versions.props index 20585d3b6..2634e8b4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22210.3 - 6.0.300-preview.22210.3 + 6.0.300-preview.22210.6 + 6.0.300-preview.22210.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d42ff0c17c331a78e36a2b5fde66ba4ac52b1037 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Apr 2022 00:12:37 +0000 Subject: [PATCH 382/462] Update dependencies from https://github.com/dotnet/sdk build 20220411.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22210.6 -> To Version 6.0.300-preview.22211.12 --- 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 edfe0e86a..ddcabaf6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 115aeb115de1387d8ba427b9bfdf072d7dd64914 - + https://github.com/dotnet/sdk - ed5ce6df3d8aa7a9685f36c2462776ff9e5669ce + f1b9029514b0d0e85227e748126ad71836dfbed6 - + https://github.com/dotnet/sdk - ed5ce6df3d8aa7a9685f36c2462776ff9e5669ce + f1b9029514b0d0e85227e748126ad71836dfbed6 diff --git a/eng/Versions.props b/eng/Versions.props index 2634e8b4b..e0c62ac7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22210.6 - 6.0.300-preview.22210.6 + 6.0.300-preview.22211.12 + 6.0.300-preview.22211.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f10b352b029d6e4ebfff6334437835c4d82e7c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Apr 2022 09:14:44 +0000 Subject: [PATCH 383/462] Update dependencies from https://github.com/dotnet/sdk build 20220412.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22211.12 -> To Version 6.0.300-preview.22212.1 --- 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 cdf9dcd6d..f4b538a41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 115aeb115de1387d8ba427b9bfdf072d7dd64914 - + https://github.com/dotnet/sdk - f1b9029514b0d0e85227e748126ad71836dfbed6 + d625fa1e9930650f5f3fc7387f5e5cd8c935a7ac - + https://github.com/dotnet/sdk - f1b9029514b0d0e85227e748126ad71836dfbed6 + d625fa1e9930650f5f3fc7387f5e5cd8c935a7ac diff --git a/eng/Versions.props b/eng/Versions.props index e0c62ac7e..5bf54776b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22211.12 - 6.0.300-preview.22211.12 + 6.0.300-preview.22212.1 + 6.0.300-preview.22212.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 07b0deb73e3d08910f1872744b5c7c58ee7c88bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Apr 2022 10:21:01 +0000 Subject: [PATCH 384/462] Update dependencies from https://github.com/dotnet/sdk build 20220412.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22212.1 -> To Version 6.0.300-preview.22212.3 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.2.0-4.22208.7 -> To Version 4.2.0-4.22211.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 f4b538a41..630899ac1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 115aeb115de1387d8ba427b9bfdf072d7dd64914 - + https://github.com/dotnet/sdk - d625fa1e9930650f5f3fc7387f5e5cd8c935a7ac + 8963eb7d0f371d688809146cf75c847987420b86 - + https://github.com/dotnet/sdk - d625fa1e9930650f5f3fc7387f5e5cd8c935a7ac + 8963eb7d0f371d688809146cf75c847987420b86 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 9a3459303679328da9ccc529888e3c576ce3efec + 8b5c5b8e817c4299f2693ce7a16fe1465de1d9c4 diff --git a/eng/Versions.props b/eng/Versions.props index 5bf54776b..b852fe6ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22212.1 - 6.0.300-preview.22212.1 + 6.0.300-preview.22212.3 + 6.0.300-preview.22212.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 753cdcf45f3f141318a9b003a0adab64665bf5e3 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 12 Apr 2022 13:30:37 -0700 Subject: [PATCH 385/462] [6.0.2xx] Update asp.net template versions (#13544) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e93ceedc3..2300d2523 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.15 + 5.0.16 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.23 + 3.1.24 3.2.1 4.8.0-rc2.19462.10 From f001fc0f1f7f3b75c7c3c1a722fa31360edc5e5b Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 12 Apr 2022 13:37:09 -0700 Subject: [PATCH 386/462] [6.0.3xx] Update asp.net template versions (#13545) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5bf54776b..3ff264ce6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.15 + 5.0.16 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.23 + 3.1.24 3.2.1 4.8.0-rc2.19462.10 From ef856a09d16f0a5a3b9fd46ef64a49ab219ab3c0 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Wed, 13 Apr 2022 07:58:28 -0700 Subject: [PATCH 387/462] Windows SDK projection update (#13613) --- eng/ManualVersions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 0c141e3cb..8543f5e5c 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.24 - 10.0.18362.24 - 10.0.19041.24 - 10.0.20348.24 - 10.0.22000.24 + 10.0.17763.25 + 10.0.18362.25 + 10.0.19041.25 + 10.0.20348.25 + 10.0.22000.25 From f17fb6728cfc56b6e10f86d79524d0ad372537de Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Apr 2022 08:02:27 -0700 Subject: [PATCH 388/462] Final branding for 6.0.300 (#13608) --- eng/Versions.props | 4 ++-- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f98b402e3..28c0cb2ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,11 +10,11 @@ 3 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + rtm $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 1bbe3f77b..f311e197b 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,8 +26,8 @@ 30 - $([MSBuild]::Add($(VersionFeature), 23)) - $([MSBuild]::Add($(VersionFeature), 15)) + $([MSBuild]::Add($(VersionFeature), 25)) + $([MSBuild]::Add($(VersionFeature), 17)) From 4464c99669f23f444000ede610ffabfeae5a2d3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Apr 2022 15:10:21 +0000 Subject: [PATCH 389/462] Update dependencies from https://github.com/dotnet/arcade build 20220412.5 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22206.7 -> To Version 6.0.0-beta.22212.5 --- NuGet.config | 11 +++-------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index e885f4e2b..f03617759 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,21 @@ - + + + - - - @@ -41,15 +40,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35c32467d..19158a728 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,19 +201,19 @@ - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 1ce62f442..9f4b10e46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22206.7 + 6.0.0-beta.22212.5 diff --git a/global.json b/global.json index b50ccb2be..b645142d3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.103", + "dotnet": "6.0.104", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22206.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5" } } From f47eaa666b7099c0b7ed6c1b13532962498cfb51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:30:44 -0700 Subject: [PATCH 390/462] Update dependencies from https://github.com/dotnet/arcade build 20220412.5 (#13626) Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22206.7 -> To Version 6.0.0-beta.22212.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 630899ac1..ae8bd64c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 28c0cb2ba..60da7aa12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22206.7 + 6.0.0-beta.22212.5 diff --git a/global.json b/global.json index b50ccb2be..b645142d3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.103", + "dotnet": "6.0.104", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22206.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5" } } From 6c8f85b46e60eb389de0952646e690a78ea5e3f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:44:12 -0700 Subject: [PATCH 391/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220413.1 (#13622) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22207.2 -> To Version 6.0.0-servicing.22213.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 ae8bd64c7..2aeef5ed3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - 7cdb7a26c89847fcd5dc72ef5eba659030f57666 + 60845bf36f0dd6dd310070548a58cb8ad3ab513c From 28696f02e1a1496c051d092e59d08f425a71e50f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 10:04:10 -0700 Subject: [PATCH 392/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220413.1 (#13624) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22208.1 -> To Version 6.0.0-servicing.22213.1 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 11 +++-------- eng/Version.Details.xml | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index e885f4e2b..f03617759 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,21 @@ - + + + - - - @@ -41,15 +40,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35c32467d..de2cfd9e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -215,9 +215,9 @@ https://github.com/dotnet/arcade 254113fd7c3ee04f832c165d6aec1a6077de0d63 - + https://github.com/dotnet/source-build-reference-packages - e5429803f3e9064da8a857b561a07489800f3f29 + 60845bf36f0dd6dd310070548a58cb8ad3ab513c From 3ddadcc14fa8d48f661d109ca48904b428db0d05 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Apr 2022 13:33:27 -0700 Subject: [PATCH 393/462] Update all workloads to the April release of 6.0.300 manifests --- eng/Versions.props | 14 +++++++------- src/redist/targets/BundledManifests.targets | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 74baf5b81..0c8afac5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,13 +176,13 @@ - 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.300-rc.1.5355 + 32.0.300-rc.1.4 + 15.4.100-rc.1.125 + 15.4.100-rc.1.125 + 12.3.100-rc.1.125 + 15.4.100-rc.1.125 + 6.0.4 6.0.4 $(MicrosoftNETWorkloadEmscriptenManifest60200Version) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 3618623f1..7b8536e48 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -1,13 +1,13 @@ - - - - - - - - + + + + + + + + From fc36133df95827a16ad57e8bf8abdeb49aa6afc9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Apr 2022 16:49:20 -0700 Subject: [PATCH 394/462] Update Version.Details.xml --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 057327f53..0cd745f93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,7 +166,7 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk 52e9452f82e26f9fcae791e84c082ae22f1ef66f From 9104a1f6e4ee461f9b650eafde0187ad58863100 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 13 Apr 2022 21:49:19 -0500 Subject: [PATCH 395/462] Add patch for linker prebuilt (#13630) --- ...e-BannedApiAnalyzers-usage-in-source.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch diff --git a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch new file mode 100644 index 000000000..f7d7668dc --- /dev/null +++ b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Wed, 13 Apr 2022 21:30:39 +0000 +Subject: [PATCH] Condition out the BannedApiAnalyzers usage in source-build + +Removes prebuilt. +Patch for https://github.com/dotnet/linker/pull/2742 +--- + src/linker/Mono.Linker.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj +index 391300aa..d276003e 100644 +--- a/src/linker/Mono.Linker.csproj ++++ b/src/linker/Mono.Linker.csproj +@@ -31,7 +31,7 @@ + + + +- ++ + runtime; build; native; contentfiles; analyzers; buildtransitive + all + From d419470991d88a7b15c2316e9642ac4f76abd6e5 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 13 Apr 2022 20:27:25 -0700 Subject: [PATCH 396/462] Add patch for linker prebuilt (#13630) (#13633) Co-authored-by: Michael Simons --- ...e-BannedApiAnalyzers-usage-in-source.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch diff --git a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch new file mode 100644 index 000000000..f7d7668dc --- /dev/null +++ b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Wed, 13 Apr 2022 21:30:39 +0000 +Subject: [PATCH] Condition out the BannedApiAnalyzers usage in source-build + +Removes prebuilt. +Patch for https://github.com/dotnet/linker/pull/2742 +--- + src/linker/Mono.Linker.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj +index 391300aa..d276003e 100644 +--- a/src/linker/Mono.Linker.csproj ++++ b/src/linker/Mono.Linker.csproj +@@ -31,7 +31,7 @@ + + + +- ++ + runtime; build; native; contentfiles; analyzers; buildtransitive + all + From 6ac60f74ebab454c7924eb1df20239d238a7f7cc Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 13 Apr 2022 23:55:34 -0700 Subject: [PATCH 397/462] Restore the version.details.xml file --- 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 cf180107c..131a316f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - 60845bf36f0dd6dd310070548a58cb8ad3ab513c + e5429803f3e9064da8a857b561a07489800f3f29 From 934c23764044ed14f69962ddc54e992c25e417ab Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 14 Apr 2022 09:45:34 -0500 Subject: [PATCH 398/462] Update source-built artifacts version (#13638) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 74baf5b81..65684028e 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.104 From 8ed3ae9f13375dfca27de419dea303ac4a02f2aa Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Apr 2022 13:17:10 -0700 Subject: [PATCH 399/462] Fix the source build leg for the 300 workloads --- .../Arcade/tools/TextOnlyPackages.csproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj index f7cad5354..7faf06dfb 100644 --- a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj +++ b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj @@ -11,14 +11,14 @@ should be added to source-build-reference-packages. --> - - - - - - - - + + + + + + + + @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 8b5c5b8e817c4299f2693ce7a16fe1465de1d9c4 + f2d278f9a5131b7944d6ac5fecf2ce5b0a98195f diff --git a/eng/Versions.props b/eng/Versions.props index 4b4ef5512..af3bb634f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22212.3 - 6.0.300-preview.22212.3 + 6.0.300-preview.22213.3 + 6.0.300-preview.22213.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a415eac16da4835fd1d43f52815e7840b90e00ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Apr 2022 15:55:14 +0000 Subject: [PATCH 401/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220419.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22219.1 --- NuGet.config | 4 ---- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index f03617759..941bd870a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,6 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51284cde3..cdb415346 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -215,9 +215,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - 60845bf36f0dd6dd310070548a58cb8ad3ab513c + bb35f199756a8b45dacb1025d72419f6ea5ff1a4 From f0800059e3ea365d4d6ae931a6613cdfc4a268a3 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 20 Apr 2022 01:27:33 -0700 Subject: [PATCH 402/462] Restore the version.details.xml file --- 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 cdb415346..51284cde3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -215,9 +215,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - bb35f199756a8b45dacb1025d72419f6ea5ff1a4 + 60845bf36f0dd6dd310070548a58cb8ad3ab513c From bf78d7434c070d829eefd75c483c21061983d404 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 20 Apr 2022 01:29:10 -0700 Subject: [PATCH 403/462] Restore the nuget.config file --- NuGet.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NuGet.config b/NuGet.config index 941bd870a..f03617759 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,10 @@ + + + + From 91c6682f9e2a0afda3c169c4d6807a12180e66c8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 20 Apr 2022 23:43:56 +0000 Subject: [PATCH 404/462] Merged PR 22483: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.300-preview.22208.4 to 6.0.300 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.300-preview.22208.4 to 6.0.300-rtm.22215.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.300-preview.22208.4 to 6.0.300 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.FSharp.Compiler**: fr... --- NuGet.config | 11 +- eng/Version.Details.xml | 108 ++++++++--------- eng/Versions.props | 46 +++---- ...lease-6.0-Build-ProjectTemplates-in-.patch | 113 ------------------ ...e-BannedApiAnalyzers-usage-in-source.patch | 24 ---- src/redist/targets/GenerateLayout.targets | 25 ++-- 6 files changed, 96 insertions(+), 231 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch delete mode 100644 src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch diff --git a/NuGet.config b/NuGet.config index cbce2d136..3e42736a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,21 @@ + - - - - + + + @@ -40,11 +40,14 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6bf90f60..502343b6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 167140c0529a64c91f7a82249583ce27e52d28dd + ad940638f459efe0d17d60ccf52454a32ea7e561 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 167140c0529a64c91f7a82249583ce27e52d28dd + ad940638f459efe0d17d60ccf52454a32ea7e561 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 167140c0529a64c91f7a82249583ce27e52d28dd + ad940638f459efe0d17d60ccf52454a32ea7e561 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 167140c0529a64c91f7a82249583ce27e52d28dd + ad940638f459efe0d17d60ccf52454a32ea7e561 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + e5f183b656a0e8bc087108130a5a9b54ae94494e https://github.com/dotnet/test-templates @@ -90,42 +90,42 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 115aeb115de1387d8ba427b9bfdf072d7dd64914 + 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://github.com/dotnet/templating - 115aeb115de1387d8ba427b9bfdf072d7dd64914 + 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://github.com/dotnet/templating - 115aeb115de1387d8ba427b9bfdf072d7dd64914 + 60a2f73de55434984bbe3d5ad9281b3863355b31 - - https://github.com/dotnet/sdk - 3456e28c08f10074a5cfd1e2522acefa8f515210 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 679e847e5414a9035443a3faf25799e71590f051 - - https://github.com/dotnet/sdk - 3456e28c08f10074a5cfd1e2522acefa8f515210 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 679e847e5414a9035443a3faf25799e71590f051 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee + 1f426c90a9589dabc16d114aa91bfea9f21f8571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcb07d637abf53791e2c55c63d9207fc3232fe83 + 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 - + https://github.com/dotnet/fsharp 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 @@ -135,9 +135,9 @@ 717d0cf94925e9cf67466dbee46c1019930eb212 - + https://github.com/dotnet/linker - 01c4f5905959c29f86781b85187bb676fc517ee9 + 28db36b95cf83c8e2ad11e67a2ad0de301b4cad6 linker diff --git a/eng/Versions.props b/eng/Versions.props index af3bb634f..46320c3cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.4-servicing.22164.7 + 6.0.3-servicing.22123.7 - 6.0.4-servicing.22165.3 + 6.0.5-servicing.22215.9 - 6.0.300-preview.22208.4 + 6.0.300 @@ -44,44 +44,44 @@ - 6.0.4 - 6.0.4 - 6.0.4-servicing.22172.4 - 6.0.4-servicing.22172.4 - 6.0.4-servicing.22172.4 - 6.0.4-servicing.22172.4 + 6.0.5 + 6.0.5 + 6.0.5-servicing.22218.2 + 6.0.5-servicing.22218.2 + 6.0.5-servicing.22218.2 + 6.0.5-servicing.22218.2 0.2.0 - 6.0.300-preview.22213.3 - 6.0.300-preview.22213.3 + 6.0.300-rtm.22220.16 + 6.0.300-rtm.22220.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.3 + 6.0.2 - 6.0.4-servicing.22164.4 - 6.0.4-servicing.22164.4 - 6.0.4 - 6.0.4 - 6.0.4 - 6.0.4 + 6.0.5-servicing.22213.9 + 6.0.5-servicing.22213.9 + 6.0.5 + 6.0.5 + 6.0.5 + 6.0.5 2.1.0 - 6.0.4-servicing.22165.2 - 6.0.4-servicing.22165.2 - 6.0.4 - 6.0.4 + 6.0.5-servicing.22215.11 + 6.0.5-servicing.22215.11 + 6.0.5 + 6.0.5 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22208.4 + 6.0.300 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch deleted file mode 100644 index 7ada1a116..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Godbe -Date: Wed, 23 Mar 2022 09:11:11 -0700 -Subject: [PATCH] Revert "Revert "[release/6.0] Build ProjectTemplates in - Source-Build (#40650)" (#40805)" - -This reverts commit a351c437ac7bc9f9be96de51832608438a7a37df. ---- - Directory.Build.props | 3 +++ - Directory.Build.targets | 9 +++++++-- - .../src/Microsoft.Authentication.WebAssembly.Msal.csproj | 9 ++++++++- - ...pNetCore.Components.WebAssembly.Authentication.csproj | 9 ++++++++- - 4 files changed, 26 insertions(+), 4 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 8f0ac59422..721f099a77 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -30,6 +30,9 @@ - $(MSBuildProjectName.EndsWith('.Test')) OR - $(MSBuildProjectName.EndsWith('.FunctionalTest')) ) ">true - true -+ true - true - true - true -+ Condition="'$(ExcludeFromSourceBuild)' == '' and -+ '$(DotNetBuildFromSource)' == 'true' and -+ '$(IsAspNetCoreApp)' != 'true' and -+ '$(MSBuildProjectName)' != '$(TargetingPackName)' and -+ '$(IsAnalyzersProject)' != 'true' and -+ '$(IsProjectTemplateProject)' != 'true'">true - - -diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj -index 8ae5d1c43d..8e0f53957e 100644 ---- a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj -+++ b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj -@@ -1,6 +1,6 @@ -  - -- -+ - - - $(DefaultNetCoreTargetFramework) -@@ -25,6 +25,7 @@ - - $(MSBuildThisFileDirectory)Interop\ - -+ CheckForSourceBuild; - CompileInterop; - IncludeCompileInteropOutput; - $(ResolveStaticWebAssetsInputsDependsOn) -@@ -91,5 +92,11 @@ - - - -+ -+ -+ -+ -+ -+ - - -diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj -index 8d6a000d74..35c79a73eb 100644 ---- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj -+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj -@@ -1,6 +1,6 @@ - - -- -+ - - - $(DefaultNetCoreTargetFramework) -@@ -26,6 +26,7 @@ - - $(MSBuildThisFileDirectory)Interop\ - -+ CheckForSourceBuild; - CompileInterop; - IncludeCompileInteropOutput; - $(ResolveStaticWebAssetsInputsDependsOn) -@@ -93,4 +94,10 @@ - - - -+ -+ -+ -+ -+ -+ - diff --git a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch deleted file mode 100644 index f7d7668dc..000000000 --- a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Wed, 13 Apr 2022 21:30:39 +0000 -Subject: [PATCH] Condition out the BannedApiAnalyzers usage in source-build - -Removes prebuilt. -Patch for https://github.com/dotnet/linker/pull/2742 ---- - src/linker/Mono.Linker.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj -index 391300aa..d276003e 100644 ---- a/src/linker/Mono.Linker.csproj -+++ b/src/linker/Mono.Linker.csproj -@@ -31,7 +31,7 @@ - - - -- -+ - runtime; build; native; contentfiles; analyzers; buildtransitive - all - diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 5c9b2f490..e05004e17 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -82,22 +82,21 @@ dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - $(SharedFrameworkRid) - linux-x64 - $(AspNetCoreSharedFxInstallerRid) - x64 - aarch64 + $(SharedFrameworkRid) + linux-x64 + $(AspNetCoreInstallerRid) + x64 + aarch64 - aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) - aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid).wixlib + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension) - aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension) + aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension) aspnetcore_base_runtime.version From 8473146e7d8d3de5d9558239c46e62d12314d52b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 21 Apr 2022 15:36:17 +0000 Subject: [PATCH 405/462] Merged PR 22532: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.Net.Compilers.Toolset**: from 4.2.0-4.22212.4 to 4.2.0-4.22220.2 (parent: Microsoft.NET.Sdk) - **NuGet.Build.Tasks**: from 6.2.0-rc.140 to 6.2.0-rc.146 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220421.4 - **Date Produced**: April 21, 2022 9:07:16 AM UTC - **Commit**: ac00abef032d4d576a844d7f1287119a9d20166e - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.300-rtm.22220.16 to 6.0.300-rtm.22221.4][4] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.300-rtm.22220.16 to 6.0.300-rtm.22221.4][4] - **Microsoft.NETCore.Platforms**: [from 6.0.2 to 6.0.3][5] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7][6] - **Microsoft.Net.Compilers.Toolset**: [from 4.2.0-4.22212.4 to 4.2.0-4.22220.2][7] - **NuGet.Build.Tasks**: [from 6.2.0-rc.140 to 6.2.0-rc.146][8] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC679e847&targetVersion=GCac00abe&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc24d9a9&targetVersion=GCbe98e88&_a=files [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1f426c9&targetVersion=GC0c636f9&_a=files [7]: https://github.com/dotnet/roslyn/compare/f2d278f...1e40aa1 [8]: https://github.com/nuget/nuget.client/compare/6f54dbd...b8a6126 [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 502343b6d..1eafa497a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,19 +103,19 @@ https://github.com/dotnet/templating 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 679e847e5414a9035443a3faf25799e71590f051 + ac00abef032d4d576a844d7f1287119a9d20166e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 679e847e5414a9035443a3faf25799e71590f051 + ac00abef032d4d576a844d7f1287119a9d20166e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f426c90a9589dabc16d114aa91bfea9f21f8571 + 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee https://dev.azure.com/dnceng/internal/_git/dotnet-wpf @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - f2d278f9a5131b7944d6ac5fecf2ce5b0a98195f + 1e40aa11ca0b522e201320f70d469de40f211b2c @@ -151,9 +151,9 @@ 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b - + https://github.com/nuget/nuget.client - 6f54dbd49fcda01ca8d71eb4fa4eea6ef54379ab + b8a61266d9a6780cb7eb9c1942695cf813fdef0a diff --git a/eng/Versions.props b/eng/Versions.props index 46320c3cd..c2eb24464 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ - 6.0.3-servicing.22123.7 + 6.0.4-servicing.22164.7 @@ -56,15 +56,15 @@ - 6.0.300-rtm.22220.16 - 6.0.300-rtm.22220.16 + 6.0.300-rtm.22221.4 + 6.0.300-rtm.22221.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.2 + 6.0.3 From e78caf913789455b59dfc8867a831e8a78c0392d Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 9 Mar 2022 13:54:57 -0300 Subject: [PATCH 406/462] Add Mariner 2.0 and Arm64 RHEL builds --- .vsts-ci.yml | 20 ++++++++++ src/redist/targets/GenerateLayout.targets | 4 +- src/redist/targets/GenerateRPMs.targets | 38 ++++++++++++++++--- .../targets/GetRuntimeInformation.targets | 11 +++++- .../targets/packaging/rpm/dotnet-config.json | 7 +--- 5 files changed, 66 insertions(+), 14 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index e84198679..135fbbf1e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -198,6 +198,15 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) + Build_Rhel_7_2_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm + _TestArg: '' + _AdditionalBuildParameters: '/p:CLIBUILD_SKIP_TESTS=true' Build_Arm_Debug: _BuildConfig: Debug _DockerParameter: '' @@ -306,6 +315,17 @@ stages: # already published by Build_LinuxPortable_Release_x64 _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' + # Never run tests on arm64 + _TestArg: '' Build_LinuxPortable_Release_x64: _BuildConfig: Release _DockerParameter: '' diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 5c9b2f490..afd1c4e0a 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -46,11 +46,13 @@ $(CoreSetupRid) - $(Architecture) + $(InstallerTargetArchitecture) $(CoreSetupRid) $(Architecture) + $(OSName)-$(InstallerTargetArchitecture) + rhel.7-aarch64 x64 x86 diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index 935684431..a82f068fc 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -91,9 +91,6 @@ $(MicrosoftNETCoreAppRefMajorMinorPatchVersion) - - $(NetStandardTargetingPackMajorMinorPatchVersion) - $(AspNetCoreRuntimeMajorMinorPatchVersion) @@ -109,9 +106,6 @@ $(NetCoreAppHostPackRpmPackageName) - - $(NetStandardTargetingPackRpmPackageName) - $(AspNetCoreSharedFxRpmPackageName) @@ -121,6 +115,10 @@ $(Version) + + amd64 + aarch64 + $(SdkBrandName) @@ -133,6 +131,27 @@ + + + + + + + + + + + + + + + + @@ -186,6 +205,12 @@ SkipUnchangedFiles="False" UseHardlinksIfPossible="False"/> + + $(ArtifactsShippingPackagesDir)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(SdkRPMInstallerFile) $(ArtifactsShippingPackagesDir)$(MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) + $(ArtifactsShippingPackagesDir)$(Mariner2ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(RepoRoot)/Documentation/manpages $(RepoRoot)/test/EndToEnd/EndToEnd.csproj diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 01f704c7d..a99a7e9da 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -39,8 +39,15 @@ Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid) - $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(Architecture) - $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.1-$(Architecture) + + $(Architecture) + aarch64 + + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(InstallerTargetArchitecture) + + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.1-$(InstallerTargetArchitecture) + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.2-$(InstallerTargetArchitecture) + diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json index ed3ccbfeb..1a9d84999 100644 --- a/src/redist/targets/packaging/rpm/dotnet-config.json +++ b/src/redist/targets/packaging/rpm/dotnet-config.json @@ -14,7 +14,7 @@ "changelog_message": "Bootstrap loop package" }, "control": { - "architecture": "amd64" + "architecture": "%SDK_RPM_PACKAGE_ARCHITECTURE%" }, "copyright": ".NET Foundation and contributors", "license": { @@ -34,10 +34,7 @@ "package_name": "%NETCORE_APPHOST_PACK_RPM_PACKAGE_NAME%", "package_version": "%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%" }, - { - "package_name": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%", - "package_version": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%" - }, +%SDK_RPM_NETSTANDARD_TARGETINGPACK_DEPENDENCY% { "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%", "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" From 8c85e40f17df0c39eef28605d1d20a71f2b6ecc7 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 27 Apr 2022 14:57:58 -0700 Subject: [PATCH 407/462] Add a direct reference to a newer version of this package --- .../Microsoft.DotNet.Tools.Tests.Utilities.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index fb083d8a5..04fed4562 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -7,5 +7,7 @@ + + \ No newline at end of file From d501d432bbe8a169049c593e653b84d6918c6044 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 2 May 2022 17:35:45 +0000 Subject: [PATCH 408/462] Merged PR 22598: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220502.6 - **Date Produced**: May 2, 2022 4:54:18 PM UTC - **Commit**: 1a8f1baf45ee888efa9607571f2c4c649900fc4a - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.300-rtm.22221.4 to 6.0.300-rtm.22252.6][2] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.300-rtm.22221.4 to 6.0.300-rtm.22252.6][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.5 to 6.0.5][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22215.11 to 6.0.5-servicing.22227.2][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.5-servicing.22215.11 to 6.0.5-servicing.22227.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.4-servicing.22164.7 to 6.0.5-servicing.22214.3][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.5-servicing.22215.9 to 6.0.5-servicing.22215.11][5] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCac00abe&targetVersion=GC1a8f1ba&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCad94063&targetVersion=GC65aaba1&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC0c636f9&targetVersion=GCa59b5f3&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC14bf2e5&targetVersion=GC89dcce8&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.5-servicing.22215.11 to 6.0.5-servicing.22227.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.5-servicing.22215.11 to 6.0.5-servicing.22227.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.4-servicing.22164.7 to 6.0.... --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3e42736a6..5dc437491 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,8 @@ + + @@ -15,13 +17,17 @@ + + + + - + @@ -41,13 +47,17 @@ + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1eafa497a..7d5754ae3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad940638f459efe0d17d60ccf52454a32ea7e561 + 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad940638f459efe0d17d60ccf52454a32ea7e561 + 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad940638f459efe0d17d60ccf52454a32ea7e561 + 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad940638f459efe0d17d60ccf52454a32ea7e561 + 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac00abef032d4d576a844d7f1287119a9d20166e + 1a8f1baf45ee888efa9607571f2c4c649900fc4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac00abef032d4d576a844d7f1287119a9d20166e + 1a8f1baf45ee888efa9607571f2c4c649900fc4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee + a59b5f3bcf2013b0681089930dd18c65f33ec202 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b + 89dcce82c0690a9ac94a83594d714e53957a395d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index c2eb24464..c7e0a3494 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.4-servicing.22164.7 + 6.0.5-servicing.22214.3 - 6.0.5-servicing.22215.9 + 6.0.5-servicing.22215.11 @@ -56,8 +56,8 @@ - 6.0.300-rtm.22221.4 - 6.0.300-rtm.22221.4 + 6.0.300-rtm.22252.6 + 6.0.300-rtm.22252.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.5-servicing.22215.11 - 6.0.5-servicing.22215.11 + 6.0.5-servicing.22227.2 + 6.0.5-servicing.22227.2 6.0.5 6.0.5 From 53fd800db005f06233e5c6fbe9c9550a9948eea0 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 3 May 2022 10:25:02 -0700 Subject: [PATCH 409/462] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx' (#13734) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220419.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22219.1 * Remove sha from source tarball repo dir names (#13726) * Update smoke-test prereq artifact to include architecture (#13725) Co-authored-by: dotnet-maestro[bot] Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Michael Simons --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- src/SourceBuild/tarball/content/build.proj | 2 +- src/SourceBuild/tarball/content/repos/Directory.Build.props | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 76297fd3b..ff9296640 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -119,7 +119,7 @@ - $(SourceBuildRepoName).$(RepoSha)/ + $(SourceBuildRepoName)/ $(TarballSourceDir)$(SourceDir) $(TarballSourceDir)$(SourceDir)eng/ $(TarballRepoSourceEngDir)Version.Details.xml diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 52c3341e0..5976d8446 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -189,7 +189,7 @@ - $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).tar.gz + $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(BuildArchitecture).tar.gz $(ResultingPrebuiltPackagesDir) diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index e61a6e689..100183a09 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -11,7 +11,7 @@ $(RepositoryName) - $(SubmoduleDirectory)$(SourceDirectory).$(GitCommitHash)/ + $(SubmoduleDirectory)$(SourceDirectory)/ true $(LoggingDir)$(RepositoryName).log >> $(RepoConsoleLogFile) 2>&1 From f0b493ed4338ef5e349819c647ce0fb4f0d27a4e Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 May 2022 10:28:24 -0700 Subject: [PATCH 410/462] Update branding to 6.0.301 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4b4ef5512..f800c1c27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rtm $(VersionMajor).$(VersionMinor) From 1380480834a9d824129c8d47d18c0d5a2c778d21 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 May 2022 20:09:42 +0000 Subject: [PATCH 411/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220509.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22259.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 5dc437491..30bdcf255 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,6 @@ - @@ -57,7 +56,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d5754ae3..60aef3b63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - 60845bf36f0dd6dd310070548a58cb8ad3ab513c + b1f5e7bc4d52db0031868cdd5e90b76118c2c31a From e0d981b70dd29535c779536d37ce25f3ef238c5b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 May 2022 20:11:07 +0000 Subject: [PATCH 412/462] Update dependencies from https://github.com/dotnet/arcade build 20220504.3 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22212.5 -> To Version 6.0.0-beta.22254.3 --- NuGet.config | 2 -- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5dc437491..30bdcf255 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,6 @@ - @@ -57,7 +56,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d5754ae3..312ef482c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 0048b6ab1..c62c3a7fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22212.5 + 6.0.0-beta.22254.3 diff --git a/global.json b/global.json index b645142d3..c751a7b2d 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.22212.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22254.3" } } From c9abd25c045fa0751b17267515d7cff68742ad0e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 12 May 2022 16:42:14 +0000 Subject: [PATCH 413/462] Merged PR 22627: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Net.Compilers.Toolset**: from 4.2.0-4.22220.2 to 4.2.0-4.22220.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220511.2 - **Date Produced**: May 11, 2022 9:45:42 AM UTC - **Commit**: 07c36a7706dfa2b3775da973646c86f1da485a8b - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.300-rtm.22252.6 to 6.0.301-rtm.22261.2][11] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.300-rtm.22252.6 to 6.0.301-rtm.22261.2][11] - **Microsoft.Net.Compilers.Toolset**: [from 4.2.0-4.22220.2 to 4.2.0-4.22220.5][12] [11]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1a8f1ba&targetVersion=GC07c36a7&_a=files [12]: https://github.com/dotnet/roslyn/compare/1e40aa1...432d17a [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 d049dc4ce..8ae20890d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1a8f1baf45ee888efa9607571f2c4c649900fc4a + 07c36a7706dfa2b3775da973646c86f1da485a8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1a8f1baf45ee888efa9607571f2c4c649900fc4a + 07c36a7706dfa2b3775da973646c86f1da485a8b @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 1e40aa11ca0b522e201320f70d469de40f211b2c + 432d17a83aa5623e4581756f4d642997048056bd diff --git a/eng/Versions.props b/eng/Versions.props index c62c3a7fa..bada13902 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-rtm.22252.6 - 6.0.300-rtm.22252.6 + 6.0.301-rtm.22261.2 + 6.0.301-rtm.22261.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e20e768bfdc0888c02c215a4d988dc3a4c55b634 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 12 May 2022 17:05:55 +0000 Subject: [PATCH 414/462] Merged PR 22878: [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages This pull request updates the following dependencies [marker]: <> (Begin:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) ## From https://github.com/dotnet/source-build-reference-packages - **Subscription**: 4fe19a4b-6691-493a-bfdf-08da32c0fb1e - **Build**: 20220512.1 - **Date Produced**: May 12, 2022 2:06:41 PM UTC - **Commit**: 07eecddb8505ad0dccb6ff6f23379d6b67aedc64 - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22259.1 to 6.0.0-servicing.22262.1][1] [1]: https://github.com/dotnet/source-build-reference-packages/compare/b1f5e7b...07eecdd [DependencyUpdate]: <> (End) [marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) --- NuGet.config | 3 --- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 30bdcf255..284909916 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,9 +22,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ae20890d..bea7c41e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 5fdd5b6c08c6c39edf12001400a11786c03b3e35 - + https://github.com/dotnet/source-build-reference-packages - b1f5e7bc4d52db0031868cdd5e90b76118c2c31a + 07eecddb8505ad0dccb6ff6f23379d6b67aedc64 From 3ba5fa513263d941be88641f27463a0e3d1df23f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 12 May 2022 20:04:33 +0000 Subject: [PATCH 415/462] Merged PR 22879: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade This pull request updates the following dependencies [marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934) ## From https://github.com/dotnet/arcade - **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934 - **Build**: 20220511.7 - **Date Produced**: May 11, 2022 5:34:05 PM UTC - **Commit**: e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.22254.3 to 6.0.0-beta.22261.7][1] - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.22254.3 to 6.0.0-beta.22261.7][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.22254.3 to 6.0.0-beta.22261.7][1] [1]: https://github.com/dotnet/arcade/compare/5fdd5b6...e3cbecc [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 6.0.105 [marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934) --- NuGet.config | 6 ------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 284909916..44bb1133f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -42,9 +39,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bea7c41e2..591badacb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index bada13902..305b5eda5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22254.3 + 6.0.0-beta.22261.7 diff --git a/global.json b/global.json index c751a7b2d..de4424c2a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.104", + "dotnet": "6.0.105", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22254.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22261.7" } } From e3c78bf16d09be5a4493509ad78b7b2cab6482c3 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Fri, 13 May 2022 14:24:38 -0700 Subject: [PATCH 416/462] [6.0.3xx] Update template versions from dotnet/aspnetcore (#13840) --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index fcf6c3e03..a529f79d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.16 + 5.0.17 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.24 + 3.1.25 3.2.1 4.8.0-rc2.19462.10 @@ -144,7 +144,7 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.22207.1 - 2.1.30 + 2.1.34 From f477fd69d25a11d563524a15959a2102eb1e3c92 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 16 May 2022 18:14:23 +0000 Subject: [PATCH 417/462] Merged PR 22884: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.5-servicing.22227.2 to 6.0.6-servicing.22260.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.5-servicing.22227.2 to 6.0.6-servicing.22260.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22255.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22255.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.5-servicing.22214.3 to 6.0.6-servicing.22255.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.5-servicing.22215.11 to 6.0.6-servicing.22255.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8... --- NuGet.config | 12 +++---- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 3 files changed, 66 insertions(+), 66 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44bb1133f..3c5e1c788 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -14,13 +15,12 @@ - - - + + @@ -39,14 +39,14 @@ + - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 591badacb..99445d605 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee + bc63032a084340c7ac42b47fecb9dc0b4d0c9373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee + bc63032a084340c7ac42b47fecb9dc0b4d0c9373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee + bc63032a084340c7ac42b47fecb9dc0b4d0c9373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee + bc63032a084340c7ac42b47fecb9dc0b4d0c9373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 07c36a7706dfa2b3775da973646c86f1da485a8b + a78ea1e97e04406618daaa48309d1c05336ca0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 07c36a7706dfa2b3775da973646c86f1da485a8b + a78ea1e97e04406618daaa48309d1c05336ca0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a59b5f3bcf2013b0681089930dd18c65f33ec202 + 83daf50cbdf69c702829df567ac0d737007083ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 89dcce82c0690a9ac94a83594d714e53957a395d + 736757c0193667dc19c6d9d132d93a52cc8e4805 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 553e1626d..0158d3754 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.5-servicing.22214.3 + 6.0.6-servicing.22255.2 - 6.0.5-servicing.22215.11 + 6.0.6-servicing.22255.5 @@ -44,20 +44,20 @@ - 6.0.5 - 6.0.5 - 6.0.5-servicing.22218.2 - 6.0.5-servicing.22218.2 - 6.0.5-servicing.22218.2 - 6.0.5-servicing.22218.2 + 6.0.6 + 6.0.6 + 6.0.6-servicing.22260.10 + 6.0.6-servicing.22260.10 + 6.0.6-servicing.22260.10 + 6.0.6-servicing.22260.10 0.2.0 - 6.0.301-rtm.22261.2 - 6.0.301-rtm.22261.2 + 6.0.301-rtm.22262.4 + 6.0.301-rtm.22262.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.5-servicing.22213.9 - 6.0.5-servicing.22213.9 - 6.0.5 - 6.0.5 - 6.0.5 - 6.0.5 + 6.0.6-servicing.22255.10 + 6.0.6-servicing.22255.10 + 6.0.6 + 6.0.6 + 6.0.6 + 6.0.6 2.1.0 - 6.0.5-servicing.22227.2 - 6.0.5-servicing.22227.2 - 6.0.5 - 6.0.5 + 6.0.6-servicing.22260.6 + 6.0.6-servicing.22260.6 + 6.0.6 + 6.0.6 From 35b5a8783dd44f8cae8b7d7c240eae85ab95fa39 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 17 May 2022 16:49:13 +0000 Subject: [PATCH 418/462] Merged PR 22971: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **NuGet.Build.Tasks**: from 6.2.0-rc.146 to 6.2.1-rc.2 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220516.33 - **Date Produced**: May 16, 2022 10:53:49 PM UTC - **Commit**: 0ffb32f6130125c44acbd6fbc314d9c9e34c7c0c - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.301-rtm.22262.4 to 6.0.301-rtm.22266.33][5] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.301-rtm.22262.4 to 6.0.301-rtm.22266.33][5] - **NuGet.Build.Tasks**: [from 6.2.0-rc.146 to 6.2.1-rc.2][6] [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa78ea1e&targetVersion=GC0ffb32f&_a=files [6]: https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted/branches?baseVersion=GCb8a6126&targetVersion=GCa8942f4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 1 - eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3c5e1c788..7167859ca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99445d605..b7a5c89e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a78ea1e97e04406618daaa48309d1c05336ca0ed + 0ffb32f6130125c44acbd6fbc314d9c9e34c7c0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a78ea1e97e04406618daaa48309d1c05336ca0ed + 0ffb32f6130125c44acbd6fbc314d9c9e34c7c0c @@ -151,9 +151,9 @@ 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b - - https://github.com/nuget/nuget.client - b8a61266d9a6780cb7eb9c1942695cf813fdef0a + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + a8942f45835ba527cedacc02f7a75468f7a7b4bd diff --git a/eng/Versions.props b/eng/Versions.props index 0158d3754..bab7a0320 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.301-rtm.22262.4 - 6.0.301-rtm.22262.4 + 6.0.301-rtm.22266.33 + 6.0.301-rtm.22266.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3b5b37d71d98b37d55c5778f6e08072100376d79 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 18 May 2022 16:15:17 +0000 Subject: [PATCH 419/462] Merged PR 23016: [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages This pull request updates the following dependencies [marker]: <> (Begin:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) ## From https://github.com/dotnet/source-build-reference-packages - **Subscription**: 4fe19a4b-6691-493a-bfdf-08da32c0fb1e - **Build**: 20220518.1 - **Date Produced**: May 18, 2022 2:03:24 PM UTC - **Commit**: 8ea40b4e4a381b819a7f9946e72d036f37cb75d4 - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22262.1 to 6.0.0-servicing.22268.1][1] [1]: https://github.com/dotnet/source-build-reference-packages/compare/07eecdd...8ea40b4 [DependencyUpdate]: <> (End) [marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) --- 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 b7a5c89e8..50c2b0c6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/source-build-reference-packages - 07eecddb8505ad0dccb6ff6f23379d6b67aedc64 + 8ea40b4e4a381b819a7f9946e72d036f37cb75d4 From cc7da5b9f3cc9a537b4b2553b4a73f5ff2a952d3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 18 May 2022 21:57:33 +0000 Subject: [PATCH 420/462] Merged PR 23001: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22260.6 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22260.6 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22267.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22267.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22255.2 to 6.0.6-servicing.22266.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22255.5 to 6.0.6-servicing.22267.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## Fro... --- NuGet.config | 12 ++-- eng/Version.Details.xml | 68 +++++++++---------- eng/Versions.props | 26 +++---- .../0007-WebHost-delegate-nullability.patch | 6 +- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7167859ca..9f25c4eaa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,19 @@ - + - + - + @@ -38,14 +38,14 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50c2b0c6a..29a2d4088 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bc63032a084340c7ac42b47fecb9dc0b4d0c9373 + 9d7c7030992e13a9b810b19e79de56759a78d6bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bc63032a084340c7ac42b47fecb9dc0b4d0c9373 + 9d7c7030992e13a9b810b19e79de56759a78d6bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bc63032a084340c7ac42b47fecb9dc0b4d0c9373 + 9d7c7030992e13a9b810b19e79de56759a78d6bc https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bc63032a084340c7ac42b47fecb9dc0b4d0c9373 + 9d7c7030992e13a9b810b19e79de56759a78d6bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 7cca709db2944a09b4db6ca7b20c457ff260fb5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 7cca709db2944a09b4db6ca7b20c457ff260fb5a @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09f40738cea0abc19e06851eb2180e4724870288 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09f40738cea0abc19e06851eb2180e4724870288 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09f40738cea0abc19e06851eb2180e4724870288 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09f40738cea0abc19e06851eb2180e4724870288 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09f40738cea0abc19e06851eb2180e4724870288 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09f40738cea0abc19e06851eb2180e4724870288 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ffb32f6130125c44acbd6fbc314d9c9e34c7c0c + 18fa0e2cef6a75a06aeda90a542cb7a3c8643c76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ffb32f6130125c44acbd6fbc314d9c9e34c7c0c + 18fa0e2cef6a75a06aeda90a542cb7a3c8643c76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 83daf50cbdf69c702829df567ac0d737007083ca + 7acd4abcc9c6a4268b2b52e7f64e27b614431a29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 736757c0193667dc19c6d9d132d93a52cc8e4805 + e36f1456f1c6aff57150a30ac06f3cceaf2b2785 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index bab7a0320..b0b5c1eba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.6-servicing.22255.2 + 6.0.6-servicing.22266.9 - 6.0.6-servicing.22255.5 + 6.0.6-servicing.22267.2 @@ -46,30 +46,30 @@ 6.0.6 6.0.6 - 6.0.6-servicing.22260.10 - 6.0.6-servicing.22260.10 - 6.0.6-servicing.22260.10 - 6.0.6-servicing.22260.10 + 6.0.6-servicing.22267.6 + 6.0.6-servicing.22267.6 + 6.0.6-servicing.22267.6 + 6.0.6-servicing.22267.6 0.2.0 - 6.0.301-rtm.22266.33 - 6.0.301-rtm.22266.33 + 6.0.301-rtm.22268.5 + 6.0.301-rtm.22268.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.3 + 6.0.4 - 6.0.6-servicing.22255.10 - 6.0.6-servicing.22255.10 + 6.0.6-servicing.22267.7 + 6.0.6-servicing.22267.7 6.0.6 6.0.6 6.0.6 @@ -78,8 +78,8 @@ - 6.0.6-servicing.22260.6 - 6.0.6-servicing.22260.6 + 6.0.6-servicing.22267.5 + 6.0.6-servicing.22267.5 6.0.6 6.0.6 diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch index 426502e86..cf15d1bfc 100644 --- a/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch +++ b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch @@ -24,14 +24,14 @@ index ca52bd1f40..643d03e8af 100644 // 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); +- => 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); +- => services.GetService()! as AspNetCore.Hosting.IApplicationLifetime); - _applicationServiceCollection.AddSingleton(services -- => services.GetService() as Extensions.Hosting.IApplicationLifetime); +- => services.GetService()! as Extensions.Hosting.IApplicationLifetime); + _applicationServiceCollection.AddSingleton(services + => services.GetService()!); + _applicationServiceCollection.AddSingleton(services From 5652727602473e7fc11da393f5a0d9ee3331d989 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 19 May 2022 14:27:48 +0000 Subject: [PATCH 421/462] Merged PR 23034: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22267.5 to 6.0.6-servicing.22268.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22267.5 to 6.0.6-servicing.22268.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22266.9 to 6.0.6-servicing.22267.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22267.2 to 6.0.6-servicing.22268.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220518.19 - **Date Produced**: May 18, 2022 10:26:37 PM UTC - **Commit**: ff8b54790e2848932bc93233ea19f8dcd2e7c26f - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.301-rtm.22268.5 to 6.0.301-rtm.22268.19][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.301-rtm.22268.5 to 6.0.301-rtm.22268.19][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.6 to 6.0.6][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.6-servicing.22267.5 to 6.0.6-servicing.22268.6][2] - **VS.Redist.Co... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9f25c4eaa..f50bca67f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -38,14 +38,14 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29a2d4088..3d9d00946 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9d7c7030992e13a9b810b19e79de56759a78d6bc + 7d10adc397690db6f5c73da866aa443232ff1c88 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9d7c7030992e13a9b810b19e79de56759a78d6bc + 7d10adc397690db6f5c73da866aa443232ff1c88 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9d7c7030992e13a9b810b19e79de56759a78d6bc + 7d10adc397690db6f5c73da866aa443232ff1c88 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9d7c7030992e13a9b810b19e79de56759a78d6bc + 7d10adc397690db6f5c73da866aa443232ff1c88 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18fa0e2cef6a75a06aeda90a542cb7a3c8643c76 + ff8b54790e2848932bc93233ea19f8dcd2e7c26f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18fa0e2cef6a75a06aeda90a542cb7a3c8643c76 + ff8b54790e2848932bc93233ea19f8dcd2e7c26f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7acd4abcc9c6a4268b2b52e7f64e27b614431a29 + 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e36f1456f1c6aff57150a30ac06f3cceaf2b2785 + dabcf2041548f7594b21e9bf865463abdfd14307 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b0b5c1eba..ccd89551d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.6-servicing.22266.9 + 6.0.6-servicing.22267.5 - 6.0.6-servicing.22267.2 + 6.0.6-servicing.22268.4 @@ -46,18 +46,18 @@ 6.0.6 6.0.6 - 6.0.6-servicing.22267.6 - 6.0.6-servicing.22267.6 - 6.0.6-servicing.22267.6 - 6.0.6-servicing.22267.6 + 6.0.6-servicing.22268.5 + 6.0.6-servicing.22268.5 + 6.0.6-servicing.22268.5 + 6.0.6-servicing.22268.5 0.2.0 - 6.0.301-rtm.22268.5 - 6.0.301-rtm.22268.5 + 6.0.301-rtm.22268.19 + 6.0.301-rtm.22268.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.6-servicing.22267.5 - 6.0.6-servicing.22267.5 + 6.0.6-servicing.22268.6 + 6.0.6-servicing.22268.6 6.0.6 6.0.6 From 12e2f27948230453068b06b21b3e7af3d4931cbc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 23 May 2022 22:47:27 +0000 Subject: [PATCH 422/462] Merged PR 23125: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220523.19 - **Date Produced**: May 23, 2022 10:07:58 PM UTC - **Commit**: 04bbbea262152499d549062f6763ff36daa65e75 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.301-rtm.22268.19 to 6.0.301-rtm.22273.19][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.301-rtm.22268.19 to 6.0.301-rtm.22273.19][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCff8b547&targetVersion=GC04bbbea&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 3d9d00946..c9a76a23c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ff8b54790e2848932bc93233ea19f8dcd2e7c26f + 04bbbea262152499d549062f6763ff36daa65e75 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ff8b54790e2848932bc93233ea19f8dcd2e7c26f + 04bbbea262152499d549062f6763ff36daa65e75 diff --git a/eng/Versions.props b/eng/Versions.props index ccd89551d..5ae0b2bef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.301-rtm.22268.19 - 6.0.301-rtm.22268.19 + 6.0.301-rtm.22273.19 + 6.0.301-rtm.22273.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2cd1eed21f146e37527ff93e547ad89214c5e759 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 24 May 2022 15:40:53 -0700 Subject: [PATCH 423/462] Revert "Remove 16.04 ubuntu legs and old docker files." (#13862) --- .vsts-ci.yml | 9 ++++- eng/docker/ubuntu.16.04/Dockerfile | 65 ++++++++++++++++++++++++++++++ eng/docker/ubuntu.16.10/Dockerfile | 64 +++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 eng/docker/ubuntu.16.04/Dockerfile create mode 100644 eng/docker/ubuntu.16.10/Dockerfile diff --git a/.vsts-ci.yml b/.vsts-ci.yml index a637ba1b3..135fbbf1e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -156,6 +156,13 @@ stages: strategy: matrix: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_16_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.16.04' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) Build_Ubuntu_18_04_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker ubuntu.18.04' @@ -290,7 +297,7 @@ stages: _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' Build_Linux_Portable_Deb_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker ubuntu.18.04' + _DockerParameter: '--docker ubuntu.16.04' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' diff --git a/eng/docker/ubuntu.16.04/Dockerfile b/eng/docker/ubuntu.16.04/Dockerfile new file mode 100644 index 000000000..c58504613 --- /dev/null +++ b/eng/docker/ubuntu.16.04/Dockerfile @@ -0,0 +1,65 @@ +# +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# + +FROM ubuntu:16.04 + +# Install the base toolchain we need to build anything (clang, cmake, make and the like) +# this does not include libraries that we need to compile different projects, we'd like +# them in a different layer. +RUN rm -rf rm -rf /var/lib/apt/lists/* && \ + apt-get clean && \ + apt-get update && \ + apt-get install -y cmake \ + make \ + llvm-3.5 \ + clang-3.5 \ + git \ + curl \ + tar \ + sudo && \ + apt-get clean + +# Install Build Prereqs +RUN apt-get -qqy install \ + debhelper \ + build-essential \ + devscripts && \ + apt-get clean + +# Dependencies for CoreCLR and CoreFX +RUN apt-get install -y libunwind8 \ + libkrb5-3 \ + libicu55 \ + liblttng-ust0 \ + libssl1.0.0 \ + zlib1g \ + libuuid1 \ + liblldb-3.6 && \ + apt-get clean + +# Setup User to match Host User, and give superuser permissions +ARG USER_ID=0 +RUN useradd -m code_executor -u ${USER_ID} -g sudo +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permissions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home +RUN chmod -R 755 /usr/lib/sudo + +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} + +# Set up Azure Artifacts credential provider. +# We download the installer and execute it using ${USER_ID} so that the installer +# put the NuGet plugins in the correct $HOME/.nuget folder. +RUN curl -O https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh +RUN chmod +x ./installcredprovider.sh + +# Set user to the one we just created +USER ${USER_ID} + +RUN ./installcredprovider.sh diff --git a/eng/docker/ubuntu.16.10/Dockerfile b/eng/docker/ubuntu.16.10/Dockerfile new file mode 100644 index 000000000..0497a6fb5 --- /dev/null +++ b/eng/docker/ubuntu.16.10/Dockerfile @@ -0,0 +1,64 @@ +# +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# + +# Dockerfile that creates a container suitable to build dotnet-cli +FROM ubuntu:16.10 + +# Misc Dependencies for build +RUN apt-get update && \ + apt-get -qqy install \ + curl \ + unzip \ + gettext \ + sudo && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib) +RUN apt-get update && \ + apt-get -qqy install \ + libunwind8 \ + libkrb5-3 \ + libicu57 \ + liblttng-ust0 \ + libssl1.0.0 \ + zlib1g \ + libuuid1 \ + liblldb-3.5 && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +# Install Build Prereqs +RUN apt-get update && \ + apt-get -qqy install \ + debhelper \ + build-essential \ + devscripts \ + git \ + cmake \ + clang-3.5 && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +# Use clang as c++ compiler +RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 +RUN update-alternatives --set c++ /usr/bin/clang++-3.5 + +# Setup User to match Host User, and give superuser permissions +ARG USER_ID=0 +RUN useradd -m code_executor -u ${USER_ID} -g sudo +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permissions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home +RUN chmod -R 755 /usr/lib/sudo + +# Set user to the one we just created +USER ${USER_ID} + +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} \ No newline at end of file From 4ab869cbcb716afc2e46f1a13cc8be99f550f15e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 25 May 2022 00:18:22 +0000 Subject: [PATCH 424/462] Merged PR 23174: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.FSharp.Compiler**: from 12.0.3-beta.22219.3 to 12.0.4-beta.22274.4 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 6.0.4-beta.22219.3 to 6.0.5-beta.22274.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220524.11 - **Date Produced**: May 24, 2022 11:44:49 PM UTC - **Commit**: 8daa5f75dfc7592e30e28e71d448621d12442893 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.301-rtm.22273.19 to 6.0.301-rtm.22274.11][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.301-rtm.22273.19 to 6.0.301-rtm.22274.11][1] - **Microsoft.FSharp.Compiler**: [from 12.0.3-beta.22219.3 to 12.0.4-beta.22274.4][2] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 6.0.4-beta.22219.3 to 6.0.5-beta.22274.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC04bbbea&targetVersion=GC8daa5f7&_a=files [2]: https://github.com/dotnet/fsharp/compare/8854f5d...211fd76 [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 c9a76a23c..0500c8180 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04bbbea262152499d549062f6763ff36daa65e75 + 8daa5f75dfc7592e30e28e71d448621d12442893 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04bbbea262152499d549062f6763ff36daa65e75 + 8daa5f75dfc7592e30e28e71d448621d12442893 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf dabcf2041548f7594b21e9bf865463abdfd14307 - + https://github.com/dotnet/fsharp - 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 + 211fd760c2315d73cfa0d375fe64abb346bc1096 - + https://github.com/dotnet/fsharp - 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 + 211fd760c2315d73cfa0d375fe64abb346bc1096 diff --git a/eng/Versions.props b/eng/Versions.props index 5ae0b2bef..053adef12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.301-rtm.22273.19 - 6.0.301-rtm.22273.19 + 6.0.301-rtm.22274.11 + 6.0.301-rtm.22274.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 345034987c6c27efdeeb7c63b957d100bfd15503 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 25 May 2022 07:21:17 -0700 Subject: [PATCH 425/462] Update pre-release label to servicing --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a529f79d1..15557a298 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 3 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + servicing $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 8845807f72799e15d09e7c1a306ad903983eedb0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 27 May 2022 10:22:17 -0700 Subject: [PATCH 426/462] Update GenerateBundledVersions.targets --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index f311e197b..96fa6035b 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -27,7 +27,7 @@ 30 $([MSBuild]::Add($(VersionFeature), 25)) - $([MSBuild]::Add($(VersionFeature), 17)) + 17 From 9988564da99eb1d42b88b99f0c750a56c8142d81 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Jun 2022 10:00:18 -0700 Subject: [PATCH 427/462] Update branding to 6.0.302 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a529f79d1..ebdbb0634 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rtm $(VersionMajor).$(VersionMinor) From 17c1d67be5da71b1c385a6155e9181f26ec7eb3c Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 9 Jun 2022 12:57:38 -0500 Subject: [PATCH 428/462] [release/6.0.3xx] Handle NuGet package source mapping in source-build tasks. (#13733) --- .../job/source-build-run-tarball-build.yml | 12 +-- .../content/repos/Directory.Build.targets | 31 +++++-- ...UpdateNuGetConfigPackageSourcesMappings.cs | 91 +++++++++++++++++++ ...ild-and-Microsoft.Extensions.Command.patch | 33 +++++++ 4 files changed, 155 insertions(+), 12 deletions(-) create mode 100644 src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Pin-Microsoft.Build-and-Microsoft.Extensions.Command.patch 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 c8a0a71f1..2cf4ad628 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 @@ -44,13 +44,13 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: true - CentOS7-Offline: - _BootstrapPrep: false - _Container: ${{ parameters.centOS7Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: true - _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + CentOS7-Offline: + _BootstrapPrep: false + _Container: ${{ parameters.centOS7Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false CentOS8-Offline: _BootstrapPrep: false _Container: ${{ parameters.centOS8Container }} diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index ab338c52e..b52e87c52 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -11,6 +11,7 @@ + @@ -176,6 +177,19 @@ Condition="'$(NuGetConfigFile)' != '' OR '@(NuGetConfigFiles)' != ''" Inputs="$(MSBuildProjectFullPath)" Outputs="$(RepoCompletedSemaphorePath)UpdateNuGetConfig.complete"> + + + prebuilt + previously-source-built + reference-packages + source-built + ExtraSources + dotnet5-internal-transport + $(PrebuiltNuGetSourceName);$(PreviouslySourceBuiltNuGetSourceName);$(ReferencePackagesNuGetSourceName);$(SourceBuiltNuGetSourceName) + $(SourceBuildSources);$(ExtraSourcesNuGetSourceName) + $(SourceBuildSources);$(DotNet5InternalTransportNuGetSourceName) + + @@ -187,26 +201,26 @@ KeepFeedPrefixes="@(KeepFeedPrefixes)" /> @@ -219,9 +233,14 @@ '$(VSS_NUGET_EXTERNAL_FEED_ENDPOINTS)' != '' and '$(SetUpInternalTransportFeed)' == 'true'" NuGetConfigFile="%(NuGetConfigFiles.Identity)" - SourceName="dotnet5-internal-transport" + SourceName="$(DotNet5InternalTransportNuGetSourceName)" SourcePath="https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json" /> + + + /// Whether to work in offline mode (remove all internet sources) or online mode (remove only authenticated sources) + /// + public bool BuildWithOnlineSources { get; set; } + + /// + /// A list of all source-build specific NuGet sources. + /// + public string[] SourceBuildSources { get; set; } + + public override bool Execute() + { + string xml = File.ReadAllText(NuGetConfigFile); + string newLineChars = FileUtilities.DetectNewLineChars(xml); + XDocument document = XDocument.Parse(xml); + XElement pkgSrcMappingElement = document.Root.Descendants().FirstOrDefault(e => e.Name == "packageSourceMapping"); + + if (pkgSrcMappingElement == null) + { + return true; + } + + // Union all package sources to get the distinct list. These will get added to the source-build sources. + IEnumerable packagePatterns = pkgSrcMappingElement.Descendants() + .Where(e => e.Name == "packageSource") + .SelectMany(e => e.Descendants().Where(e => e.Name == "package")) + .Select(e => e.Attribute("pattern").Value) + .Distinct(); + + if (!BuildWithOnlineSources) + { + // When building offline remove all packageSourceMappings. + pkgSrcMappingElement?.ReplaceNodes(new XElement("clear")); + } + + XElement pkgSrcMappingClearElement = pkgSrcMappingElement.Descendants().FirstOrDefault(e => e.Name == "clear"); + + foreach (string packageSource in SourceBuildSources) + { + XElement pkgSrc = new XElement("packageSource", new XAttribute("key", packageSource)); + foreach (string packagePattern in packagePatterns) + { + pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern))); + } + + if (pkgSrcMappingClearElement != null) + { + pkgSrcMappingClearElement.AddAfterSelf(pkgSrc); + } + else + { + pkgSrcMappingElement.AddFirst(pkgSrc); + pkgSrcMappingElement.AddFirst(new XElement("clear")); + } + } + + using (var writer = XmlWriter.Create(NuGetConfigFile, new XmlWriterSettings { NewLineChars = newLineChars, Indent = true })) + { + document.Save(writer); + } + + return true; + } + } +} diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Pin-Microsoft.Build-and-Microsoft.Extensions.Command.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Pin-Microsoft.Build-and-Microsoft.Extensions.Command.patch new file mode 100644 index 000000000..1d284c47e --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Pin-Microsoft.Build-and-Microsoft.Extensions.Command.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Wed, 11 May 2022 21:16:46 +0000 +Subject: [PATCH] Pin Microsoft.Build and + Microsoft.Extensions.CommandLineUtils.Sources versions in source-build + +Update package version reference to not pick up the source-build PVP versions and instead utilize SBRP versions +so that source-build builds closer to the normal repo build. +--- + build/packages.targets | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/packages.targets b/build/packages.targets +index 0ca4b1309..dc3db5b8e 100644 +--- a/build/packages.targets ++++ b/build/packages.targets +@@ -1,6 +1,6 @@ + + +- 16.8.0 ++ 16.8.0 + 13.0.1 + 3.0.0 + 4.5.0 +@@ -10,7 +10,7 @@ + 5.0.0 + 2.14.0-rtm-832 + 17.0.0-beta1-10402-05 +- 3.0.0-preview6.19253.5 ++ 3.0.0-preview6.19253.5 + + + From 28948923ce6ee6366fbda292696d440e0ad158e2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 10 Jun 2022 13:22:26 -0700 Subject: [PATCH 429/462] Update format of multiple /p parameters --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index a28265b3e..20ed99836 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -297,7 +297,7 @@ stages: _BuildArchitecture: 'x64' # Do not publish zips and tarballs. The linux-x64 binaries are # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false;BuildSdkDeb=true' + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_x64: _BuildConfig: Release From 85086602adc3280d9ad4752e91d45d14f5e54dc2 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 13 Jun 2022 18:26:28 -0400 Subject: [PATCH 430/462] [release/6.0.3xx] Add razor-compiler to Source Build (#13652) --- .../tarball/content/repos/known-good.proj | 1 + .../tarball/content/repos/razor-compiler.proj | 21 ++++++++++++++++++ .../tarball/content/repos/sdk.proj | 1 + ...lude-test-projects-from-source-build.patch | 21 ++++++++++++++++++ ...get-Razor-Syntax-Genreator-to-net6.0.patch | 22 +++++++++++++++++++ 5 files changed, 66 insertions(+) create mode 100644 src/SourceBuild/tarball/content/repos/razor-compiler.proj create mode 100644 src/SourceBuild/tarball/patches/razor-compiler/0001-Exclude-test-projects-from-source-build.patch create mode 100644 src/SourceBuild/tarball/patches/razor-compiler/0002-retarget-Razor-Syntax-Genreator-to-net6.0.patch diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index eab516290..001a16c01 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -34,6 +34,7 @@ + diff --git a/src/SourceBuild/tarball/content/repos/razor-compiler.proj b/src/SourceBuild/tarball/content/repos/razor-compiler.proj new file mode 100644 index 000000000..f47d22c98 --- /dev/null +++ b/src/SourceBuild/tarball/content/repos/razor-compiler.proj @@ -0,0 +1,21 @@ + + + + + $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) + + $(ProjectDirectory)global.json + $(ProjectDirectory)NuGet.config + false + + + + + + + + + + + + diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj index 9a26cd695..613ed2e26 100644 --- a/src/SourceBuild/tarball/content/repos/sdk.proj +++ b/src/SourceBuild/tarball/content/repos/sdk.proj @@ -39,6 +39,7 @@ + diff --git a/src/SourceBuild/tarball/patches/razor-compiler/0001-Exclude-test-projects-from-source-build.patch b/src/SourceBuild/tarball/patches/razor-compiler/0001-Exclude-test-projects-from-source-build.patch new file mode 100644 index 000000000..dded6ec2f --- /dev/null +++ b/src/SourceBuild/tarball/patches/razor-compiler/0001-Exclude-test-projects-from-source-build.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Wed, 13 Apr 2022 15:03:44 -0700 +Subject: [PATCH] Exclude test projects from source-build + +Backport PR: https://github.com/dotnet/razor-compiler/pull/226 +--- + src/test/Directory.Build.props | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/test/Directory.Build.props b/src/test/Directory.Build.props +index 95172906..047e4619 100644 +--- a/src/test/Directory.Build.props ++++ b/src/test/Directory.Build.props +@@ -8,5 +8,6 @@ + --> + true + false ++ true + + diff --git a/src/SourceBuild/tarball/patches/razor-compiler/0002-retarget-Razor-Syntax-Genreator-to-net6.0.patch b/src/SourceBuild/tarball/patches/razor-compiler/0002-retarget-Razor-Syntax-Genreator-to-net6.0.patch new file mode 100644 index 000000000..e101f8041 --- /dev/null +++ b/src/SourceBuild/tarball/patches/razor-compiler/0002-retarget-Razor-Syntax-Genreator-to-net6.0.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Thu, 14 Apr 2022 16:27:26 -0700 +Subject: [PATCH] retarget Razor Syntax Genreator to net6.0 + +Backport PR: https://github.com/dotnet/razor-compiler/pull/226 +--- + src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj b/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj +index 924379ac..362f0e3b 100644 +--- a/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj ++++ b/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj +@@ -3,6 +3,7 @@ + + Generates Razor syntax nodes from xml. For internal use only. + netcoreapp3.1 ++ net6.0 + dotnet-razorsyntaxgenerator + RazorSyntaxGenerator + Exe From 9a4017803e918c3344a53f6d562c30b375d9996a Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 14 Jun 2022 12:09:07 -0700 Subject: [PATCH 431/462] Update asp.net template (#13965) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ce2c31a77..e32fe0884 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.25 + 3.1.26 3.2.1 4.8.0-rc2.19462.10 From aac14e609b4d959e8783f52805218fca7226640a Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 14 Jun 2022 16:34:46 -0700 Subject: [PATCH 432/462] Add support for targeting Windows version 22621 and update Windows SDK projections. (#13976) --- eng/ManualVersions.props | 11 ++++++----- src/redist/targets/GenerateBundledVersions.targets | 1 + test/EndToEnd/GivenWindowsApp.cs | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 8543f5e5c..efb09817f 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,10 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.25 - 10.0.18362.25 - 10.0.19041.25 - 10.0.20348.25 - 10.0.22000.25 + 10.0.17763.26 + 10.0.18362.26 + 10.0.19041.26 + 10.0.20348.26 + 10.0.22000.26 + 10.0.22621.26 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 96fa6035b..840a2133b 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -673,6 +673,7 @@ Copyright (c) .NET Foundation. All rights reserved. /> + diff --git a/test/EndToEnd/GivenWindowsApp.cs b/test/EndToEnd/GivenWindowsApp.cs index bf2305953..59f28eee8 100644 --- a/test/EndToEnd/GivenWindowsApp.cs +++ b/test/EndToEnd/GivenWindowsApp.cs @@ -17,7 +17,8 @@ namespace EndToEnd [InlineData("10.0.18362.0")] [InlineData("10.0.19041.0")] [InlineData("10.0.20348.0")] - [InlineData("10.0.22000.0", Skip = "Package not published yet")] + [InlineData("10.0.22000.0")] + [InlineData("10.0.22621.0")] public void ItCanBuildAndRun(string targetPlatformVersion) { var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt") From 6f98d9441d219b7bd638144073a3441f224ee3d4 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 15 Jun 2022 17:56:07 -0500 Subject: [PATCH 433/462] Fixups to make the tarball committable (#13894) (#13994) --- .../Arcade/tools/SourceBuildArcadeTarball.targets | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index ff9296640..c4f3f6ec2 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -124,6 +124,7 @@ $(TarballSourceDir)$(SourceDir)eng/ $(TarballRepoSourceEngDir)Version.Details.xml -q + $(RepoUri) $(RepoUri.Replace('https://dev.azure.com', 'https://dn-bot:$(AzDoPat)@dev.azure.com')) @@ -175,10 +176,18 @@ Command="git submodule update --init --recursive --depth 1" WorkingDirectory="$(TarballRepoSourceDir)" /> + + + + From b5e20af6f571a6fe003184996f70541f9a1027cb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 20 Jun 2022 20:28:03 +0000 Subject: [PATCH 434/462] Merged PR 23310: [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages This pull request updates the following dependencies [marker]: <> (Begin:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) ## From https://github.com/dotnet/source-build-reference-packages - **Subscription**: 4fe19a4b-6691-493a-bfdf-08da32c0fb1e - **Build**: 20220614.1 - **Date Produced**: June 15, 2022 1:39:26 AM UTC - **Commit**: bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22268.1 to 6.0.0-servicing.22314.1][3] [3]: https://github.com/dotnet/source-build-reference-packages/compare/8ea40b4...bc3b0a4 [DependencyUpdate]: <> (End) [marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) --- NuGet.config | 22 ++++++++++++++++++++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index f50bca67f..604028977 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,10 @@ + + + + @@ -15,11 +19,18 @@ + + + + + + + @@ -38,13 +49,24 @@ + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0500c8180..d99555dd3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/source-build-reference-packages - 8ea40b4e4a381b819a7f9946e72d036f37cb75d4 + bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b From 3eff7cb90ae005b10a154b224fc689e959af3593 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 20 Jun 2022 22:39:55 +0000 Subject: [PATCH 435/462] Merged PR 23544: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade This pull request updates the following dependencies [marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934) ## From https://github.com/dotnet/arcade - **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934 - **Build**: 20220614.7 - **Date Produced**: June 14, 2022 8:03:55 PM UTC - **Commit**: fdd3a242bc813f371023adff4e4c05c0be705d2a - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.22261.7 to 6.0.0-beta.22314.7][1] - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.22261.7 to 6.0.0-beta.22314.7][1] - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.22261.7 to 6.0.0-beta.22314.7][1] [1]: https://github.com/dotnet/arcade/compare/e3cbecc...fdd3a24 [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 6.0.106 [marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d99555dd3..98b29c6b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - e3cbecc5b0e51374e3d71dbb976004ab9cc90430 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - e3cbecc5b0e51374e3d71dbb976004ab9cc90430 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - e3cbecc5b0e51374e3d71dbb976004ab9cc90430 + fdd3a242bc813f371023adff4e4c05c0be705d2a https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e121f07ce..81b56d1ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22261.7 + 6.0.0-beta.22314.7 diff --git a/global.json b/global.json index de4424c2a..80e9668ff 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.105", + "dotnet": "6.0.106", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22261.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22314.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22314.7" } } From e0cc63f11d71fe285544b127908b700da399f6aa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Jun 2022 23:43:34 +0000 Subject: [PATCH 436/462] Merged PR 23697: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.300 to 6.0.302 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.300-rtm.22215.5 to 6.0.302-servicing.22321.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.300 to 6.0.302 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22267.5 to 6.0.7-servicing.22322.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (pa... --- NuGet.config | 36 ++++---------- eng/Version.Details.xml | 102 ++++++++++++++++++++-------------------- eng/Versions.props | 46 +++++++++--------- 3 files changed, 82 insertions(+), 102 deletions(-) diff --git a/NuGet.config b/NuGet.config index 604028977..ec5638937 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,30 +7,20 @@ - - - - - + - - - - + + - - - - - + @@ -49,25 +39,15 @@ - - - - - + - - - - + + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98b29c6b8..14557e9a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 60a2f73de55434984bbe3d5ad9281b3863355b31 + 55a6352b57cb1d777e812cc149906533e8d393a3 - + https://github.com/dotnet/templating - 60a2f73de55434984bbe3d5ad9281b3863355b31 + 55a6352b57cb1d777e812cc149906533e8d393a3 - + https://github.com/dotnet/templating - 60a2f73de55434984bbe3d5ad9281b3863355b31 + 55a6352b57cb1d777e812cc149906533e8d393a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8daa5f75dfc7592e30e28e71d448621d12442893 + 5da87044239563a982a84a352f283621208d66f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8daa5f75dfc7592e30e28e71d448621d12442893 + 5da87044239563a982a84a352f283621208d66f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8 + 24977050704b627e631caf7b1ca4bcb0543f3ab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - dabcf2041548f7594b21e9bf865463abdfd14307 + 5063a17b211e70ca0ff6fed1b57e9d04727c25a8 https://github.com/dotnet/fsharp @@ -151,9 +151,9 @@ 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - a8942f45835ba527cedacc02f7a75468f7a7b4bd + + https://github.com/nuget/nuget.client + 4be14ee6b6587a02f05337505bd840fbcbe898f6 diff --git a/eng/Versions.props b/eng/Versions.props index 81b56d1ba..58f372aff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.6-servicing.22267.5 + 6.0.7-servicing.22322.3 - 6.0.6-servicing.22268.4 + 6.0.7-servicing.22322.2 - 6.0.300 + 6.0.302 @@ -44,44 +44,44 @@ - 6.0.6 - 6.0.6 - 6.0.6-servicing.22268.5 - 6.0.6-servicing.22268.5 - 6.0.6-servicing.22268.5 - 6.0.6-servicing.22268.5 + 6.0.7 + 6.0.7 + 6.0.7-servicing.22314.16 + 6.0.7-servicing.22314.16 + 6.0.7-servicing.22314.16 + 6.0.7-servicing.22314.16 0.2.0 - 6.0.301-rtm.22274.11 - 6.0.301-rtm.22274.11 + 6.0.302-servicing.22322.21 + 6.0.302-servicing.22322.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.4 + 6.0.5 - 6.0.6-servicing.22267.7 - 6.0.6-servicing.22267.7 - 6.0.6 - 6.0.6 - 6.0.6 - 6.0.6 + 6.0.7-servicing.22322.2 + 6.0.7-servicing.22322.2 + 6.0.7 + 6.0.7 + 6.0.7 + 6.0.7 2.1.0 - 6.0.6-servicing.22268.6 - 6.0.6-servicing.22268.6 - 6.0.6 - 6.0.6 + 6.0.7-servicing.22322.3 + 6.0.7-servicing.22322.3 + 6.0.7 + 6.0.7 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300 + 6.0.302 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 3ffbd85ba1e7f434ace89be6897634936b956b07 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Thu, 23 Jun 2022 14:30:11 +0000 Subject: [PATCH 437/462] Source-build fixups --- eng/Version.Details.xml | 6 ++--- ...-and-unsafe-paths-to-be-able-to-appl.patch | 23 ------------------- ...-and-unsafe-paths-to-be-able-to-appl.patch | 23 ------------------- 3 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/command-line-api/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch delete mode 100644 src/SourceBuild/tarball/patches/vstest/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e2360ec7..679bfbbbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -151,9 +151,9 @@ 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b - - https://github.com/NuGet/NuGet.Client - 75551652b352f860ea0b29095b64fa63715dd672 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + a8942f45835ba527cedacc02f7a75468f7a7b4bd diff --git a/src/SourceBuild/tarball/patches/command-line-api/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch b/src/SourceBuild/tarball/patches/command-line-api/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch deleted file mode 100644 index 0fa032d6c..000000000 --- a/src/SourceBuild/tarball/patches/command-line-api/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 22 Jun 2022 05:50:57 -0500 -Subject: [PATCH] Enable work-tree and unsafe-paths to be able to apply in the - checked-in tarball. - ---- - eng/SourceBuild.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 6cc8501..a862003 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -15,7 +15,7 @@ - - - - diff --git a/src/SourceBuild/tarball/patches/vstest/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch b/src/SourceBuild/tarball/patches/vstest/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch deleted file mode 100644 index de5ee2122..000000000 --- a/src/SourceBuild/tarball/patches/vstest/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 22 Jun 2022 05:57:36 -0500 -Subject: [PATCH] Enable work-tree and unsafe-paths to be able to apply in the - checked-in tarball. - ---- - eng/SourceBuild.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index b365645..36a7ba9 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -24,7 +24,7 @@ - - - - From 421de59ba85e84b1e3d6cf4260e283531f1185e3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Jun 2022 16:19:37 +0000 Subject: [PATCH 438/462] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220623.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.302-servicing.22322.21 -> To Version 6.0.302-servicing.22323.5 Dependency coherency updates 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 From Version 6.0.7 -> To Version 6.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index ec5638937..88f3011d3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,6 @@ - @@ -39,12 +38,11 @@ - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14557e9a4..fd65edc0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 55a6352b57cb1d777e812cc149906533e8d393a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5da87044239563a982a84a352f283621208d66f6 + 61ac8e4ddeacd507ad2827fc6f41efccc8da53ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5da87044239563a982a84a352f283621208d66f6 + 61ac8e4ddeacd507ad2827fc6f41efccc8da53ea diff --git a/eng/Versions.props b/eng/Versions.props index 58f372aff..a8c1e49a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.7 6.0.7 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 0.2.0 - 6.0.302-servicing.22322.21 - 6.0.302-servicing.22322.21 + 6.0.302-servicing.22323.5 + 6.0.302-servicing.22323.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 18f002dda7d3751dc06c9091a7129a6e4ae80aa7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Jun 2022 19:44:03 +0000 Subject: [PATCH 439/462] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220623.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.302-servicing.22322.21 -> To Version 6.0.302-servicing.22323.12 Dependency coherency updates 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 From Version 6.0.7 -> To Version 6.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 88f3011d3..4f5d25388 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,6 +17,7 @@ + @@ -43,6 +44,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd65edc0a..229d3fa85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,26 +91,26 @@ - https://github.com/dotnet/templating - 55a6352b57cb1d777e812cc149906533e8d393a3 + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + 416d9a7ab914340b357cff31bf49ba7e708f5a41 - - https://github.com/dotnet/templating - 55a6352b57cb1d777e812cc149906533e8d393a3 + + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + 416d9a7ab914340b357cff31bf49ba7e708f5a41 - https://github.com/dotnet/templating - 55a6352b57cb1d777e812cc149906533e8d393a3 + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + 416d9a7ab914340b357cff31bf49ba7e708f5a41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61ac8e4ddeacd507ad2827fc6f41efccc8da53ea + dc262f0c444d57181e580d4d5b9a517ea558c64a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61ac8e4ddeacd507ad2827fc6f41efccc8da53ea + dc262f0c444d57181e580d4d5b9a517ea558c64a diff --git a/eng/Versions.props b/eng/Versions.props index a8c1e49a6..54076f4dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.302-servicing.22323.5 - 6.0.302-servicing.22323.5 + 6.0.302-servicing.22323.12 + 6.0.302-servicing.22323.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2eaeea46973b06c56d668316dbde58ced40c558b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 5 Jul 2022 15:00:58 +0000 Subject: [PATCH 440/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220705.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22314.1 -> To Version 6.0.0-servicing.22355.1 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4f5d25388..208608d74 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -39,14 +47,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 229d3fa85..d3ecfe824 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/source-build-reference-packages - bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b + ffa2b64e8de11f0d148b7167c647fead3f2c33cb From da15ec139622e48b483bc36ce9104762b787b146 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 5 Jul 2022 12:30:19 -0700 Subject: [PATCH 441/462] Update branding to 6.0.303 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e121f07ce..a6c7e9fff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 995f7cd6e235fd91eba73ca2034cba923afaf92e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 5 Jul 2022 22:39:42 +0000 Subject: [PATCH 442/462] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220705.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22355.5 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4f5d25388..208608d74 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -39,14 +47,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 229d3fa85..d92910dd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 416d9a7ab914340b357cff31bf49ba7e708f5a41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc262f0c444d57181e580d4d5b9a517ea558c64a + 16dc9ea3af768b0b69594240d50d1c2f0617faf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc262f0c444d57181e580d4d5b9a517ea558c64a + 16dc9ea3af768b0b69594240d50d1c2f0617faf6 diff --git a/eng/Versions.props b/eng/Versions.props index 54076f4dd..c20453783 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.302-servicing.22323.12 - 6.0.302-servicing.22323.12 + 6.0.303-servicing.22355.5 + 6.0.303-servicing.22355.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2b4cdefbd14f12db31f6a04ad79e43a5f4231d42 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Jul 2022 08:20:55 +0000 Subject: [PATCH 443/462] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220706.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22356.2 --- 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 d92910dd8..bebf8bf52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 416d9a7ab914340b357cff31bf49ba7e708f5a41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 16dc9ea3af768b0b69594240d50d1c2f0617faf6 + cbe81c0092372df2b49caa53b57a41db8672a3be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 16dc9ea3af768b0b69594240d50d1c2f0617faf6 + cbe81c0092372df2b49caa53b57a41db8672a3be diff --git a/eng/Versions.props b/eng/Versions.props index c20453783..88d5ef754 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.303-servicing.22355.5 - 6.0.303-servicing.22355.5 + 6.0.303-servicing.22356.2 + 6.0.303-servicing.22356.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 25bd4e7cbb619ec7af35966d97eaea491657355e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Jul 2022 22:48:10 +0000 Subject: [PATCH 444/462] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220706.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22356.21 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22274.4 -> To Version 12.0.4-beta.22329.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 bebf8bf52..f38be3d5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 416d9a7ab914340b357cff31bf49ba7e708f5a41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cbe81c0092372df2b49caa53b57a41db8672a3be + 4290bea9a3135ed888eb864fcb971c93b990ef61 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cbe81c0092372df2b49caa53b57a41db8672a3be + 4290bea9a3135ed888eb864fcb971c93b990ef61 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 5063a17b211e70ca0ff6fed1b57e9d04727c25a8 - + https://github.com/dotnet/fsharp - 211fd760c2315d73cfa0d375fe64abb346bc1096 + 702b8e77f5fbfe21e6743324c1750503e02f182d - + https://github.com/dotnet/fsharp - 211fd760c2315d73cfa0d375fe64abb346bc1096 + 702b8e77f5fbfe21e6743324c1750503e02f182d diff --git a/eng/Versions.props b/eng/Versions.props index 88d5ef754..b1ac14e13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.303-servicing.22356.2 - 6.0.303-servicing.22356.2 + 6.0.303-servicing.22356.21 + 6.0.303-servicing.22356.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From af4b8739b369b4fff9527bab2cb1b134de776c4d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 6 Jul 2022 16:49:00 -0700 Subject: [PATCH 445/462] run update dependencies. This may conflict when it tries to merge internally though --- NuGet.config | 6 ------ eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index f50bca67f..9a84139e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,16 @@ - - - @@ -38,14 +35,11 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 679bfbbbe..8991d2f66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 60a2f73de55434984bbe3d5ad9281b3863355b31 - - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8daa5f75dfc7592e30e28e71d448621d12442893 + + https://github.com/dotnet/sdk + 3ff7c9567a7cbe3a489ef6a895d26c4114e76f1e - - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8daa5f75dfc7592e30e28e71d448621d12442893 + + https://github.com/dotnet/sdk + 3ff7c9567a7cbe3a489ef6a895d26c4114e76f1e @@ -151,9 +151,9 @@ 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - a8942f45835ba527cedacc02f7a75468f7a7b4bd + + https://github.com/nuget/nuget.client + 4be14ee6b6587a02f05337505bd840fbcbe898f6 @@ -170,9 +170,9 @@ https://github.com/dotnet/emsdk 52e9452f82e26f9fcae791e84c082ae22f1ef66f - + https://github.com/dotnet/source-build - 126aed9b11b5aece8ebcf7bdbb82d0654206d5a4 + 10d0f7e94aa45889155c312f51cfc01bf326b853 diff --git a/eng/Versions.props b/eng/Versions.props index e121f07ce..a34963724 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.301-rtm.22274.11 - 6.0.301-rtm.22274.11 + 6.0.302-servicing.22321.30 + 6.0.302-servicing.22321.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f3f06aa629a4691321947c922683cabf7c550e50 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 7 Jul 2022 14:58:35 +0000 Subject: [PATCH 446/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220707.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22314.1 -> To Version 6.0.0-servicing.22357.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 d3ecfe824..bae0da4eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/source-build-reference-packages - ffa2b64e8de11f0d148b7167c647fead3f2c33cb + 9dc0c80c3c275ed32fa9aff1d86ef204550cc1f6 From d384f3f5f7aaa0a0bb2b8e0eae0b085b8d1b1a0b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 9 Jul 2022 00:56:00 +0000 Subject: [PATCH 447/462] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220708.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22358.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.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.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 32 ++++----------- eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 40 +++++++++---------- 3 files changed, 71 insertions(+), 87 deletions(-) diff --git a/NuGet.config b/NuGet.config index 208608d74..c41d3eefb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,20 @@ - - - + - - - + - - - + - - - + @@ -47,23 +39,15 @@ - - - + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f38be3d5d..f059b873f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 03bd31516879cccb9df648b61813dc1ee2ef7047 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 03bd31516879cccb9df648b61813dc1ee2ef7047 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 03bd31516879cccb9df648b61813dc1ee2ef7047 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 03bd31516879cccb9df648b61813dc1ee2ef7047 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 4361e98c7a5080acec52b329388ee6fc27623a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 4361e98c7a5080acec52b329388ee6fc27623a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 4361e98c7a5080acec52b329388ee6fc27623a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 4361e98c7a5080acec52b329388ee6fc27623a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 4361e98c7a5080acec52b329388ee6fc27623a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 4361e98c7a5080acec52b329388ee6fc27623a57 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 416d9a7ab914340b357cff31bf49ba7e708f5a41 + 81ecdf910926159311fa54b902f574ce14157186 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 416d9a7ab914340b357cff31bf49ba7e708f5a41 + 81ecdf910926159311fa54b902f574ce14157186 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 416d9a7ab914340b357cff31bf49ba7e708f5a41 + 81ecdf910926159311fa54b902f574ce14157186 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4290bea9a3135ed888eb864fcb971c93b990ef61 + 8306089959e2e9a8d60145dbb09e6e97d78c088c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4290bea9a3135ed888eb864fcb971c93b990ef61 + 8306089959e2e9a8d60145dbb09e6e97d78c088c diff --git a/eng/Versions.props b/eng/Versions.props index b1ac14e13..df7d10319 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.302 + 6.0.303 @@ -44,20 +44,20 @@ - 6.0.7 - 6.0.7 - 6.0.7-servicing.22322.5 - 6.0.7-servicing.22322.5 - 6.0.7-servicing.22322.5 - 6.0.7-servicing.22322.5 + 6.0.8 + 6.0.8 + 6.0.8-servicing.22356.15 + 6.0.8-servicing.22356.15 + 6.0.8-servicing.22356.15 + 6.0.8-servicing.22356.15 0.2.0 - 6.0.303-servicing.22356.21 - 6.0.303-servicing.22356.21 + 6.0.303-servicing.22358.14 + 6.0.303-servicing.22358.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.7-servicing.22322.2 - 6.0.7-servicing.22322.2 - 6.0.7 - 6.0.7 - 6.0.7 - 6.0.7 + 6.0.8-servicing.22356.4 + 6.0.8-servicing.22356.4 + 6.0.8 + 6.0.8 + 6.0.8 + 6.0.8 2.1.0 - 6.0.7-servicing.22322.3 - 6.0.7-servicing.22322.3 - 6.0.7 - 6.0.7 + 6.0.8-servicing.22356.2 + 6.0.8-servicing.22356.2 + 6.0.8 + 6.0.8 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.302 + 6.0.303 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 853275fdcb09c04e79ba224faa4a40fcd4025768 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 12 Jul 2022 12:13:55 -0700 Subject: [PATCH 448/462] Update Asp.Net template (#14111) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8c1961e35..3499501e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.26 + 3.1.27 3.2.1 4.8.0-rc2.19462.10 From 5334c3f76c37ee2ae55018d547eb9b36a8b9e6fc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Jul 2022 20:57:27 +0000 Subject: [PATCH 449/462] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220712.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.303-servicing.22358.14 -> To Version 6.0.303-servicing.22362.9 --- 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 f059b873f..bd1640496 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 81ecdf910926159311fa54b902f574ce14157186 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8306089959e2e9a8d60145dbb09e6e97d78c088c + 4d9c8c2a2188ca251ddddaa8fde44cc364925518 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8306089959e2e9a8d60145dbb09e6e97d78c088c + 4d9c8c2a2188ca251ddddaa8fde44cc364925518 diff --git a/eng/Versions.props b/eng/Versions.props index 5f8c17458..35fb95950 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.303-servicing.22358.14 - 6.0.303-servicing.22358.14 + 6.0.303-servicing.22362.9 + 6.0.303-servicing.22362.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8da36a991a37cf251851962fb37ebe8d1d3c4851 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Jul 2022 15:07:16 +0000 Subject: [PATCH 450/462] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220713.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22314.1 -> To Version 6.0.0-servicing.22363.1 --- NuGet.config | 18 ------------------ eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 208608d74..a983e09b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,19 +16,10 @@ - - - - - - - - - @@ -52,18 +43,9 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bae0da4eb..787c6311d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/source-build-reference-packages - 9dc0c80c3c275ed32fa9aff1d86ef204550cc1f6 + 08e4967761f81c4c40b6872a0e639b4f588b4f00 From b1eed85a65a33fe8d745b6d5648f16b36e96e24c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Jul 2022 17:12:46 +0000 Subject: [PATCH 451/462] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220713.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.303-servicing.22362.9 -> To Version 6.0.303-servicing.22363.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.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.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.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.8 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++------ eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index c41d3eefb..3d165bb66 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -39,15 +39,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd1640496..55cc067fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 03bd31516879cccb9df648b61813dc1ee2ef7047 + 6a8cabe11be7a6321ef500dd0fab1cab4840015d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 03bd31516879cccb9df648b61813dc1ee2ef7047 + 6a8cabe11be7a6321ef500dd0fab1cab4840015d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 03bd31516879cccb9df648b61813dc1ee2ef7047 + 6a8cabe11be7a6321ef500dd0fab1cab4840015d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 03bd31516879cccb9df648b61813dc1ee2ef7047 + 6a8cabe11be7a6321ef500dd0fab1cab4840015d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4361e98c7a5080acec52b329388ee6fc27623a57 + ae88823c0957661796fccc2a78adf2529e59f316 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4361e98c7a5080acec52b329388ee6fc27623a57 + ae88823c0957661796fccc2a78adf2529e59f316 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4361e98c7a5080acec52b329388ee6fc27623a57 + ae88823c0957661796fccc2a78adf2529e59f316 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4361e98c7a5080acec52b329388ee6fc27623a57 + ae88823c0957661796fccc2a78adf2529e59f316 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4361e98c7a5080acec52b329388ee6fc27623a57 + ae88823c0957661796fccc2a78adf2529e59f316 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4361e98c7a5080acec52b329388ee6fc27623a57 + ae88823c0957661796fccc2a78adf2529e59f316 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81ecdf910926159311fa54b902f574ce14157186 + 5e674670d0461ec2894fc16d17c0760cdd7570f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81ecdf910926159311fa54b902f574ce14157186 + 5e674670d0461ec2894fc16d17c0760cdd7570f4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81ecdf910926159311fa54b902f574ce14157186 + 5e674670d0461ec2894fc16d17c0760cdd7570f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4d9c8c2a2188ca251ddddaa8fde44cc364925518 + 3d39f0cae51a3cb58dba3f1fd7b6407ba94eb1ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4d9c8c2a2188ca251ddddaa8fde44cc364925518 + 3d39f0cae51a3cb58dba3f1fd7b6407ba94eb1ca diff --git a/eng/Versions.props b/eng/Versions.props index 35fb95950..dd6ebbd08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.8 6.0.8 - 6.0.8-servicing.22356.15 - 6.0.8-servicing.22356.15 - 6.0.8-servicing.22356.15 - 6.0.8-servicing.22356.15 + 6.0.8-servicing.22363.5 + 6.0.8-servicing.22363.5 + 6.0.8-servicing.22363.5 + 6.0.8-servicing.22363.5 0.2.0 - 6.0.303-servicing.22362.9 - 6.0.303-servicing.22362.9 + 6.0.303-servicing.22363.14 + 6.0.303-servicing.22363.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.8-servicing.22356.4 - 6.0.8-servicing.22356.4 + 6.0.8-servicing.22362.13 + 6.0.8-servicing.22362.13 6.0.8 6.0.8 6.0.8 @@ -78,8 +78,8 @@ - 6.0.8-servicing.22356.2 - 6.0.8-servicing.22356.2 + 6.0.8-servicing.22362.4 + 6.0.8-servicing.22362.4 6.0.8 6.0.8 From 9a230f07c92d38263cbc4003c5f79d8d91b2bacf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Jul 2022 17:17:33 +0000 Subject: [PATCH 452/462] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220714.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.303-servicing.22362.9 -> To Version 6.0.303-servicing.22364.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.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.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 From Version 6.0.8 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d165bb66..1b143b39c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -39,15 +39,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55cc067fc..1fbc10e11 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6a8cabe11be7a6321ef500dd0fab1cab4840015d + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6a8cabe11be7a6321ef500dd0fab1cab4840015d + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6a8cabe11be7a6321ef500dd0fab1cab4840015d + 590580628cf9b02219cca72a73f218e468c5892b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6a8cabe11be7a6321ef500dd0fab1cab4840015d + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ae88823c0957661796fccc2a78adf2529e59f316 + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ae88823c0957661796fccc2a78adf2529e59f316 + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ae88823c0957661796fccc2a78adf2529e59f316 + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ae88823c0957661796fccc2a78adf2529e59f316 + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ae88823c0957661796fccc2a78adf2529e59f316 + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ae88823c0957661796fccc2a78adf2529e59f316 + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5e674670d0461ec2894fc16d17c0760cdd7570f4 + 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5e674670d0461ec2894fc16d17c0760cdd7570f4 + 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5e674670d0461ec2894fc16d17c0760cdd7570f4 + 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3d39f0cae51a3cb58dba3f1fd7b6407ba94eb1ca + 6d94e16b22eebd3cfbaad6681b71080dd38c75ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3d39f0cae51a3cb58dba3f1fd7b6407ba94eb1ca + 6d94e16b22eebd3cfbaad6681b71080dd38c75ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24977050704b627e631caf7b1ca4bcb0543f3ab2 + 876ba0c47b9b4fd4b7d729b8a0fe1bea8c9f765f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5063a17b211e70ca0ff6fed1b57e9d04727c25a8 + 629fa4b5d72642eeb9a3931ad4d107594663c0f5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dd6ebbd08..c87f0a85e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.7-servicing.22322.3 + 6.0.8-servicing.22363.7 - 6.0.7-servicing.22322.2 + 6.0.8-servicing.22363.8 @@ -46,18 +46,18 @@ 6.0.8 6.0.8 - 6.0.8-servicing.22363.5 - 6.0.8-servicing.22363.5 - 6.0.8-servicing.22363.5 - 6.0.8-servicing.22363.5 + 6.0.8-servicing.22363.16 + 6.0.8-servicing.22363.16 + 6.0.8-servicing.22363.16 + 6.0.8-servicing.22363.16 0.2.0 - 6.0.303-servicing.22363.14 - 6.0.303-servicing.22363.14 + 6.0.303-servicing.22364.11 + 6.0.303-servicing.22364.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.8-servicing.22362.13 - 6.0.8-servicing.22362.13 + 6.0.8-servicing.22363.6 + 6.0.8-servicing.22363.6 6.0.8 6.0.8 6.0.8 @@ -78,8 +78,8 @@ - 6.0.8-servicing.22362.4 - 6.0.8-servicing.22362.4 + 6.0.8-servicing.22363.10 + 6.0.8-servicing.22363.10 6.0.8 6.0.8 From 0933d6bb73866f1cbce73c3de1ad1ba0fbc86293 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Jul 2022 16:42:40 -0700 Subject: [PATCH 453/462] Fix bad merge. --- NuGet.config | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5964b8145..bfbdd60d4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -41,9 +39,7 @@ - - - + From 060275cd0b32e010d3647615e973b6b03de953ec Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 18 Jul 2022 18:57:07 +0000 Subject: [PATCH 454/462] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.NETCore.Platforms: from 6.0.5 to 6.0.5 (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 5acfa5b13..b8515744d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d94e16b22eebd3cfbaad6681b71080dd38c75ff + 0aab6045f61934ee896ccfc140474660f9b7239f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d94e16b22eebd3cfbaad6681b71080dd38c75ff + 0aab6045f61934ee896ccfc140474660f9b7239f diff --git a/eng/Versions.props b/eng/Versions.props index 28ae92a40..83aa43852 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.303-servicing.22364.11 - 6.0.303-servicing.22364.11 + 6.0.303-servicing.22368.10 + 6.0.303-servicing.22368.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0045a485a6911a875bbcd8c9f3e947441c501a6b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 18 Jul 2022 20:01:46 +0000 Subject: [PATCH 455/462] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220718.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.303-servicing.22368.10 -> To Version 6.0.303-servicing.22368.13 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.303 -> To Version 6.0.303 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b143b39c..32e3ea5f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8515744d..d757944dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b + d251862fe81655a95aea81683f44ef49f84d3cd7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b + d251862fe81655a95aea81683f44ef49f84d3cd7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b + d251862fe81655a95aea81683f44ef49f84d3cd7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0aab6045f61934ee896ccfc140474660f9b7239f + 79a32c021d4e3df6f87a3f92b159820aabd7fd62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0aab6045f61934ee896ccfc140474660f9b7239f + 79a32c021d4e3df6f87a3f92b159820aabd7fd62 diff --git a/eng/Versions.props b/eng/Versions.props index 83aa43852..d2537c9a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.303-servicing.22368.10 - 6.0.303-servicing.22368.10 + 6.0.303-servicing.22368.13 + 6.0.303-servicing.22368.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7494fee64a69205fea68f86f541db829c3b82384 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 18 Jul 2022 22:23:02 +0000 Subject: [PATCH 456/462] Merged PR 24233: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220718.20 - **Date Produced**: July 18, 2022 9:40:52 PM UTC - **Commit**: c42e5ebf0d71359c76fa8465aacd1e2e6e9c7bac - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.303-servicing.22368.13 to 6.0.303-servicing.22368.20][1] - **Microsoft.NET.Sdk**: [from 6.0.303-servicing.22368.13 to 6.0.303-servicing.22368.20][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.8 to 6.0.8][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC79a32c0&targetVersion=GCc42e5eb&_a=files [2]: https://dev.azure.com/dnceng/internal/... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 32e3ea5f6..139e6bcf1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d757944dd..8f97e57ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 590580628cf9b02219cca72a73f218e468c5892b + 919562130283931bdcd05a684af1421d1e962aa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 590580628cf9b02219cca72a73f218e468c5892b + 919562130283931bdcd05a684af1421d1e962aa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 590580628cf9b02219cca72a73f218e468c5892b + 919562130283931bdcd05a684af1421d1e962aa3 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 590580628cf9b02219cca72a73f218e468c5892b + 919562130283931bdcd05a684af1421d1e962aa3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d251862fe81655a95aea81683f44ef49f84d3cd7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 79a32c021d4e3df6f87a3f92b159820aabd7fd62 + c42e5ebf0d71359c76fa8465aacd1e2e6e9c7bac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 79a32c021d4e3df6f87a3f92b159820aabd7fd62 + c42e5ebf0d71359c76fa8465aacd1e2e6e9c7bac - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 876ba0c47b9b4fd4b7d729b8a0fe1bea8c9f765f + bcdb000de284571bf5267aa3d052dee7918c1e6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 629fa4b5d72642eeb9a3931ad4d107594663c0f5 + 7a75fd34f53bc300206bd8cfc636527934dd17af https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d2537c9a4..492b44178 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.8-servicing.22363.7 + 6.0.8-servicing.22368.4 - 6.0.8-servicing.22363.8 + 6.0.8-servicing.22368.7 @@ -56,8 +56,8 @@ - 6.0.303-servicing.22368.13 - 6.0.303-servicing.22368.13 + 6.0.303-servicing.22368.20 + 6.0.303-servicing.22368.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.8-servicing.22363.10 - 6.0.8-servicing.22363.10 + 6.0.8-servicing.22368.4 + 6.0.8-servicing.22368.4 6.0.8 6.0.8 From f66d2fea34f6a68251c3b45522b58f2bfb3a9eac Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Aug 2022 09:18:15 -0700 Subject: [PATCH 457/462] Update branding to 6.0.304 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 13730aab2..4e01fa50a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 8c3b1d204505937d5d93906a66b0992acb980fe1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 2 Aug 2022 12:54:22 -0700 Subject: [PATCH 458/462] Revert branding --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6bd2515e7..affa9ce1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 09 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 7268b5cff311fc392f873dd90acb851ab45ba222 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Aug 2022 12:27:54 -0700 Subject: [PATCH 459/462] [6.0.3xx] Update template versions from dotnet/aspnetcore (#14244) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 537a5f54a..5bfde2c08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.27 + 3.1.28 3.2.1 4.8.0-rc2.19462.10 From ddfb6a9e0568fa834eb3eef746e821aa1c2aaf53 Mon Sep 17 00:00:00 2001 From: Alex Perovich Date: Wed, 31 Aug 2022 17:17:51 -0700 Subject: [PATCH 460/462] Update public pool names --- .vsts-ci.yml | 10 +++++----- eng/common/templates/job/source-build.yml | 2 +- .../templates/job/source-build-create-tarball.yml | 2 +- .../templates/job/source-build-run-tarball-build.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 4a2f5d8bf..407750886 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -47,7 +47,7 @@ stages: - job: Publish_Build_Configuration pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals build.windows.10.amd64.vs2019.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -61,7 +61,7 @@ stages: agentOs: Windows_NT pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals build.windows.10.amd64.vs2019.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -118,7 +118,7 @@ stages: agentOs: Windows_NT pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals build.windows.10.amd64.vs2019.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -147,7 +147,7 @@ stages: agentOs: Linux pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -333,7 +333,7 @@ stages: agentOs: Linux pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 5cd5325d7..88f6f75a6 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,7 +46,7 @@ jobs: # source-build builds run in Docker, including the default managed platform. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Public + name: NetCore-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal 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 4f993567f..8efb389d3 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 @@ -6,7 +6,7 @@ jobs: displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal 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 2cf4ad628..e5e4f7e9a 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 @@ -25,7 +25,7 @@ parameters: poolInternalArm64: name: Docker-Linux-Arm-Internal poolPublicAmd64: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open jobs: From 97aa46b7d2cf2d52ced9cbb3644e643e27e3576d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Sep 2022 10:31:38 -0700 Subject: [PATCH 461/462] Update branding to 6.0.305 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a1558013b..319168073 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From a5a36d4af56974c27d63f4baa784b568d9cb421f Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 14 Sep 2022 10:00:19 -0700 Subject: [PATCH 462/462] [6.0.3xx] Update template versions from dotnet/aspnetcore (#14486) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 319168073..642cee329 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.28 + 3.1.29 3.2.1 4.8.0-rc2.19462.10