From 42257c06e2dfe89af03a5e15b4181aeb7d9727b9 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 27 Oct 2021 14:28:48 -0700 Subject: [PATCH 0001/1244] 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 a1d77f37f58b..3a5fbcb6f511 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 0002/1244] 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 3a5fbcb6f511..33b333364d83 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 0003/1244] Set ulimit --- run-build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/run-build.sh b/run-build.sh index 7b98aedc0bec..99a408cf2604 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 0004/1244] 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 7ff647c4060d..5eb32b4c7853 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 0005/1244] 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 33b333364d83..8b6a478c8cc5 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 0006/1244] 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 5133c3a38414..01f704c7d8e4 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 0007/1244] 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 89cf630553f8..568f89f7e7e7 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 0008/1244] 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 568f89f7e7e7..ebe591cccf99 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 0009/1244] [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 8b6a478c8cc5..7e8888edf502 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 0010/1244] [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 de42f9ad5349..b995dca0cc33 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,38 +7,16 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dfe53685de7..5711c22d8b9a 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 7e8888edf502..18ed2689eb60 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 69eb67849d74..4882dd931341 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 e8bc77d2ebbe..2b55a567f82a 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 1cc0c29e4fda..d8990549e809 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 a1f8fce96ca8..90015a7e5ae3 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 4f5a20ba8870..b785d45455b3 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 0011/1244] 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 5d024774128b..d801654bbd65 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 a3a2f394c42e..712d7cd141e9 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 f2cc4113be9e..3917efa60f7c 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 b785d45455b3..e6d26905e990 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 0013/1244] 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 b995dca0cc33..ae8794e04ca6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,8 +31,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd5552022484..899992b3f25c 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 132835bb7292..be955ff74572 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 7d5d03116754..7c19d6a40455 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 d9a483852e1d..000000000000 --- 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 93717db90555..000000000000 --- 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 b5b0a84f6b77..000000000000 --- 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 6ca89df7d613..80f65c174334 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 34d37ba0be81..36ce5217c3eb 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 aa1e198cc6c6..000000000000 --- 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 bd4c1340960e..000000000000 --- 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 0014/1244] 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 899992b3f25c..3d5e4b0fb307 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 be955ff74572..1ca8df7c73a2 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 0015/1244] 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 57ae4fd2d900..953d16ee6bd0 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 0016/1244] 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 89eddb755c0c..6764851104f1 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 0017/1244] [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 3d5e4b0fb307..456608e041b6 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 1ca8df7c73a2..0a9c98b8fc7f 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 0018/1244] 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 456608e041b6..62af050eeca6 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 0a9c98b8fc7f..889865a1c632 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 0019/1244] 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 62af050eeca6..6094e8a68810 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 889865a1c632..310913eef899 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 0020/1244] 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 6094e8a68810..16c5809e1fbe 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 310913eef899..f91639b769d0 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 0021/1244] 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 16c5809e1fbe..8fd1c83bb62b 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 f91639b769d0..1f6088c037fc 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 0022/1244] 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 8fd1c83bb62b..0edf8545170e 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 1f6088c037fc..06c630afae0a 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 0023/1244] 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 0edf8545170e..357748a4ba04 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 06c630afae0a..46e02f8b43be 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 0024/1244] 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 357748a4ba04..74a8c330a111 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 46e02f8b43be..eb6240de78c6 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 0025/1244] 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 74a8c330a111..c857dc4801c4 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 eb6240de78c6..b1f55cf0c6f9 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 0026/1244] 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 fc034feccb79..b3815b84077e 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 000000000000..4d5554a71ac8 --- /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 b1f55cf0c6f9..54c72d104b3d 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 80f65c174334..b82c812ab933 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 8e3884438bc3..000000000000 --- 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 f94119820bf2..0afe8be5371f 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 0031/1244] 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 0007b6c6e9fb..39f48573d26c 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 000000000000..426502e86911 --- /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 b82c812ab933..1c6710555e3b 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 000000000000..a0133a35fdf3 --- /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 0032/1244] 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 fa0fcb268497..47a49d499d8d 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 54c72d104b3d..05a50313b877 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 0033/1244] 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 47a49d499d8d..9934f87a158b 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 05a50313b877..1f41437c6569 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 0034/1244] 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 f39c285b4d86..f32e4fa3bd70 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 0035/1244] 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 9934f87a158b..a72311e301e5 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 1f41437c6569..ea5a46cc6036 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 0036/1244] 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 a72311e301e5..fce0214d09c7 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 ea5a46cc6036..c2c8dd95d7bb 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 0037/1244] 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 fce0214d09c7..5d68bea6c920 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 0038/1244] 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 5d68bea6c920..61235a858fbc 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 0039/1244] 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 61235a858fbc..c0f487fc366b 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 0040/1244] 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 c0f487fc366b..49d9fe91d2f9 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 0041/1244] [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 49d9fe91d2f9..ecd08b399126 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 c2c8dd95d7bb..28a619f3b44c 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 70d81e3d6a68..11259ab58919 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 7c19d6a40455..7d5d03116754 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 4d5554a71ac8..68917950ec59 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 1c6710555e3b..9a55fed1b7d7 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 a0133a35fdf3..000000000000 --- 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 0042/1244] 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 ecd08b399126..8565b8b75457 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 28a619f3b44c..436e8cfa67e2 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 0043/1244] 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 8565b8b75457..68a7a36fa1f2 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 436e8cfa67e2..cac842119863 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 0044/1244] 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 68a7a36fa1f2..cbdda471f5d2 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 cac842119863..366068870be2 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 0045/1244] 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 cbdda471f5d2..749cd1c63193 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 366068870be2..68bf285d1b8d 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 0046/1244] 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 749cd1c63193..667a5aac08e6 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 68bf285d1b8d..18a9b2510bc7 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 0047/1244] 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 667a5aac08e6..a87dbe48183d 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 0048/1244] 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 3917efa60f7c..a26cad868d99 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 0049/1244] 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 | 76 +++++++++++------------- eng/common/tools.sh | 67 ++++++++++----------- global.json | 4 +- 8 files changed, 79 insertions(+), 91 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a87dbe48183d..11e95235ab1a 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 18a9b2510bc7..6658d273cf19 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 bc07a1c68482..a16e18b174a7 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 7ab9baac5c8d..b1bca63ab1d8 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 2b55a567f82a..069098b0a066 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 44484289943e..f1e1cb53953b 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,32 +298,45 @@ 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 - } + 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 { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location." - ExitWithExitCode 1 + $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 6a4871ef72b7..e555c34269f6 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 public_location=("${installParameters[@]}") + variations+=(public_location) - local runtimeSourceFeedKey='' + 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 - 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 + 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 - } + + 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 e6d26905e990..86e408bbe4f5 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 0050/1244] 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 11e95235ab1a..e96c241f3474 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 0051/1244] 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 6658d273cf19..4f539958056f 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 0052/1244] 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 e96c241f3474..44ae65f6c51c 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 0053/1244] 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 44ae65f6c51c..591c4f94d5cb 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 4f539958056f..b0dd2df6f579 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 0054/1244] 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 591c4f94d5cb..f2d42e4385b3 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 0055/1244] [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 f2d42e4385b3..703ce0d8829a 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 b0dd2df6f579..42557f6a2cf3 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 59f7eb49919d..9b6365dfccde 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 @@ public class Tarball_ReadSourceBuildIntermediateNupkgDependencies : Task [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 @@ XName CreateQualifiedName(string plainName) 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 @@ XName CreateQualifiedName(string plainName) 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 75fd838e8698..919d3c97588b 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 bae957621d01..000000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0006-Fix-AppHost-pack-prebuilt-usage-in-source-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Wed, 20 Oct 2021 16:17:54 -0500 -Subject: [PATCH] Fix AppHost pack prebuilt usage in source-build - -This avoids downloading a prebuilt apphost pack. - -Upstream PR: https://github.com/dotnet/aspnetcore/pull/37672 ---- - Directory.Build.props | 14 ++++++++++++-- - .../src/Microsoft.AspNetCore.App.Ref.csproj | 1 + - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 204df64da7..7280c12748 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -198,8 +198,18 @@ - - - $(RepoRoot).dotnet\ -- -- $(LocalDotNetRoot)packs\ -+ -+ $(LocalDotNetRoot)packs\ - - - -diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj -index 0cb7503c04..3a0832ee21 100644 ---- a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj -+++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj -@@ -211,6 +211,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - diff --git a/src/SourceBuild/tarball/patches/runtime/0002-DotNetHost-packages-are-not-created-during-source-bu.patch b/src/SourceBuild/tarball/patches/runtime/0002-DotNetHost-packages-are-not-created-during-source-bu.patch deleted file mode 100644 index 0d13c1cf5db1..000000000000 --- a/src/SourceBuild/tarball/patches/runtime/0002-DotNetHost-packages-are-not-created-during-source-bu.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Eric Erhardt -Date: Mon, 18 Oct 2021 15:47:39 -0500 -Subject: [PATCH] DotNetHost packages are not created during source-build - -The subset `host.pkg` is not producing the DotNetHost* NuGet packages. This is because the "Pack" target is getting invoked on the pkgprojs, but pkgprojs expect the "Build" target to be called. Since the "Pack" target is overriden in the Directory.Build.targets to be empty, no one is calling the "Build" target on the pkgprojs. - -In an official build, a later subset `packs.tests` comes through and builds `Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj`, which explicitly calls "Build" on the pkgprojs. So official builds still get these packages produced. - -In source-build, we are no longer building the `packs.tests` subset, so the packages are not produced. - -See also: -* https://github.com/dotnet/runtime/pull/60575 -* https://github.com/dotnet/runtime/pull/60577 ---- - src/installer/Directory.Build.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/installer/Directory.Build.targets b/src/installer/Directory.Build.targets -index c6e8cf1a140..dccb8277ba7 100644 ---- a/src/installer/Directory.Build.targets -+++ b/src/installer/Directory.Build.targets -@@ -15,5 +15,5 @@ - - - -- -+ - diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch b/src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch deleted file mode 100644 index 161b962b78c0..000000000000 --- a/src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Tue, 26 Oct 2021 13:24:57 -0500 -Subject: [PATCH] Disable package validation in source-build for reliability - -See comment in diff. - -Upstream PR: https://github.com/dotnet/runtime/pull/60881 ---- - eng/packaging.targets | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/eng/packaging.targets b/eng/packaging.targets -index ecf74672ac8..0a04191182d 100644 ---- a/eng/packaging.targets -+++ b/eng/packaging.targets -@@ -1,7 +1,13 @@ - - - -- true -+ -+ true - - true - $([MSBuild]::Subtract($(MajorVersion), 1)).0.0 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 0056/1244] 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 703ce0d8829a..b7d1c955c271 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 42557f6a2cf3..39c795316708 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 0057/1244] 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 b7d1c955c271..15e78c3b7a2f 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 39c795316708..cf789f67d26e 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 0058/1244] 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 15e78c3b7a2f..33de67ba719e 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 cf789f67d26e..715f73f35238 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 0059/1244] 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 33de67ba719e..f438edd07c97 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 715f73f35238..c8b1617f7de1 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 0060/1244] 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 f438edd07c97..3cc3e5b63b29 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 c8b1617f7de1..c16643c5478b 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 0061/1244] 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 3cc3e5b63b29..3e5d196ef5dc 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 c16643c5478b..a403ec20690c 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 0062/1244] 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 3e5d196ef5dc..eb3014df9679 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 a403ec20690c..a031205017b2 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 0063/1244] 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 eb3014df9679..88030d6abc79 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 a031205017b2..77829c45c964 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 0064/1244] 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 88030d6abc79..39ea9bbf20ef 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 77829c45c964..2e77cd168600 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 0065/1244] 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 39ea9bbf20ef..e8c223cac806 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 2e77cd168600..fbc38c51c8aa 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 0066/1244] 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 e8c223cac806..0d13c64091e0 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 fbc38c51c8aa..287138a80fae 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 0067/1244] 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 0d13c64091e0..2de83afc0ee6 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 287138a80fae..98ae9ef2e0b6 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 0068/1244] 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 2de83afc0ee6..716d473b5c19 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 98ae9ef2e0b6..fcc819e4632c 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 0069/1244] 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 716d473b5c19..9a713d167942 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 fcc819e4632c..010c4b155d35 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 0070/1244] 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 7d5d03116754..000000000000 --- 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 68917950ec59..000000000000 --- 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 010c4b155d35..9ac0eab91e32 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 0072/1244] 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 eb49b9ebfaea..ab00d8cd69ce 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 9ac0eab91e32..36399b08e69f 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 0073/1244] 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 ab00d8cd69ce..0710d31542b0 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 36399b08e69f..2fb3d25874f7 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 0074/1244] 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 0710d31542b0..bd68d62b2e15 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 2fb3d25874f7..2c80a1ae5940 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 0075/1244] 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 bd68d62b2e15..531dcee0862a 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 2c80a1ae5940..d7e2df79a1d4 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 0076/1244] 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 531dcee0862a..c2ac9124949f 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 d7e2df79a1d4..a6fe4be7c83f 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 0077/1244] 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 c2ac9124949f..bdc86eeb3da4 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 a6fe4be7c83f..ddf76bc39030 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 0078/1244] 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 bdc86eeb3da4..b906e0092d89 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 ddf76bc39030..f07353d508c4 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 0079/1244] 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 b906e0092d89..dd4a579d8793 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 f07353d508c4..60afb2f9299c 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 0080/1244] 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 dd4a579d8793..ef9768b67794 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 60afb2f9299c..262c275101cc 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 0081/1244] 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 ef9768b67794..88a111350499 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 262c275101cc..e6395c46ef49 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 0082/1244] 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 319028d25fc8..000000000000 --- 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 48bf63e701fa..000000000000 --- 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 8458c20e51a3..000000000000 --- 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 0083/1244] 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 9a55fed1b7d7..546419625c6d 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 0084/1244] 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 000000000000..319028d25fc8 --- /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 000000000000..48bf63e701fa --- /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 000000000000..8458c20e51a3 --- /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 0085/1244] 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 88a111350499..78b6014f2199 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 e6395c46ef49..e6a4cd581f33 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 0086/1244] 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 78b6014f2199..19e04757a01b 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 e6a4cd581f33..757b6328882b 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 0087/1244] 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 19e04757a01b..983d3b5e1b20 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 757b6328882b..f328f5961b9a 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 0088/1244] 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 983d3b5e1b20..7bcb718c7f16 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 f328f5961b9a..bdf2edb9e602 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 0089/1244] 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 7bcb718c7f16..6056176c09eb 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 bdf2edb9e602..54fd9897124e 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 0090/1244] 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 319028d25fc8..000000000000 --- 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 48bf63e701fa..000000000000 --- 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 8458c20e51a3..000000000000 --- 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 0091/1244] 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 0d13c64091e0..631559986a3c 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 0092/1244] 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 6056176c09eb..32cadbf8dbb2 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 54fd9897124e..06b72d77cc35 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 0093/1244] 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 32cadbf8dbb2..ceeea99d6838 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 06b72d77cc35..5bbde494f67a 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 0094/1244] 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 ceeea99d6838..29e3af3cbf2f 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 5bbde494f67a..cbd29185a436 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 0095/1244] 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 29e3af3cbf2f..4eb743cc3a09 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 cbd29185a436..e8079f25b614 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 0096/1244] 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 4eb743cc3a09..35cc802a5486 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 e8079f25b614..b539a841e939 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 0097/1244] 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 35cc802a5486..312f801b7d06 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 0098/1244] 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 312f801b7d06..c33903068c25 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 b539a841e939..f1b8ba866f7a 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 0099/1244] 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 c33903068c25..8f4723dfe499 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 f1b8ba866f7a..fcbfd87a8977 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 0100/1244] 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 8f4723dfe499..ce6f7207e052 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 fcbfd87a8977..188f1d8dd3b7 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 0101/1244] 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 ce6f7207e052..cec73ff5a923 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 188f1d8dd3b7..bb7d9e9cd59f 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 0102/1244] 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 cec73ff5a923..7848a6d12d40 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 bb7d9e9cd59f..658c67f0721a 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 0103/1244] 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 7848a6d12d40..8f08b081ea60 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 658c67f0721a..3b1d1cf81cc9 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 0104/1244] 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 631559986a3c..5033e241e1ed 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 0105/1244] 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 8f08b081ea60..da6f66876ae6 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 3b1d1cf81cc9..830b3d11abee 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 0106/1244] 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 5b00d9b70a3a..70a63dc826cd 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 0107/1244] 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 da6f66876ae6..0f1dad88aec4 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 830b3d11abee..b2c5c57f7e1f 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 0108/1244] 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 0f1dad88aec4..7fe4cd007899 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 b2c5c57f7e1f..23539d1f01e0 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 0109/1244] 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 7fe4cd007899..2a9cebda2e26 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 23539d1f01e0..ddf7e88a7c0b 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 0110/1244] 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 546419625c6d..9a55fed1b7d7 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 0111/1244] 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 2a9cebda2e26..15b737efda3a 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 ddf7e88a7c0b..ede05382af15 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 0112/1244] 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 15b737efda3a..9f03607f68ea 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 ede05382af15..599932332d74 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 0113/1244] 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 9f03607f68ea..681111061e0f 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 599932332d74..3ab9f51a1108 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 0114/1244] 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 5033e241e1ed..be7a2e46d936 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 0115/1244] 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 681111061e0f..a6efa62f8c90 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 3ab9f51a1108..31e7a461e93c 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 0116/1244] 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 be7a2e46d936..900a33559792 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 0117/1244] 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 a6efa62f8c90..1c55fa60b6cc 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 31e7a461e93c..ea740dedff9e 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 0118/1244] 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 1c55fa60b6cc..7c20012f98a4 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 ea740dedff9e..e2f6f100b51c 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 0119/1244] 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 900a33559792..fb9fdce5f4ea 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 0120/1244] Update .vsts-ci.yml --- .vsts-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d91efec67dd5..652748bb7a0e 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 0121/1244] 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 7c20012f98a4..4cd22f4bbb29 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 e2f6f100b51c..fee06e8fc374 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 0122/1244] 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 287138a80fae..961d6500f401 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 0123/1244] 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 287138a80fae..a48dd953f9a2 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 0124/1244] 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 4cd22f4bbb29..3512ced5bcd3 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 fee06e8fc374..b522e49f6465 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 0125/1244] Update NuGet.config --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index ae8794e04ca6..7cab4584c4f4 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 0126/1244] 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 82e72d18a537..459c393ccefc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4db04f5c391d..062db14e309d 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 37777e0775de..cba6f0abc3d4 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 0127/1244] 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 062db14e309d..a30d8f4c77f7 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 cba6f0abc3d4..bf9a52a4b6d3 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 0128/1244] Restore the NuGet.config file --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 459c393ccefc..fc71fdca34e7 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 0129/1244] Update NuGet.config --- NuGet.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index fc71fdca34e7..82e72d18a537 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 0130/1244] 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 fb9fdce5f4ea..3277993b81d0 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 961d6500f401..8955f3f9b565 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 0131/1244] 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 3277993b81d0..da4cb6e26a04 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 8955f3f9b565..2efa9789fcb3 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 0132/1244] 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 da4cb6e26a04..4cf0703f1f2b 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 2efa9789fcb3..8d77a663f160 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 0133/1244] 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 82e72d18a537..1eda47b5977f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,11 +11,11 @@ + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a30d8f4c77f7..6592a3f4a73e 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 bf9a52a4b6d3..7e95465f2619 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 0134/1244] 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 4cf0703f1f2b..190a9e45c9db 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 8d77a663f160..551eec7cff2f 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 0135/1244] Update NuGet.config --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 1eda47b5977f..ecbd1218a3a4 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 0136/1244] 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 190a9e45c9db..8578a2a8007f 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 551eec7cff2f..a6345c87f7c4 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 0137/1244] 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 8578a2a8007f..91115f38cae2 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 a6345c87f7c4..3f393838cfa8 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 0138/1244] 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 fb9fdce5f4ea..a87fad83d40b 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 0139/1244] 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 91115f38cae2..623ce00afc78 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 3f393838cfa8..d876617ed051 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 0140/1244] 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 652748bb7a0e..f4cd67b9f455 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 0141/1244] 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 f4cd67b9f455..1d18d9dd00ca 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 0142/1244] 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 7d5d03116754..000000000000 --- 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 68917950ec59..000000000000 --- 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 8458c20e51a3..000000000000 --- 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 da26d2cb7908..000000000000 --- 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 9a55fed1b7d7..000000000000 --- 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 0143/1244] 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 623ce00afc78..3944aa853982 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 d876617ed051..3cfd24a74af8 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 0144/1244] [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 6592a3f4a73e..82ff82885814 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 0145/1244] 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 ecbd1218a3a4..1eda47b5977f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6592a3f4a73e..a288c224450d 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 7e95465f2619..043db5c06a39 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 0146/1244] 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 a87fad83d40b..1cd6f4cf4eaa 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 0147/1244] 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 3944aa853982..6762eff50575 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 3cfd24a74af8..6260295ab4d9 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 0148/1244] [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 82ff82885814..75836c484bb0 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 0149/1244] Update .vsts-ci.yml --- .vsts-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 1d18d9dd00ca..7fb2a509df98 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 0150/1244] 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 36ce5217c3eb..0b6be41b08b2 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 0151/1244] 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 6762eff50575..f1826bc9b384 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 6260295ab4d9..78fcd3fbbb42 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 0152/1244] 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 a288c224450d..c337f6bff8fb 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 043db5c06a39..49858df347a7 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 0153/1244] 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 f1826bc9b384..b411444a4c7a 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 78fcd3fbbb42..587b38e6e431 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 0154/1244] 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 c337f6bff8fb..2722b64bd475 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 49858df347a7..96f6ddeab64b 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 0155/1244] 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 b411444a4c7a..a1506fbef216 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 587b38e6e431..59e7c704cc64 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 0156/1244] 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 a1506fbef216..40be0827d950 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 59e7c704cc64..4265a386479d 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 0157/1244] 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 40be0827d950..bfd65c702b2a 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 4265a386479d..fcfe8566c796 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 0158/1244] 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 1eda47b5977f..5b0041b726bd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2722b64bd475..f7e47a279f41 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 96f6ddeab64b..79475ddb1c93 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 0159/1244] 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 f7e47a279f41..0b1574cda99f 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 79475ddb1c93..ad09bd6e672a 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 0160/1244] 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 | 624 +++++------------- .../post-build/setup-maestro-vars.yml | 124 ++-- eng/common/templates/steps/execute-codeql.yml | 32 + global.json | 6 +- 22 files changed, 343 insertions(+), 1198 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 ecbd1218a3a4..5b0041b726bd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75836c484bb0..930bf9a3b79f 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 7e95465f2619..f42e706d5b5f 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 0728b1a8b570..000000000000 --- 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 2427ca6b6aec..8508397d7764 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 4999c307088a..adea8e8da2ab 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 1157151f4862..b9fe73179643 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 3bd8b29ebd72..b7bcfe38caf1 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 4882dd931341..d0a1ea8b0f23 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 e54ce956f908..000000000000 --- 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 37dceb1bab0a..30d1de5835e8 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 069098b0a066..9d1e3042d8a6 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 fe9dfdf720cf..d91bf9147116 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 000000000000..f7dc5ea4aaa6 --- /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 90015a7e5ae3..70d44735ace4 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 8990dfc8c87c..000000000000 --- 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 3220c6a4f92f..000000000000 --- 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 c99fd7503767..1ac7f49a43ca 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 4f79cf0f3370..24e92a275a4f 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 - - # 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 - - BARBuildId: '' - PromoteToChannelIds: '' - - enableSourceLinkValidation: false - enableSigningValidation: true - enableSymbolValidation: false - enableNugetValidation: true - publishInstallersAndChecksums: true - SDLValidationParameters: - enable: false - continueOnError: false - params: '' - artifactNames: '' - downloadArtifacts: 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 + + - name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + + - name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + + - 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 }} - - - 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' +- 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 }} + + - 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 4a22b2e6f6de..0c87f149a4ad 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]" + $AzureDevOpsProject = $Env:System_TeamProject + $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId + $AzureDevOpsBuildId = $Env:Build_BuildId + } + else { + $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" - $IsStableBuild = $buildInfo.stable - $AzureDevOpsProject = $buildInfo.azureDevOpsProject - $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId - $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId - } + $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $apiHeaders.Add('Accept', 'application/json') + $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - 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" + $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]" - 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" + $IsStableBuild = $buildInfo.stable + $AzureDevOpsProject = $buildInfo.azureDevOpsProject + $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId + $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId } - catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - exit 1 - } - 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 000000000000..3930b1630214 --- /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 86e408bbe4f5..641ac3ef3fed 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 0161/1244] 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 1cd6f4cf4eaa..71c2577c68fd 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 0162/1244] 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 ecbd1218a3a4..5b0041b726bd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75836c484bb0..ada6e3949694 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 0163/1244] 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 7e95465f2619..617b6cf43238 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 b83c642f37aa..e485151c6581 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 0164/1244] 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 0b1574cda99f..b91e54edc6e7 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 ad09bd6e672a..9be670713052 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 0165/1244] 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 bfd65c702b2a..8967840b45ad 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 fcfe8566c796..35a700027df7 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 0166/1244] 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 | 624 +++++------------- .../post-build/setup-maestro-vars.yml | 124 ++-- eng/common/templates/steps/execute-codeql.yml | 32 + global.json | 6 +- 21 files changed, 342 insertions(+), 1197 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 71c2577c68fd..a63f8d99b193 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 961d6500f401..48f420f4d17f 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 0728b1a8b570..000000000000 --- 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 2427ca6b6aec..8508397d7764 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 4999c307088a..adea8e8da2ab 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 1157151f4862..b9fe73179643 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 3bd8b29ebd72..b7bcfe38caf1 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 4882dd931341..d0a1ea8b0f23 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 e54ce956f908..000000000000 --- 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 37dceb1bab0a..30d1de5835e8 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 069098b0a066..9d1e3042d8a6 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 fe9dfdf720cf..d91bf9147116 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 000000000000..f7dc5ea4aaa6 --- /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 90015a7e5ae3..70d44735ace4 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 8990dfc8c87c..000000000000 --- 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 3220c6a4f92f..000000000000 --- 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 c99fd7503767..1ac7f49a43ca 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 4f79cf0f3370..24e92a275a4f 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 - - # 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 - - BARBuildId: '' - PromoteToChannelIds: '' - - enableSourceLinkValidation: false - enableSigningValidation: true - enableSymbolValidation: false - enableNugetValidation: true - publishInstallersAndChecksums: true - SDLValidationParameters: - enable: false - continueOnError: false - params: '' - artifactNames: '' - downloadArtifacts: 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 + + - name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + + - name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + + - 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 }} - - - 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' +- 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 }} + + - 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 4a22b2e6f6de..0c87f149a4ad 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]" + $AzureDevOpsProject = $Env:System_TeamProject + $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId + $AzureDevOpsBuildId = $Env:Build_BuildId + } + else { + $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" - $IsStableBuild = $buildInfo.stable - $AzureDevOpsProject = $buildInfo.azureDevOpsProject - $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId - $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId - } + $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $apiHeaders.Add('Accept', 'application/json') + $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - 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" + $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]" - 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" + $IsStableBuild = $buildInfo.stable + $AzureDevOpsProject = $buildInfo.azureDevOpsProject + $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId + $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId } - catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - exit 1 - } - 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 000000000000..3930b1630214 --- /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 86e408bbe4f5..641ac3ef3fed 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 0167/1244] 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 617b6cf43238..808808a3136c 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 0168/1244] 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 e485151c6581..6e8361d80efe 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 0169/1244] 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 89142c5044e4..b4702ae32067 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 0172/1244] 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 b91e54edc6e7..b3e638b50241 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 9be670713052..053c385d7098 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 0173/1244] 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 b3e638b50241..ded3dc26357c 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 053c385d7098..9364bf0df3d0 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 0174/1244] 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 8967840b45ad..7a1ad0014417 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 35a700027df7..85859bf2f37e 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 0175/1244] 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 7a1ad0014417..a047b3ae53f8 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 85859bf2f37e..d4566fceeb1f 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 0176/1244] 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 ded3dc26357c..7b208eda12b7 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 9364bf0df3d0..a81fd8a320c5 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 0177/1244] 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 0b6be41b08b2..65f3fbca59e0 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 0178/1244] 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 a047b3ae53f8..1110aaa8281f 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 d4566fceeb1f..3cc5d43dee69 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 0179/1244] 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 | 114 ++++++++++++++++++++-------------------- eng/Versions.props | 40 +++++++------- 3 files changed, 99 insertions(+), 79 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba0bf48d8854..f7517c012456 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 8d719466b93b..293df744e6e7 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 + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - + 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 + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef15b555537a90da229ce6474658ae1a9916a932 + 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 - 3a25a7f1cc446b60678ed25c9d829420d6321eba + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 - + 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 - 3a25a7f1cc446b60678ed25c9d829420d6321eba + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 3a25a7f1cc446b60678ed25c9d829420d6321eba - - https://github.com/dotnet/aspnetcore - ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace - - https://github.com/dotnet/aspnetcore - ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 + + 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://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 85087524bbbe..472e6b2aa51d 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 0180/1244] 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 42533702451e..1cf223da9193 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 0181/1244] 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 1110aaa8281f..6dba94e1ae8b 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 3cc5d43dee69..a09a8d90b10e 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 0182/1244] 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 0cb1be8febdc..67c8c46b7586 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 0183/1244] 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 7fb2a509df98..b0386b1bd708 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 0184/1244] 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 6dba94e1ae8b..070fdb3dbbad 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 a09a8d90b10e..ad312df2057c 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 0185/1244] 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 a63f8d99b193..04231386d463 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 0186/1244] [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 7ab56a268fb2..442f99b015c7 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 0187/1244] 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 070fdb3dbbad..2998ad81f49b 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 ad312df2057c..9e34317b8075 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 0188/1244] 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 2998ad81f49b..3fa329478cfc 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 9e34317b8075..6e3ddd9da790 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 0189/1244] 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 652748bb7a0e..303276853662 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 0190/1244] 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 3fa329478cfc..9c266cc0b36d 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 6e3ddd9da790..992713f0ff04 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 0191/1244] 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 9c266cc0b36d..3b44c84fe871 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 992713f0ff04..7d08c45569bb 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 0192/1244] 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 04231386d463..9e8b1f2b43d1 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 48f420f4d17f..ca044a3ad6d8 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 5023d36dcb3c..5cd5325d7b4e 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 641ac3ef3fed..8d9bc761f7b3 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 0193/1244] [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 953d16ee6bd0..08821b070530 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 0194/1244] [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 953d16ee6bd0..08821b070530 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 0195/1244] 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 3b44c84fe871..2e9db97fa7e8 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 7d08c45569bb..9250041049df 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 0196/1244] 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 7e4cd7dec51a..8fd0a809828b 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 0197/1244] 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 7e4cd7dec51a..f4bb3872cf54 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 0198/1244] 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 2e9db97fa7e8..7afe001bbc0b 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 9250041049df..c393a8c80cf1 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 0199/1244] [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 442f99b015c7..ecab8f9f1a29 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 f4bb3872cf54..6e8ab2e83fc1 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 5023d36dcb3c..5cd5325d7b4e 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 641ac3ef3fed..8d9bc761f7b3 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 0200/1244] 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 7afe001bbc0b..c02b5513be25 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 c393a8c80cf1..5e762cde077f 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 0201/1244] 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 c02b5513be25..212a6f7bffc5 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 5e762cde077f..658b2b5b75ab 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 0202/1244] 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 212a6f7bffc5..470b2694fab2 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 658b2b5b75ab..0fc7fc145fb7 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 0203/1244] 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 470b2694fab2..af6316dc8580 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 0fc7fc145fb7..04449b295085 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 0204/1244] 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 9e8b1f2b43d1..101a4aaff7b0 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 0205/1244] 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 af6316dc8580..64bcc73ef6d7 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 04449b295085..1c4a308c58e3 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 0206/1244] [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 ecab8f9f1a29..7fed04179c3c 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 0207/1244] 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 64bcc73ef6d7..1342ecc8c53c 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 1c4a308c58e3..8719685fa505 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 0208/1244] 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 1342ecc8c53c..bad0e2855292 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 8719685fa505..4647de74ff58 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 0209/1244] 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 101a4aaff7b0..3dd9a0ce6f7c 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 0210/1244] 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 ba0bf48d8854..5b0041b726bd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7fed04179c3c..3c6675d205a6 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 0211/1244] 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 bad0e2855292..7dc321ec4e08 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 4647de74ff58..ca150695231d 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 0212/1244] Update NuGet.config --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 5b0041b726bd..ba0bf48d8854 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 0213/1244] 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 7dc321ec4e08..5f13ae39e97c 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 ca150695231d..f6ad4b2a08c4 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 0214/1244] 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 5f13ae39e97c..5b103bde3977 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 f6ad4b2a08c4..03c24897d01e 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 0215/1244] 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 5b103bde3977..90a73282f5ab 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 03c24897d01e..4a21e42dbc47 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 0216/1244] 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 3dd9a0ce6f7c..93db93edf0b0 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 0217/1244] 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 ba0bf48d8854..1eda47b5977f 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 3c6675d205a6..fefbbd4c130e 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 0218/1244] 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 605398339c74..deb21b652063 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 2eb7b2625b09..6d9896797427 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 aad8526a9312..fed54488b31d 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 ef507ed95566..000000000000 --- 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 4a21e42dbc47..08ad9fc18c5d 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 0221/1244] 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 e7ccc03e59d1..9994b0f8c1f4 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 08ad9fc18c5d..1e14c9ed3201 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 0222/1244] 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 93db93edf0b0..621ebe0f5aa3 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 0223/1244] 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 210a351e8354..c122f621f51a 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 aae378137f8b..1f6e4159838d 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 0224/1244] 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 fca0e2fd5859..881f29147d08 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 e550fe2506a0..bf2ae550c582 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 0225/1244] 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 d52653b21ecb..a700583ccbbe 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 1f6e4159838d..e7e11ad3f89c 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 0226/1244] 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 881f29147d08..13a6b5143a14 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 0227/1244] 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 a700583ccbbe..be47314f1206 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 e7e11ad3f89c..1e120bac7d9f 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 0228/1244] 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 be47314f1206..28a480dc3e8a 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 1e120bac7d9f..0f0612fece49 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 0229/1244] 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 28a480dc3e8a..c99e6ff8d2af 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 0f0612fece49..5385fa28c3be 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 0230/1244] 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 c99e6ff8d2af..9a182f592637 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 5385fa28c3be..1412e4c74c84 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 0231/1244] 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 9a182f592637..2417dcd33a8d 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 1412e4c74c84..e37c22a4b862 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 0232/1244] [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 deb21b652063..61f7977c6646 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 6d9896797427..bc8d0a972fbb 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 fed54488b31d..e26d7cfac9bf 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 0233/1244] 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 61f7977c6646..0ab2a433c394 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 bc8d0a972fbb..3f3535e08fba 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 e26d7cfac9bf..6addce9a166e 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 0234/1244] 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 2417dcd33a8d..c21ba3875e0f 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 e37c22a4b862..d8e04a619155 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 0235/1244] 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 c21ba3875e0f..0c7eae90a641 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 d8e04a619155..560463bf9e61 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 0236/1244] 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 0c7eae90a641..f1157096efb0 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 560463bf9e61..a79eceea8786 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 0237/1244] 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 f1157096efb0..9ca5af2222e3 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 0238/1244] 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 bf2ae550c582..7642e5393362 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 0239/1244] 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 9ca5af2222e3..4d9fcbeec2c0 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 a79eceea8786..9fd6b6c8be24 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 0240/1244] 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 4d9fcbeec2c0..1f71f1072bda 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 9fd6b6c8be24..394d10ad34f3 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 0241/1244] 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 0ab2a433c394..774c3b7b8be7 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 3f3535e08fba..5ccaad39821e 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 6addce9a166e..9931f68b044c 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 0242/1244] 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 1f71f1072bda..3e9fb1b14c98 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 394d10ad34f3..8ee8291c962e 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 0243/1244] Remove api.nuget.org feed --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 13a6b5143a14..881f29147d08 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 0244/1244] 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 aad8526a9312..59a79b02a133 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 0245/1244] 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 3e9fb1b14c98..cf41fbb6cb63 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 0246/1244] 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 7642e5393362..4e8c680cb0fe 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 0247/1244] 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 c537331bec68..243fad789e17 100644 --- a/src/core-sdk-tasks/AzurePublisher.cs +++ b/src/core-sdk-tasks/AzurePublisher.cs @@ -7,7 +7,6 @@ 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 @@ private static string CalculateRelativePathForFile(string file, Product product, } } } -#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 f4f54d8fb4f2..5ad1f11af317 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 0248/1244] 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 645dd691e4fc..cb56ce75bc9b 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 0249/1244] 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 b7dbf0c079c0..648ab4983fd8 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 0250/1244] 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 4e8c680cb0fe..5477e4412c23 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 0251/1244] 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 cb56ce75bc9b..b916c9f6ab68 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 0252/1244] 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 605398339c74..9a84139e5913 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 b916c9f6ab68..ac0dfcb008cb 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 648ab4983fd8..c2803242211b 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 0253/1244] 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 483730f3a445..c102a161840b 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 0254/1244] 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 ac0dfcb008cb..26c7c8331b5e 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 0255/1244] 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 5477e4412c23..23621072a057 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 0256/1244] 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 26c7c8331b5e..664e26d79f66 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 0257/1244] 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 5477e4412c23..8d678e880e64 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 59a79b02a133..eb9e4941ca54 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 3f8f0832101f..a230a4d7cf99 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 a800f5849b63..18dbe83247b7 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 6330a152909d..a0db3872f513 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 cfb96513495c..200a934b71da 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 9c59468f6342..f2bdcbe28595 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 39f48573d26c..5874e648b2f3 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 69dab2b18c81..e61a6e689782 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 6aeeebdf2370..0f43286ce339 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 73c2951f7d11..3fc18b35727d 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 @@ public static void Compare(string baselineFileName, IOrderedEnumerable a 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 be0e6b4117f2..11c3ed821fb4 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 5a6716030c5f..d3385c37ef50 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 2c38e43cab5a..497211ba104c 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 @@ public static (Process Process, string StdOut, string StdErr) ExecuteProcess( 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 000000000000..774d76c33436 --- /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 dd4cadf705e2..01168ef4e292 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.IO; using Xunit; using Xunit.Abstractions; -using System; using System.Linq; namespace Microsoft.DotNet.SourceBuild.SmokeTests; @@ -31,7 +30,7 @@ public void VerifyTargetingPacksHaveDoc() { 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 void VerifyTargetingPacksHaveDoc() 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 000000000000..0a153ba8791d --- /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 f82692071fe9..cd08e9f4ed7c 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 000000000000..25bc36ee8a1b --- /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 000000000000..8fda6a64c5bb --- /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 275d6dcecbac..000000000000 --- 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 0258/1244] 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 ac0dfcb008cb..97b74433127f 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 c2803242211b..15f3c6369995 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 0259/1244] 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 47ddd91207c0..6b93ce0eb69f 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 15f3c6369995..6a40b841e457 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 0260/1244] 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 6b93ce0eb69f..4a0f26f4329a 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 6a40b841e457..0b06e1eadec7 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 0261/1244] 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 4a0f26f4329a..a9f17fba7a3f 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 0b06e1eadec7..92a27e068280 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 0262/1244] 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 a9f17fba7a3f..dc8149d45bca 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 92a27e068280..38606015caea 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 0263/1244] 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 dc8149d45bca..9ec71481ec58 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 38606015caea..bd52376b0d10 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 0264/1244] 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 9ec71481ec58..60c9ed203e06 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 bd52376b0d10..aebb406cd98c 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 0265/1244] [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 dffe8c3f1ae0..d78524d7140f 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 eb9e4941ca54..6e0227b5dd90 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 000000000000..a733a8885824 --- /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 000000000000..f6c77453142a --- /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 30d1de5835e8..547d878da073 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 70d44735ace4..554e71cfc436 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 000000000000..f4d7937f3798 --- /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 abb1b2bcda42..ba40dc82f141 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 8d9bc761f7b3..8a183c7dec82 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 b1cdb03da66e..000000000000 --- 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 5141348f250f..000000000000 --- 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 1883124134ba..000000000000 --- 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 0266/1244] [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 9ec71481ec58..a20444382067 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 bd52376b0d10..d06e1a07dd3d 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 000000000000..a733a8885824 --- /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 000000000000..f6c77453142a --- /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 30d1de5835e8..547d878da073 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 70d44735ace4..554e71cfc436 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 000000000000..f4d7937f3798 --- /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 8d9bc761f7b3..8a183c7dec82 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 b1cdb03da66e..000000000000 --- 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 5141348f250f..000000000000 --- 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 1883124134ba..000000000000 --- 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 0267/1244] 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 60c9ed203e06..9c3ab8fc6298 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 aebb406cd98c..ee7a7ccabc1e 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 0268/1244] 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 e413198dbb43..ec757eac9655 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 0269/1244] 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 ec757eac9655..4e751a00d0d5 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 0270/1244] 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 4e751a00d0d5..b1177caa1de9 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 78b7cf547091..fb8bb15a1a6c 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 0271/1244] 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 b1177caa1de9..b3bef184aee5 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 fb8bb15a1a6c..1687712a0194 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 0272/1244] 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 b1177caa1de9..bcf5a8db5048 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 0273/1244] 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 8e55a40b5ef0..4f993567ff70 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 0274/1244] [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 6e0227b5dd90..06555de6b1a4 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 0275/1244] [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 fb8bb15a1a6c..b32208ce4d40 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 0276/1244] 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 b3bef184aee5..f57f3c20b971 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 03282fdd1261..495359535f18 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 0277/1244] 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 41df3e75b0fd..5c135b3fe37d 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 @@ public static (Process Process, string StdOut, string StdErr) ExecuteProcess( 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 8db91d9d7b6d..000000000000 --- 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 0a153ba8791d..000000000000 --- 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 7e093b8fb1ac..000000000000 --- 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 59db1a3f12ff..000000000000 --- 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 cd08e9f4ed7c..000000000000 --- 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 0278/1244] 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 be19beb975c6..f02b2dc54b91 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 0279/1244] 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 f02b2dc54b91..dd824bf4056e 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 495359535f18..515b8b84829d 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 0280/1244] 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 c102a161840b..838d09c1d964 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 0281/1244] 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 dd824bf4056e..da38ae900e9a 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 515b8b84829d..3d67cd42887c 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 d0a1ea8b0f23..24cec0424e5d 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 f7dc5ea4aaa6..54c393af440d 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 000000000000..7b8ee18a28d7 --- /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 abb1b2bcda42..ba40dc82f141 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 000000000000..1a860bd04064 --- /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 8a183c7dec82..4b8ebdbc752d 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 0282/1244] 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 ac9261a9422b..c58c6a194740 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 0283/1244] 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 da38ae900e9a..965dc46e31cc 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 3d67cd42887c..0089762904b4 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 0284/1244] 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 4d5b44e81f27..ffba8a6d9a64 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 6b60dae86250..5f646a6ce181 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 0285/1244] 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 4d5b44e81f27..ffba8a6d9a64 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 6b60dae86250..5f646a6ce181 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 0286/1244] 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 5988fb01575d..cfe437819b1c 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 0287/1244] 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 838d09c1d964..c56cf824ba28 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 0288/1244] 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 cfe437819b1c..a48761a45be6 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 0289/1244] 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 359567ebba28..a1798b383065 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 0290/1244] 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 3d790dc6e911..9a84139e5913 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 a48761a45be6..c53fd543e668 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 5f49927c0e7d..227b556f5262 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 0291/1244] 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 c53fd543e668..31951f2ce22a 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 227b556f5262..7665cf7237e3 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 0292/1244] 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 31951f2ce22a..60a5c895ec36 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 7665cf7237e3..bf0666e38efd 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 0293/1244] 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 60a5c895ec36..5ad893231576 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 bf0666e38efd..b167add0c8f7 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 4b8ebdbc752d..3778b80ba005 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 0294/1244] 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 e923b917efff..5dc640f4e75a 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 5f5b60dffe6d..aa6472a77edf 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 0295/1244] 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 60a5c895ec36..31d6d444e24a 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 bf0666e38efd..0d4e74d64086 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 0296/1244] 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 31d6d444e24a..a1f5414b4462 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 0d4e74d64086..8a9c119d5a9b 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 0297/1244] 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 60a5c895ec36..f1170903cd7f 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 0298/1244] 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 e923b917efff..5dc640f4e75a 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 5f5b60dffe6d..aa6472a77edf 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 0299/1244] 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 29cbe63811d8..6e314d6b28dc 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 18a3f7dc2ebf..c6a684c3089b 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 0300/1244] 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 6e314d6b28dc..f369846535f5 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 c6a684c3089b..b59542b972c9 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 0301/1244] 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 774c3b7b8be7..9a84139e5913 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 a1798b383065..794259a0c7cb 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 4e112b3f1bad..3c5ffbd691b3 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 d0a1ea8b0f23..24cec0424e5d 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 f7dc5ea4aaa6..54c393af440d 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 000000000000..7b8ee18a28d7 --- /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 000000000000..1a860bd04064 --- /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 8a183c7dec82..3778b80ba005 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 0302/1244] 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 794259a0c7cb..9930299ff241 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 0303/1244] 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 c56cf824ba28..d306f311e2bf 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 ffba8a6d9a64..4d5b44e81f27 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 5f646a6ce181..6b60dae86250 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 0304/1244] 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 f369846535f5..5efcc6748d37 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 b59542b972c9..6b0c3c14bdc7 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 0305/1244] 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 5efcc6748d37..ce14fae3502c 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 6b0c3c14bdc7..6201d7ee5a6f 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 0306/1244] 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 ce14fae3502c..764518b7e795 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 6201d7ee5a6f..29653e4d13d2 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 0307/1244] [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 08821b070530..0c141e3cbbb2 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 0308/1244] 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 764518b7e795..f07a36684947 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 29653e4d13d2..28c1340488df 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 0309/1244] 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 f07a36684947..f09857939b67 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 28c1340488df..c9bef5e5fe99 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 0310/1244] 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 f09857939b67..98c0cffaec93 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 c9bef5e5fe99..4142a45ecb7a 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 0311/1244] 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 98c0cffaec93..c8bd4a6aa244 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 4142a45ecb7a..a5c8c3ca0d78 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 0312/1244] 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 c8bd4a6aa244..f07e631080f2 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 a5c8c3ca0d78..932f06c7e36c 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 0313/1244] Fix issue with BundledTemplates condition --- src/redist/targets/BundledTemplates.targets | 163 ++++++++++---------- 1 file changed, 81 insertions(+), 82 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index b1896eb098bd..371148c02a7c 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -20,94 +20,93 @@ - - - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + + + + - - - - - - + + + + - - - - + + + $(NuGetPackageRoot)$([System.String]::copy('%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg').ToLower()) + + - - - %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg - $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) - - - - From 57292e300ccb59d7512f54d5402747c4b40336c5 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 17 Mar 2022 12:38:23 -0500 Subject: [PATCH 0314/1244] Make a source-build targetted fix to unblock release --- src/redist/targets/BundledTemplates.targets | 165 ++++++++++---------- 1 file changed, 83 insertions(+), 82 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 371148c02a7c..30f47ce59ebe 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -20,93 +20,94 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + - - - - + + + + + + - - - $(NuGetPackageRoot)$([System.String]::copy('%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg').ToLower()) - - + + + + + + + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').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 0315/1244] 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 f07e631080f2..8eb3af144a00 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 932f06c7e36c..0d0a12bf40d1 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 0316/1244] 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 8eb3af144a00..ccae9d91abe1 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 0d0a12bf40d1..4f09f46a0b69 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 0317/1244] 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 9a84139e5913..58f43c70c295 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 9930299ff241..93bf591cf245 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 b1a71dbe88bd..5e18e0d6737a 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 ba40dc82f141..abb1b2bcda42 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 721dc2879b72..000000000000 --- 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 a6a968ae9424..5c9b2f490792 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 0318/1244] 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 ccae9d91abe1..01db4e9abf34 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 4f09f46a0b69..87fc44cae876 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 0319/1244] 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 01db4e9abf34..eb7ed2ba17d1 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 87fc44cae876..13847da17912 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 0320/1244] 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 eb7ed2ba17d1..4652eecc36dd 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 13847da17912..58f363d42b4a 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 0321/1244] 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 58f43c70c295..4205579dd889 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 93bf591cf245..5180e1313c98 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 5e18e0d6737a..3de1c20c51f7 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 0322/1244] 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 4652eecc36dd..8d52e7c98fff 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 58f363d42b4a..50e5a29d8f9e 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 0323/1244] 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 4205579dd889..e885f4e2b0d4 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 5180e1313c98..4d2b4672a646 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 3de1c20c51f7..94207a722ef8 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 0324/1244] [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 18dbe83247b7..da87d93cf801 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 e76a80dc3831..1cec502abef5 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 e4ad12e496f3..6fc81bf3dd2e 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 fffc76ce7c92..c9310fa6c7b9 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 @@ public void ExecuteRun(string projectName) => 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 000000000000..18331103782b --- /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 5c135b3fe37d..4a7b87750628 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 @@ public static string ExecuteProcessValidateExitCode(string fileName, string args 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 e9f97c826d3f..74657726cc8a 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 SdkContentTests(ITestOutputHelper outputHelper) : base(outputHelper) { } /// 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 void CompareMsftToSb() 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 ec672a0475a5..6418004c88dc 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 6e8361d80efe..3618623f1f30 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 b1896eb098bd..30f47ce59ebe 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 0325/1244] [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 8d52e7c98fff..bd871c04e83c 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 50e5a29d8f9e..d00e86ef1073 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 65f3fbca59e0..000000000000 --- 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 b71f75cb95b2..000000000000 --- 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 1d9ec8a94e58..5d9b44df0173 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -34,7 +34,7 @@ public void ManifestReaderCanReadManifests() 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 0326/1244] 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 bd871c04e83c..c63679f7a4f3 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 d00e86ef1073..f72e9f46e5d0 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 0327/1244] 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 c63679f7a4f3..7b928d7994c0 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 f72e9f46e5d0..30056fc82a3b 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 0328/1244] 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 7b928d7994c0..8473875a85d3 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 30056fc82a3b..e8531dbff231 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 0329/1244] 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 8473875a85d3..0fac4c52d0f8 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 e8531dbff231..dfaae54ac9b7 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 0330/1244] 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 0fac4c52d0f8..b3d280ca9654 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 dfaae54ac9b7..8ab302437780 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 0331/1244] 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 9930299ff241..905170bbbe65 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 0332/1244] 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 1cf223da9193..1bbe3f77b239 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 0333/1244] 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 b3d280ca9654..267a51ed3016 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 0334/1244] 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 267a51ed3016..e08e70d880e8 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 8ab302437780..34ab4da3ab6e 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 0335/1244] 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 e08e70d880e8..66ccd23eed40 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 34ab4da3ab6e..711a619bac30 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 0336/1244] 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 66ccd23eed40..f780e5e7c4da 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 711a619bac30..24219dd38b94 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 0337/1244] 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 f780e5e7c4da..1882e1c32908 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 24219dd38b94..e4a91c6456ab 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 0338/1244] 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 1882e1c32908..92dbc72941ad 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 e4a91c6456ab..df871dfda644 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 0339/1244] 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 92dbc72941ad..1e310aa3e2c4 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 df871dfda644..07d446f53132 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 0340/1244] 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 1e310aa3e2c4..5f9605f5fc3c 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 07d446f53132..6d0f78ba97e3 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 0341/1244] 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 f48a864fe086..000000000000 --- 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 28d60fc2718a..000000000000 --- 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 6d0f78ba97e3..8dec04b5d9eb 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 0343/1244] 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 7d4300d15859..faccbc7a3140 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 8dec04b5d9eb..6b7ace69cc93 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 0344/1244] 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 faccbc7a3140..79c64c2f6b8a 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 6b7ace69cc93..1e42a9cee02e 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 0345/1244] 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 79c64c2f6b8a..d1407be7ff15 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 1e42a9cee02e..ea47b30ddeed 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 0346/1244] 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 d1407be7ff15..99ac4b1a3e41 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 ea47b30ddeed..aa4ffca08504 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 0347/1244] 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 99ac4b1a3e41..0061730bb6ff 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 aa4ffca08504..f312a1075671 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 0348/1244] 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 a241e63d75e2..dfb68c29484f 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 0349/1244] 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 0061730bb6ff..e7660f12a5f2 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 f312a1075671..75d93025b4cf 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 0350/1244] 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 e7660f12a5f2..ace3e0bb47cf 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 75d93025b4cf..33db32f4d3a6 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 0351/1244] 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 ace3e0bb47cf..1c052db2b5fc 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 33db32f4d3a6..32d7c17e5796 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 0352/1244] 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 1c052db2b5fc..9af00e2f86f5 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 32d7c17e5796..9cd0227a2e4d 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 0353/1244] [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 9af00e2f86f5..2b00cee5d0eb 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 9cd0227a2e4d..ec440eb5b94e 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 0354/1244] 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 b1a71dbe88bd..acb24212e408 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 0355/1244] 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 905170bbbe65..1ef6d6a36624 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 b1a71dbe88bd..8937945e6052 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 ba40dc82f141..abb1b2bcda42 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 3778b80ba005..b5bee2e338e0 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 0356/1244] 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 2b00cee5d0eb..95c591503e9b 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 ec440eb5b94e..980b7746f358 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 ba40dc82f141..abb1b2bcda42 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 3778b80ba005..b5bee2e338e0 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 0357/1244] 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 1ef6d6a36624..905170bbbe65 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 8937945e6052..b1a71dbe88bd 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 0358/1244] 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 b5bee2e338e0..3778b80ba005 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 0359/1244] 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 95c591503e9b..9f93453a873a 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 980b7746f358..69e7e3b2216f 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 0360/1244] 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 497d1dbc820e..a241e63d75e2 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 3b6297a53974..6a0c76e0599c 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 0361/1244] Restore the global.json file --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index b5bee2e338e0..3778b80ba005 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 0362/1244] 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 9f93453a873a..2654f15e7938 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 69e7e3b2216f..7f3fb2b1c2e4 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 0363/1244] 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 729c76c4e975..000000000000 --- 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 0364/1244] 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 2654f15e7938..6ab1f843bb11 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 7f3fb2b1c2e4..94d347af65ca 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 0365/1244] 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 6ab1f843bb11..329c39e6f35e 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 0366/1244] 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 1ef6d6a36624..bb0597acf682 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 0367/1244] 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 bb0597acf682..6191cf3c51c8 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 0368/1244] 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 329c39e6f35e..01194a8d235e 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 0369/1244] 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 1ef6d6a36624..d9fd9b4f1095 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 8937945e6052..e3a05c6620ca 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 b5bee2e338e0..b50ccb2beca7 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 0370/1244] 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 6ab1f843bb11..01b4d97686e7 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 94d347af65ca..d16f6af8f03b 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 b5bee2e338e0..b50ccb2beca7 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 0371/1244] 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 814b5afe70de..0eb69828ce6e 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 d16f6af8f03b..19958444bd3f 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 0372/1244] 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 0eb69828ce6e..3dda1b885ffc 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 19958444bd3f..457d694a94f0 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 0373/1244] 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 9a84139e5913..642de6d1137c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,6 +11,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dda1b885ffc..a1b22e8d657f 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 457d694a94f0..5a8f9443c9c0 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 0374/1244] 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 814b5afe70de..5ac02653f04b 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 d16f6af8f03b..4c0d91574e29 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 0375/1244] 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 5ac02653f04b..7d2b01205935 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 0376/1244] 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 c8a1dad2bf9d..47d349cabccd 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 0377/1244] 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 a1b22e8d657f..23b6fe1a03d7 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 5a8f9443c9c0..287c46b603d4 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 0378/1244] 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 23b6fe1a03d7..a3b3a2d43603 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 287c46b603d4..a3446de6ba19 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 0379/1244] 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 0f817719999c..08ee2ea66c01 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 b5d99216df98..20585d3b6a85 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 0380/1244] 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 0f817719999c..f8f6d1786231 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 0381/1244] 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 08ee2ea66c01..edfe0e86a650 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 20585d3b6a85..2634e8b4b457 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 0382/1244] 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 edfe0e86a650..ddcabaf6f98f 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 2634e8b4b457..e0c62ac7e864 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 0383/1244] 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 cdf9dcd6d645..f4b538a41fcd 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 e0c62ac7e864..5bf54776b237 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 0384/1244] 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 f4b538a41fcd..630899ac15ea 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 5bf54776b237..b852fe6eade1 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 0385/1244] [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 e93ceedc3f44..2300d2523d1c 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 0386/1244] [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 5bf54776b237..3ff264ce68e2 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 0387/1244] 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 0c141e3cbbb2..8543f5e5cee9 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 0388/1244] 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 f98b402e3bd8..28c0cb2ba02d 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 1bbe3f77b239..f311e197b43d 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 0389/1244] 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 e885f4e2b0d4..f036177592ba 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 35c32467db37..19158a728456 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 1ce62f442f8d..9f4b10e46b7f 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 b50ccb2beca7..b645142d3598 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 0390/1244] 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 630899ac15ea..ae8bd64c742e 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 28c0cb2ba02d..60da7aa12064 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 b50ccb2beca7..b645142d3598 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 0391/1244] 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 ae8bd64c742e..2aeef5ed371e 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 0392/1244] 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 e885f4e2b0d4..f036177592ba 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 35c32467db37..de2cfd9e7f47 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 0393/1244] 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 74baf5b818da..0c8afac5bc01 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 3618623f1f30..7b8536e4878d 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 0394/1244] 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 057327f53fe3..0cd745f9365b 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 0395/1244] 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 000000000000..f7d7668dcd1a --- /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 0396/1244] 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 000000000000..f7d7668dcd1a --- /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 0397/1244] 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 cf180107cb47..131a316f04f2 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 0398/1244] 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 74baf5b818da..65684028ef43 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 0399/1244] 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 f7cad5354934..7faf06dfb413 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 4b4ef5512376..af3bb634fa05 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 0401/1244] 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 f036177592ba..941bd870a6d0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,6 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51284cde3dd7..cdb415346406 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 0402/1244] 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 cdb415346406..51284cde3dd7 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 0403/1244] Restore the nuget.config file --- NuGet.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NuGet.config b/NuGet.config index 941bd870a6d0..f036177592ba 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 0404/1244] 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 | 27 ++--- 6 files changed, 97 insertions(+), 232 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 cbce2d136f46..3e42736a6093 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 d6bf90f60b25..502343b6d364 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 af3bb634fa05..46320c3cd5e2 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 7ada1a1165a3..000000000000 --- 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 f7d7668dcd1a..000000000000 --- 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 5c9b2f490792..e05004e176e5 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 - - aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + $(SharedFrameworkRid) + linux-x64 + $(AspNetCoreInstallerRid) + x64 + aarch64 + + 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 0405/1244] 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 502343b6d364..1eafa497abde 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 46320c3cd5e2..c2eb24464bfc 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 407e1ca13652d79504d81e9d4fa380216f9a46a0 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Sun, 24 Apr 2022 21:27:50 -0700 Subject: [PATCH 0406/1244] Remove pathcch dependency (#13646) --- src/finalizer/CMakeLists.txt | 1 - src/finalizer/finalizer.cpp | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/finalizer/CMakeLists.txt b/src/finalizer/CMakeLists.txt index bdb26d893bc4..fe1b531ea9eb 100644 --- a/src/finalizer/CMakeLists.txt +++ b/src/finalizer/CMakeLists.txt @@ -31,7 +31,6 @@ target_link_libraries(Finalizer shell32.lib) target_link_libraries(Finalizer advapi32.lib) target_link_libraries(Finalizer version.lib) target_link_libraries(Finalizer msi.lib) -target_link_libraries(Finalizer pathcch.lib) # Add WiX libraries target_link_libraries(Finalizer wcautil.lib) diff --git a/src/finalizer/finalizer.cpp b/src/finalizer/finalizer.cpp index 0d1df6193593..ecb6e1fa99fa 100644 --- a/src/finalizer/finalizer.cpp +++ b/src/finalizer/finalizer.cpp @@ -38,6 +38,39 @@ extern "C" HRESULT Initialize(int argc, wchar_t* argv[]) return hr; } +extern "C" HRESULT StrTrimBackslash(LPWSTR* ppwz, LPCWSTR wzSource) +{ + HRESULT hr = S_OK; + LPWSTR sczResult = NULL; + + int i = lstrlenW(wzSource); + + if (0 < i) + { + for (i = i - 1; i > 0; --i) + { + if (L'\\' != wzSource[i]) + { + break; + } + } + + ++i; + } + + hr = StrAllocString(&sczResult, wzSource, i); + ExitOnFailure(hr, "Failed to copy result string"); + + // Output result + *ppwz = sczResult; + sczResult = NULL; + +LExit: + ReleaseStr(sczResult); + + return hr; +} + extern "C" HRESULT DeleteWorkloadRecords(LPWSTR sczSdkFeatureBandVersion, LPWSTR sczArchitecture) { HRESULT hr = S_OK; @@ -112,7 +145,7 @@ extern "C" HRESULT DeleteWorkloadRecords(LPWSTR sczSdkFeatureBandVersion, LPWSTR ExitOnFailure(hr, "Failed to get size of key name."); // Need to remove trailing backslash otherwise PathFile returns an empty string. - hr = PathCchRemoveBackslash(sczKeyName, cbKeyName); + hr = StrTrimBackslash(&sczKeyName, sczKeyName); ExitOnFailure(hr, "Failed to remove backslash."); hr = StrAllocString(&sczSubKey, PathFile(sczKeyName), 0); From 3e44637c84a15337f0d4f31ec8367f5c0e4a44df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Apr 2022 19:43:03 +0000 Subject: [PATCH 0407/1244] Update dependencies from https://github.com/dotnet/sdk build 20220425.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22212.3 -> To Version 6.0.300-preview.22225.2 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.2.0-4.22211.2 -> To Version 4.3.0-1.22223.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 5 ----- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index cbce2d136f46..9a84139e5913 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,13 +9,8 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0cd745f9365b..ce6288e0ee4d 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 - 8963eb7d0f371d688809146cf75c847987420b86 + 2822d175fa591d866b8c35675b0a78e5bffc29ca - + https://github.com/dotnet/sdk - 8963eb7d0f371d688809146cf75c847987420b86 + 2822d175fa591d866b8c35675b0a78e5bffc29ca @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - 8b5c5b8e817c4299f2693ce7a16fe1465de1d9c4 + c9d9e122cfff99ce9508a54897254d407b148f48 - + https://github.com/dotnet/msbuild - 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b + 12bf0a8ae0c4362b0b3fdcfb3eba75132db9bc69 diff --git a/eng/Versions.props b/eng/Versions.props index 4b4ef5512376..9b48b99a99f7 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.22225.2 + 6.0.300-preview.22225.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 940ed94a5f0d3b26c09df62321c1d54f717f48a6 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 25 Apr 2022 12:46:21 -0700 Subject: [PATCH 0408/1244] Update branding to 6.0.400 non-stable --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4b4ef5512376..98a710b032c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,14 +7,14 @@ 6 0 - 3 + 4 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rtm $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release From 5a790f00c6691ca7671266ddc4db413a50eb84be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Apr 2022 06:17:54 +0000 Subject: [PATCH 0409/1244] Update dependencies from https://github.com/dotnet/sdk build 20220425.10 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22225.2 -> To Version 6.0.400-preview.22225.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 ce6288e0ee4d..41d58f98ed72 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 - 2822d175fa591d866b8c35675b0a78e5bffc29ca + 3b45d4d01bcb4158520dad64e2c1fb41f3fb440c - + https://github.com/dotnet/sdk - 2822d175fa591d866b8c35675b0a78e5bffc29ca + 3b45d4d01bcb4158520dad64e2c1fb41f3fb440c diff --git a/eng/Versions.props b/eng/Versions.props index f61d3159b683..6d6eb66c121e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22225.2 - 6.0.300-preview.22225.2 + 6.0.400-preview.22225.10 + 6.0.400-preview.22225.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2be452220acdeb733e886feb1066ac16b46db00a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Apr 2022 07:36:27 +0000 Subject: [PATCH 0410/1244] Update dependencies from https://github.com/dotnet/sdk build 20220425.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22225.2 -> To Version 6.0.400-preview.22225.12 Dependency coherency updates Microsoft.Build From Version 17.3.0-preview-22221-08 -> To Version 17.3.0-preview-22225-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 41d58f98ed72..541bb14fd5fc 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 - 3b45d4d01bcb4158520dad64e2c1fb41f3fb440c + 7dc68be4339a2a0587b914440f56c1857941d6ce - + https://github.com/dotnet/sdk - 3b45d4d01bcb4158520dad64e2c1fb41f3fb440c + 7dc68be4339a2a0587b914440f56c1857941d6ce @@ -146,9 +146,9 @@ c9d9e122cfff99ce9508a54897254d407b148f48 - + https://github.com/dotnet/msbuild - 12bf0a8ae0c4362b0b3fdcfb3eba75132db9bc69 + cff0b1f269303530cf8c32630586eeb1108f8a93 diff --git a/eng/Versions.props b/eng/Versions.props index 6d6eb66c121e..8e1ae4e1a2b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22225.10 - 6.0.400-preview.22225.10 + 6.0.400-preview.22225.12 + 6.0.400-preview.22225.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5cb7282dde7c343f194ca9d85a7f79e9eca777fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Apr 2022 08:33:43 +0000 Subject: [PATCH 0411/1244] Update dependencies from https://github.com/dotnet/sdk build 20220426.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22225.2 -> To Version 6.0.400-preview.22226.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.3.0-1.22223.8 -> To Version 4.3.0-2.22225.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 541bb14fd5fc..62ad1931ef72 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 - 7dc68be4339a2a0587b914440f56c1857941d6ce + a7d58d3c4d9a00655210cdb4cd45af3c11ad8c03 - + https://github.com/dotnet/sdk - 7dc68be4339a2a0587b914440f56c1857941d6ce + a7d58d3c4d9a00655210cdb4cd45af3c11ad8c03 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - c9d9e122cfff99ce9508a54897254d407b148f48 + cf79620a5243d1f059dc0e295f78d14d798a1e68 diff --git a/eng/Versions.props b/eng/Versions.props index 8e1ae4e1a2b8..b04f10f4ca2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22225.12 - 6.0.400-preview.22225.12 + 6.0.400-preview.22226.1 + 6.0.400-preview.22226.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3361684a6763626ea3f63e6bc7b38de1b210cd32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Apr 2022 17:12:09 +0000 Subject: [PATCH 0412/1244] Update dependencies from https://github.com/dotnet/sdk build 20220426.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22226.1 -> To Version 6.0.400-preview.22226.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 62ad1931ef72..9b0bc4b284ab 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 - a7d58d3c4d9a00655210cdb4cd45af3c11ad8c03 + d718853c1040801be4176ca8e9a0af38315e5f17 - + https://github.com/dotnet/sdk - a7d58d3c4d9a00655210cdb4cd45af3c11ad8c03 + d718853c1040801be4176ca8e9a0af38315e5f17 diff --git a/eng/Versions.props b/eng/Versions.props index b04f10f4ca2b..4eb62cdc6683 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22226.1 - 6.0.400-preview.22226.1 + 6.0.400-preview.22226.8 + 6.0.400-preview.22226.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 57920ef06ee2a726664025a82575123055e63778 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 26 Apr 2022 14:23:01 -0700 Subject: [PATCH 0413/1244] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4eb62cdc6683..de5a25883991 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 4 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + preview $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From a33b4d91649892372c57b3982496737dd138daff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Apr 2022 22:27:35 +0000 Subject: [PATCH 0414/1244] Update dependencies from https://github.com/dotnet/sdk build 20220426.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22226.8 -> To Version 6.0.400-preview.22226.11 Dependency coherency updates Microsoft.Build From Version 17.3.0-preview-22225-02 -> To Version 17.3.0-preview-22226-03 (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 9b0bc4b284ab..0eb386314409 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 - d718853c1040801be4176ca8e9a0af38315e5f17 + b56fadc5a8a2045a55aa841bab0f6380c8dbbde1 - + https://github.com/dotnet/sdk - d718853c1040801be4176ca8e9a0af38315e5f17 + b56fadc5a8a2045a55aa841bab0f6380c8dbbde1 @@ -146,9 +146,9 @@ cf79620a5243d1f059dc0e295f78d14d798a1e68 - + https://github.com/dotnet/msbuild - cff0b1f269303530cf8c32630586eeb1108f8a93 + b6fc583d4cb877e4c23fc83718c4fa8c10161454 diff --git a/eng/Versions.props b/eng/Versions.props index de5a25883991..a2a8910ac249 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22226.8 - 6.0.400-preview.22226.8 + 6.0.400-preview.22226.11 + 6.0.400-preview.22226.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f526d281af87a42efa40fe16840ccd63d9fde0fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Apr 2022 07:01:01 +0000 Subject: [PATCH 0415/1244] Update dependencies from https://github.com/dotnet/sdk build 20220426.18 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22226.11 -> To Version 6.0.400-preview.22226.18 Dependency coherency updates Microsoft.Build From Version 17.3.0-preview-22226-03 -> To Version 17.3.0-preview-22226-04 (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 0eb386314409..22a57d14afb2 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 - b56fadc5a8a2045a55aa841bab0f6380c8dbbde1 + 5084b8f3750d126b6bc4eb8f16dbcd6184d79b9b - + https://github.com/dotnet/sdk - b56fadc5a8a2045a55aa841bab0f6380c8dbbde1 + 5084b8f3750d126b6bc4eb8f16dbcd6184d79b9b @@ -146,9 +146,9 @@ cf79620a5243d1f059dc0e295f78d14d798a1e68 - + https://github.com/dotnet/msbuild - b6fc583d4cb877e4c23fc83718c4fa8c10161454 + f15ed265293d36d4c93099aa371c5bacf72e3338 diff --git a/eng/Versions.props b/eng/Versions.props index a2a8910ac249..8d430b2e3211 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22226.11 - 6.0.400-preview.22226.11 + 6.0.400-preview.22226.18 + 6.0.400-preview.22226.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e78caf913789455b59dfc8867a831e8a78c0392d Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 9 Mar 2022 13:54:57 -0300 Subject: [PATCH 0416/1244] 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 e84198679086..135fbbf1e3cb 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 5c9b2f490792..afd1c4e0a991 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 935684431655..a82f068fcb12 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 01f704c7d8e4..a99a7e9daf5b 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 ed3ccbfeb83a..1a9d849995fc 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 0417/1244] 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 fb083d8a5e10..04fed45629dc 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 7cf584ccbd26be3ead17c4aabf6d4714fe5e32e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Apr 2022 23:17:40 +0000 Subject: [PATCH 0418/1244] Update dependencies from https://github.com/dotnet/sdk build 20220427.9 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22226.18 -> To Version 6.0.400-preview.22227.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 22a57d14afb2..c2ec0611105d 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 - 5084b8f3750d126b6bc4eb8f16dbcd6184d79b9b + 210479cb37d02e99c19178c442515510368cc661 - + https://github.com/dotnet/sdk - 5084b8f3750d126b6bc4eb8f16dbcd6184d79b9b + 210479cb37d02e99c19178c442515510368cc661 diff --git a/eng/Versions.props b/eng/Versions.props index 8d430b2e3211..0054728f8931 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22226.18 - 6.0.400-preview.22226.18 + 6.0.400-preview.22227.9 + 6.0.400-preview.22227.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5f311ab4e49d8f08512cea1585337c070ae4d173 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Apr 2022 00:19:36 +0000 Subject: [PATCH 0419/1244] Update dependencies from https://github.com/dotnet/sdk build 20220427.10 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22226.18 -> To Version 6.0.400-preview.22227.10 Dependency coherency updates Microsoft.Build From Version 17.3.0-preview-22226-04 -> To Version 17.3.0-preview-22227-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 c2ec0611105d..0183cab7f4f7 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 - 210479cb37d02e99c19178c442515510368cc661 + 43c8366ad8f39628d5b0b6c782e05bd85d026579 - + https://github.com/dotnet/sdk - 210479cb37d02e99c19178c442515510368cc661 + 43c8366ad8f39628d5b0b6c782e05bd85d026579 @@ -146,9 +146,9 @@ cf79620a5243d1f059dc0e295f78d14d798a1e68 - + https://github.com/dotnet/msbuild - f15ed265293d36d4c93099aa371c5bacf72e3338 + 011fa5856f704bda92944ce091ffb791620baf87 diff --git a/eng/Versions.props b/eng/Versions.props index 0054728f8931..301cc12f2d99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22227.9 - 6.0.400-preview.22227.9 + 6.0.400-preview.22227.10 + 6.0.400-preview.22227.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e5c85aee6b5ae64bdf6b7d4664d925878aca88d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Apr 2022 03:16:50 +0000 Subject: [PATCH 0420/1244] Update dependencies from https://github.com/dotnet/sdk build 20220427.16 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22227.10 -> To Version 6.0.400-preview.22227.16 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.3-beta.22203.2 -> To Version 12.0.3-beta.22227.6 (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 0183cab7f4f7..439a9fcc1bc2 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 - 43c8366ad8f39628d5b0b6c782e05bd85d026579 + 0023075f8028b4cc182c83ca0d526c45b6f042ab - + https://github.com/dotnet/sdk - 43c8366ad8f39628d5b0b6c782e05bd85d026579 + 0023075f8028b4cc182c83ca0d526c45b6f042ab @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fcb07d637abf53791e2c55c63d9207fc3232fe83 - + https://github.com/dotnet/fsharp - 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 + 7aa51caae853772c4f87a0e29c6ad25e03b730fc - + https://github.com/dotnet/fsharp - 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 + 7aa51caae853772c4f87a0e29c6ad25e03b730fc @@ -146,14 +146,14 @@ cf79620a5243d1f059dc0e295f78d14d798a1e68 - + https://github.com/dotnet/msbuild - 011fa5856f704bda92944ce091ffb791620baf87 + a1fa15d1339e6c496bcbf248a019a606d285c9a3 - + https://github.com/nuget/nuget.client - 6f54dbd49fcda01ca8d71eb4fa4eea6ef54379ab + c94327e5fc8d071f4b8ad4b8ee41c7282d6fb3fc diff --git a/eng/Versions.props b/eng/Versions.props index 301cc12f2d99..bf7e62b84dc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22227.10 - 6.0.400-preview.22227.10 + 6.0.400-preview.22227.16 + 6.0.400-preview.22227.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5738bfc118ad8bba32c523d5553e62943d2282e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Apr 2022 06:58:37 +0000 Subject: [PATCH 0421/1244] Update dependencies from https://github.com/dotnet/sdk build 20220427.20 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22227.16 -> To Version 6.0.400-preview.22227.20 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.300-preview.22208.4 -> To Version 6.0.400-preview.22223.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 439a9fcc1bc2..e7332c39d681 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 115aeb115de1387d8ba427b9bfdf072d7dd64914 + 5744fb6934bf9d9ee28fb9ce9ae2f5b98905e4c1 - + https://github.com/dotnet/templating - 115aeb115de1387d8ba427b9bfdf072d7dd64914 + 5744fb6934bf9d9ee28fb9ce9ae2f5b98905e4c1 - + https://github.com/dotnet/templating - 115aeb115de1387d8ba427b9bfdf072d7dd64914 + 5744fb6934bf9d9ee28fb9ce9ae2f5b98905e4c1 - + https://github.com/dotnet/sdk - 0023075f8028b4cc182c83ca0d526c45b6f042ab + 6d80c366ae26509c5de40f1e46e8154865abfe60 - + https://github.com/dotnet/sdk - 0023075f8028b4cc182c83ca0d526c45b6f042ab + 6d80c366ae26509c5de40f1e46e8154865abfe60 diff --git a/eng/Versions.props b/eng/Versions.props index bf7e62b84dc0..e23344bd120b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22208.4 + 6.0.400-preview.22223.2 @@ -56,8 +56,8 @@ - 6.0.400-preview.22227.16 - 6.0.400-preview.22227.16 + 6.0.400-preview.22227.20 + 6.0.400-preview.22227.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22208.4 + 6.0.400-preview.22223.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From d50fcc042a8cedae8e663e2e3ee57c7d2597b19c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Apr 2022 23:38:02 +0000 Subject: [PATCH 0422/1244] Update dependencies from https://github.com/dotnet/sdk build 20220428.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22227.20 -> To Version 6.0.400-preview.22228.4 Dependency coherency updates Microsoft.Build From Version 17.3.0-preview-22227-03 -> To Version 17.3.0-preview-22228-04 (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 e7332c39d681..5cf7b0f46cb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5744fb6934bf9d9ee28fb9ce9ae2f5b98905e4c1 - + https://github.com/dotnet/sdk - 6d80c366ae26509c5de40f1e46e8154865abfe60 + 764bb658c29642c7eeaee0cc2a0d1cb77ce68e6d - + https://github.com/dotnet/sdk - 6d80c366ae26509c5de40f1e46e8154865abfe60 + 764bb658c29642c7eeaee0cc2a0d1cb77ce68e6d @@ -146,9 +146,9 @@ cf79620a5243d1f059dc0e295f78d14d798a1e68 - + https://github.com/dotnet/msbuild - a1fa15d1339e6c496bcbf248a019a606d285c9a3 + 10dbde3bf1986251a5e958af8c7391ad0d9e7f11 diff --git a/eng/Versions.props b/eng/Versions.props index e23344bd120b..4cf7869a2a2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22227.20 - 6.0.400-preview.22227.20 + 6.0.400-preview.22228.4 + 6.0.400-preview.22228.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5e261ae1f9cecee29210a1408dff5f7bb206721c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 29 Apr 2022 10:53:10 -0700 Subject: [PATCH 0423/1244] Add the cross-targeting app host packs to the arm64 installer --- src/redist/targets/GenerateLayout.targets | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 5c9b2f490792..5dd2ca79ea3b 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -119,6 +119,12 @@ win-arm64 + + win-x86 + win-x64 + win-arm + + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) @@ -176,6 +182,13 @@ packs/%(PackageName)/%(PackageVersion) + + Microsoft.NETCore.App.Host.$(x64AppHostRid) + $(MicrosoftNETCoreAppHostPackageVersion) + $(TargetFramework) + packs/%(PackageName)/%(PackageVersion) + + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) From d501d432bbe8a169049c593e653b84d6918c6044 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 2 May 2022 17:35:45 +0000 Subject: [PATCH 0424/1244] 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 3e42736a6093..5dc437491e58 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 1eafa497abde..7d5754ae316f 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 c2eb24464bfc..c7e0a34949f7 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 f3d1f1dee00f047a9cad9fdf3577878f9403fff9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 May 2022 10:24:56 -0700 Subject: [PATCH 0425/1244] Update dependencies from https://github.com/dotnet/sdk build 20220503.2 (#13741) Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22228.4 -> To Version 6.0.400-preview.22253.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.3-beta.22227.6 -> To Version 12.0.3-beta.22252.3 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cf7b0f46cb0..1e7c4d0d4c44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5744fb6934bf9d9ee28fb9ce9ae2f5b98905e4c1 - + https://github.com/dotnet/sdk - 764bb658c29642c7eeaee0cc2a0d1cb77ce68e6d + 96158ed63a3e3292a70d2e433accd04abd37e8f3 - + https://github.com/dotnet/sdk - 764bb658c29642c7eeaee0cc2a0d1cb77ce68e6d + 96158ed63a3e3292a70d2e433accd04abd37e8f3 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fcb07d637abf53791e2c55c63d9207fc3232fe83 - + https://github.com/dotnet/fsharp - 7aa51caae853772c4f87a0e29c6ad25e03b730fc + ce3bef742571a73fd3cda862b6b07e1431819b06 - + https://github.com/dotnet/fsharp - 7aa51caae853772c4f87a0e29c6ad25e03b730fc + ce3bef742571a73fd3cda862b6b07e1431819b06 @@ -141,19 +141,19 @@ linker - + https://github.com/dotnet/roslyn - cf79620a5243d1f059dc0e295f78d14d798a1e68 + afe689ab1a902bde4af3c6c5e419f898b9347fb3 - + https://github.com/dotnet/msbuild - 10dbde3bf1986251a5e958af8c7391ad0d9e7f11 + 7c4597ea0ba65a2702f9f93016de94999c2a3c2c - + https://github.com/nuget/nuget.client - c94327e5fc8d071f4b8ad4b8ee41c7282d6fb3fc + 5ac16d75a58665c240cd8ac267c0382a5d34cb75 diff --git a/eng/Versions.props b/eng/Versions.props index 4cf7869a2a2c..c264dee60b63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22228.4 - 6.0.400-preview.22228.4 + 6.0.400-preview.22253.2 + 6.0.400-preview.22253.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 53fd800db005f06233e5c6fbe9c9550a9948eea0 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 3 May 2022 10:25:02 -0700 Subject: [PATCH 0426/1244] [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 76297fd3b852..ff9296640dd1 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 52c3341e072b..5976d84460e0 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 e61a6e689782..100183a09811 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 0427/1244] 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 4b4ef5512376..f800c1c2789f 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 1d2f1ed24470cfc43efaeb85976b615af997a9de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 21:23:16 +0000 Subject: [PATCH 0428/1244] Update dependencies from https://github.com/dotnet/sdk build 20220504.6 (#13765) [release/6.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.3-beta.22252.3 to 12.0.3-beta.22253.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.4-beta.22252.3 to 6.0.4-beta.22253.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.3.0-preview-22229-03 to 17.3.0-preview-22254-01 (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 1e7c4d0d4c44..d31df600af32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5744fb6934bf9d9ee28fb9ce9ae2f5b98905e4c1 - + https://github.com/dotnet/sdk - 96158ed63a3e3292a70d2e433accd04abd37e8f3 + 1f8463b2372fb4c3108a350202c82d3bc522b2f1 - + https://github.com/dotnet/sdk - 96158ed63a3e3292a70d2e433accd04abd37e8f3 + 1f8463b2372fb4c3108a350202c82d3bc522b2f1 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fcb07d637abf53791e2c55c63d9207fc3232fe83 - + https://github.com/dotnet/fsharp - ce3bef742571a73fd3cda862b6b07e1431819b06 + f7aa66fb7cabb006324537c0bc790a66f12927bf - + https://github.com/dotnet/fsharp - ce3bef742571a73fd3cda862b6b07e1431819b06 + f7aa66fb7cabb006324537c0bc790a66f12927bf @@ -146,9 +146,9 @@ afe689ab1a902bde4af3c6c5e419f898b9347fb3 - + https://github.com/dotnet/msbuild - 7c4597ea0ba65a2702f9f93016de94999c2a3c2c + e049bfe3dddb84270dec5fc1aaedc9664f77eb98 diff --git a/eng/Versions.props b/eng/Versions.props index c264dee60b63..e35fe57d1f12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22253.2 - 6.0.400-preview.22253.2 + 6.0.400-preview.22254.6 + 6.0.400-preview.22254.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d5523630cc7231c55d2d2d676fd3a553494ac538 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 14:26:31 -0700 Subject: [PATCH 0429/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220504.1 (#13762) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22254.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 d31df600af32..f0130036270e 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 + eba16eaac0a3f27f6e37c88313717776d4f38710 From e13b5a15f0cec3667dd3affa35d04f0d2f400e65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 May 2022 22:36:36 +0000 Subject: [PATCH 0430/1244] Update dependencies from https://github.com/dotnet/sdk build 20220504.14 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22254.6 -> To Version 6.0.400-preview.22254.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 f0130036270e..f26e34dbcdcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5744fb6934bf9d9ee28fb9ce9ae2f5b98905e4c1 - + https://github.com/dotnet/sdk - 1f8463b2372fb4c3108a350202c82d3bc522b2f1 + e280f4ce840239b265307d559a2001422001d0c9 - + https://github.com/dotnet/sdk - 1f8463b2372fb4c3108a350202c82d3bc522b2f1 + e280f4ce840239b265307d559a2001422001d0c9 diff --git a/eng/Versions.props b/eng/Versions.props index e35fe57d1f12..d970215c66ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22254.6 - 6.0.400-preview.22254.6 + 6.0.400-preview.22254.14 + 6.0.400-preview.22254.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 120bcb587d93cf0515452b807c497f199198444f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 May 2022 23:25:37 +0000 Subject: [PATCH 0431/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220504.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22254.1 -> To Version 6.0.0-servicing.22254.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 f0130036270e..616a0fb2080e 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 - eba16eaac0a3f27f6e37c88313717776d4f38710 + 6998584e7856a384d12fa7d0f898daec9be22c13 From b4bd2d7d19c0e28daa4b306702e867734c0b65b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 May 2022 06:35:55 +0000 Subject: [PATCH 0432/1244] Update dependencies from https://github.com/dotnet/sdk build 20220504.54 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22254.14 -> To Version 6.0.400-preview.22254.54 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 From Version 6.0.400-preview.22223.2 -> To Version 6.0.400-preview.22254.12 (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 5f45b8708e38..f5423eaa6e73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 5744fb6934bf9d9ee28fb9ce9ae2f5b98905e4c1 + 317884e224df8817849767f8ed7207a14c9acc4f - + https://github.com/dotnet/templating - 5744fb6934bf9d9ee28fb9ce9ae2f5b98905e4c1 + 317884e224df8817849767f8ed7207a14c9acc4f - + https://github.com/dotnet/templating - 5744fb6934bf9d9ee28fb9ce9ae2f5b98905e4c1 + 317884e224df8817849767f8ed7207a14c9acc4f - + https://github.com/dotnet/sdk - e280f4ce840239b265307d559a2001422001d0c9 + 7b84df09bec6e490d1bbd042020cc0aaa5bf3c1b - + https://github.com/dotnet/sdk - e280f4ce840239b265307d559a2001422001d0c9 + 7b84df09bec6e490d1bbd042020cc0aaa5bf3c1b @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fcb07d637abf53791e2c55c63d9207fc3232fe83 - + https://github.com/dotnet/fsharp - f7aa66fb7cabb006324537c0bc790a66f12927bf + 5392322da394d850ca3dc7d4d8be1e4536e658aa - + https://github.com/dotnet/fsharp - f7aa66fb7cabb006324537c0bc790a66f12927bf + 5392322da394d850ca3dc7d4d8be1e4536e658aa @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - afe689ab1a902bde4af3c6c5e419f898b9347fb3 + 909376faa424f06577e9b83f05ab8eab93b33995 diff --git a/eng/Versions.props b/eng/Versions.props index d970215c66ae..d773bb308a4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22223.2 + 6.0.400-preview.22254.12 @@ -56,8 +56,8 @@ - 6.0.400-preview.22254.14 - 6.0.400-preview.22254.14 + 6.0.400-preview.22254.54 + 6.0.400-preview.22254.54 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22223.2 + 6.0.400-preview.22254.12 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 6afedc0959b311253bf6e60973325c969bccac0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 May 2022 16:33:12 +0000 Subject: [PATCH 0433/1244] 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 --- 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 f5423eaa6e73..f9a032f59a73 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 d773bb308a4b..8257eff6f2c6 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 b645142d3598..c751a7b2de86 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 6a94e1add2efb38edaf77441a61f0c9cfc169b16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 May 2022 17:18:19 +0000 Subject: [PATCH 0434/1244] Update dependencies from https://github.com/dotnet/sdk build 20220505.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22254.54 -> To Version 6.0.400-preview.22255.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.0.3-beta.22254.3 -> To Version 12.0.4-beta.22255.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 f5423eaa6e73..f217a80c60d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 317884e224df8817849767f8ed7207a14c9acc4f - + https://github.com/dotnet/sdk - 7b84df09bec6e490d1bbd042020cc0aaa5bf3c1b + 8a368a138d56b43b4b85c29a55f44eaa43f22ca4 - + https://github.com/dotnet/sdk - 7b84df09bec6e490d1bbd042020cc0aaa5bf3c1b + 8a368a138d56b43b4b85c29a55f44eaa43f22ca4 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fcb07d637abf53791e2c55c63d9207fc3232fe83 - + https://github.com/dotnet/fsharp - 5392322da394d850ca3dc7d4d8be1e4536e658aa + 219170547a96003cc822195b797bfd0a89a90614 - + https://github.com/dotnet/fsharp - 5392322da394d850ca3dc7d4d8be1e4536e658aa + 219170547a96003cc822195b797bfd0a89a90614 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 909376faa424f06577e9b83f05ab8eab93b33995 + e0de281c676b295d33847103736c2cc392490244 diff --git a/eng/Versions.props b/eng/Versions.props index d773bb308a4b..d8a0d8c55865 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22254.54 - 6.0.400-preview.22254.54 + 6.0.400-preview.22255.8 + 6.0.400-preview.22255.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fab28aa3644d01e4974143112d8c70dabacf7714 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 May 2022 04:20:21 +0000 Subject: [PATCH 0435/1244] Update dependencies from https://github.com/dotnet/sdk build 20220505.30 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22255.8 -> To Version 6.0.400-preview.22255.30 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.400-preview.22254.12 -> To Version 6.0.400-preview.22255.8 (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 b2f272f788a1..9f00f75df442 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 317884e224df8817849767f8ed7207a14c9acc4f + 884b8814da7d8abc3fd49ec5c8710a92b5163033 - + https://github.com/dotnet/templating - 317884e224df8817849767f8ed7207a14c9acc4f + 884b8814da7d8abc3fd49ec5c8710a92b5163033 - + https://github.com/dotnet/templating - 317884e224df8817849767f8ed7207a14c9acc4f + 884b8814da7d8abc3fd49ec5c8710a92b5163033 - + https://github.com/dotnet/sdk - 8a368a138d56b43b4b85c29a55f44eaa43f22ca4 + a13195ce6366412852f21730d71daefbc5f9acd4 - + https://github.com/dotnet/sdk - 8a368a138d56b43b4b85c29a55f44eaa43f22ca4 + a13195ce6366412852f21730d71daefbc5f9acd4 diff --git a/eng/Versions.props b/eng/Versions.props index 77562cd2c7ed..3236bae7db44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22254.12 + 6.0.400-preview.22255.8 @@ -56,8 +56,8 @@ - 6.0.400-preview.22255.8 - 6.0.400-preview.22255.8 + 6.0.400-preview.22255.30 + 6.0.400-preview.22255.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22254.12 + 6.0.400-preview.22255.8 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 9f21b678790d3cebcc315c56127ba101304d38e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 May 2022 18:40:54 +0000 Subject: [PATCH 0436/1244] Update dependencies from https://github.com/dotnet/sdk build 20220506.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22255.30 -> To Version 6.0.400-preview.22256.3 Dependency coherency updates Microsoft.Build From Version 17.3.0-preview-22254-01 -> To Version 17.3.0-preview-22256-03 (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 9f00f75df442..ff933f666db1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 884b8814da7d8abc3fd49ec5c8710a92b5163033 - + https://github.com/dotnet/sdk - a13195ce6366412852f21730d71daefbc5f9acd4 + cab786f990acf5366eee0f93f2f6da5cf97e5d0b - + https://github.com/dotnet/sdk - a13195ce6366412852f21730d71daefbc5f9acd4 + cab786f990acf5366eee0f93f2f6da5cf97e5d0b @@ -146,9 +146,9 @@ e0de281c676b295d33847103736c2cc392490244 - + https://github.com/dotnet/msbuild - e049bfe3dddb84270dec5fc1aaedc9664f77eb98 + 72a07679401d1272d70ce482ea03c109ddd6e601 diff --git a/eng/Versions.props b/eng/Versions.props index 3236bae7db44..41a587c59dc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22255.30 - 6.0.400-preview.22255.30 + 6.0.400-preview.22256.3 + 6.0.400-preview.22256.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cf215438533586f1ca2904edea28e4dd7ca61ff0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 May 2022 02:47:57 +0000 Subject: [PATCH 0437/1244] Update dependencies from https://github.com/dotnet/sdk build 20220506.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22256.3 -> To Version 6.0.400-preview.22256.13 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-2.22254.6 -> To Version 4.3.0-2.22256.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 ff933f666db1..dff38a195557 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 884b8814da7d8abc3fd49ec5c8710a92b5163033 - + https://github.com/dotnet/sdk - cab786f990acf5366eee0f93f2f6da5cf97e5d0b + a2d9c546951fe54bf5e5962ba213c07b439be7d9 - + https://github.com/dotnet/sdk - cab786f990acf5366eee0f93f2f6da5cf97e5d0b + a2d9c546951fe54bf5e5962ba213c07b439be7d9 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - e0de281c676b295d33847103736c2cc392490244 + 5324b9fd9ba8a0d5d7e2748ca2f356c9f4f6d14b diff --git a/eng/Versions.props b/eng/Versions.props index 41a587c59dc9..19d6160303ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22256.3 - 6.0.400-preview.22256.3 + 6.0.400-preview.22256.13 + 6.0.400-preview.22256.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 82380db693ac85ce3edb90c98ff735feaef1a762 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 May 2022 07:31:27 +0000 Subject: [PATCH 0438/1244] Update dependencies from https://github.com/dotnet/sdk build 20220506.18 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22256.13 -> To Version 6.0.400-preview.22256.18 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-2.22256.4 -> To Version 4.3.0-2.22256.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 dff38a195557..bc45f33d4185 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 884b8814da7d8abc3fd49ec5c8710a92b5163033 - + https://github.com/dotnet/sdk - a2d9c546951fe54bf5e5962ba213c07b439be7d9 + 7119b90148b807b156e335b161ac67eb244431e5 - + https://github.com/dotnet/sdk - a2d9c546951fe54bf5e5962ba213c07b439be7d9 + 7119b90148b807b156e335b161ac67eb244431e5 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 5324b9fd9ba8a0d5d7e2748ca2f356c9f4f6d14b + 1172338613253e788bab1d92d24c6cc89358e716 diff --git a/eng/Versions.props b/eng/Versions.props index 19d6160303ee..cce6863b6608 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22256.13 - 6.0.400-preview.22256.13 + 6.0.400-preview.22256.18 + 6.0.400-preview.22256.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 096bf9ec73b1b61c90b7b81e0cf897b95104e09f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 May 2022 06:29:20 +0000 Subject: [PATCH 0439/1244] Update dependencies from https://github.com/dotnet/sdk build 20220508.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22256.18 -> To Version 6.0.400-preview.22258.3 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-2.22256.5 -> To Version 4.3.0-2.22257.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 bc45f33d4185..c6eb0585f69e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 884b8814da7d8abc3fd49ec5c8710a92b5163033 - + https://github.com/dotnet/sdk - 7119b90148b807b156e335b161ac67eb244431e5 + 9154bc872fb5a69f5052a9a46cf4aef9c5dd905a - + https://github.com/dotnet/sdk - 7119b90148b807b156e335b161ac67eb244431e5 + 9154bc872fb5a69f5052a9a46cf4aef9c5dd905a @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 1172338613253e788bab1d92d24c6cc89358e716 + 4e31f20172aca17cda06f85e37eb3feb528b7d9b diff --git a/eng/Versions.props b/eng/Versions.props index cce6863b6608..338e646c56be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22256.18 - 6.0.400-preview.22256.18 + 6.0.400-preview.22258.3 + 6.0.400-preview.22258.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ccddf5d214571985c4c6da8aa73b360a11845722 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 May 2022 16:12:47 +0000 Subject: [PATCH 0440/1244] Update dependencies from https://github.com/dotnet/sdk build 20220509.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22258.3 -> To Version 6.0.400-preview.22259.3 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.400-preview.22255.8 -> To Version 6.0.400-preview.22259.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 c6eb0585f69e..7a9fa63be0e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 884b8814da7d8abc3fd49ec5c8710a92b5163033 + 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/templating - 884b8814da7d8abc3fd49ec5c8710a92b5163033 + 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/templating - 884b8814da7d8abc3fd49ec5c8710a92b5163033 + 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/sdk - 9154bc872fb5a69f5052a9a46cf4aef9c5dd905a + 4466d122f5a7e1df068c9056e6961f08201ca7e6 - + https://github.com/dotnet/sdk - 9154bc872fb5a69f5052a9a46cf4aef9c5dd905a + 4466d122f5a7e1df068c9056e6961f08201ca7e6 diff --git a/eng/Versions.props b/eng/Versions.props index 338e646c56be..1a7c23473528 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22255.8 + 6.0.400-preview.22259.1 @@ -56,8 +56,8 @@ - 6.0.400-preview.22258.3 - 6.0.400-preview.22258.3 + 6.0.400-preview.22259.3 + 6.0.400-preview.22259.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22255.8 + 6.0.400-preview.22259.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 99d5fba8e2ddd0c651bdafd9b1d5b7c0ceba48ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 May 2022 21:12:56 +0000 Subject: [PATCH 0441/1244] Update dependencies from https://github.com/dotnet/sdk build 20220509.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22258.3 -> To Version 6.0.400-preview.22259.8 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.400-preview.22255.8 -> To Version 6.0.400-preview.22259.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 7a9fa63be0e9..edb244295f54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/sdk - 4466d122f5a7e1df068c9056e6961f08201ca7e6 + 9855b449a3d79799a842ecad1cdaa458a469be21 - + https://github.com/dotnet/sdk - 4466d122f5a7e1df068c9056e6961f08201ca7e6 + 9855b449a3d79799a842ecad1cdaa458a469be21 diff --git a/eng/Versions.props b/eng/Versions.props index 1a7c23473528..c94bc689abee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22259.3 - 6.0.400-preview.22259.3 + 6.0.400-preview.22259.8 + 6.0.400-preview.22259.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2249ae449130fc2f80c3017d75dd577f5ec1a055 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 May 2022 23:31:35 +0000 Subject: [PATCH 0442/1244] 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.22254.2 -> To Version 6.0.0-servicing.22259.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 c6eb0585f69e..f1107fe7d4e8 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 - 6998584e7856a384d12fa7d0f898daec9be22c13 + b1f5e7bc4d52db0031868cdd5e90b76118c2c31a From 1cdab81d117a79261e3c72da7e2966dc8ed50ec7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 May 2022 03:31:27 +0000 Subject: [PATCH 0443/1244] Update dependencies from https://github.com/dotnet/sdk build 20220509.15 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22259.8 -> To Version 6.0.400-preview.22259.15 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22255.1 -> To Version 12.0.4-beta.22259.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 01bd9d2f03a3..2b9a7eaec443 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/sdk - 9855b449a3d79799a842ecad1cdaa458a469be21 + 191fa159001adea54de41498fb300e52c69be65b - + https://github.com/dotnet/sdk - 9855b449a3d79799a842ecad1cdaa458a469be21 + 191fa159001adea54de41498fb300e52c69be65b @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fcb07d637abf53791e2c55c63d9207fc3232fe83 - + https://github.com/dotnet/fsharp - 219170547a96003cc822195b797bfd0a89a90614 + e629bca828439e8f1dd8e869987f7ee7d395cf61 - + https://github.com/dotnet/fsharp - 219170547a96003cc822195b797bfd0a89a90614 + e629bca828439e8f1dd8e869987f7ee7d395cf61 diff --git a/eng/Versions.props b/eng/Versions.props index c94bc689abee..1b62f9e94652 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22259.8 - 6.0.400-preview.22259.8 + 6.0.400-preview.22259.15 + 6.0.400-preview.22259.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 60e0fae92c8021356717e86739ad520f5d2a8323 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 May 2022 06:49:56 +0000 Subject: [PATCH 0444/1244] Update dependencies from https://github.com/dotnet/sdk build 20220509.19 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22259.15 -> To Version 6.0.400-preview.22259.19 Dependency coherency updates Microsoft.Build From Version 17.3.0-preview-22256-03 -> To Version 17.3.0-preview-22259-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 2b9a7eaec443..49c263978677 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/sdk - 191fa159001adea54de41498fb300e52c69be65b + 09e7ca9c764b695030dc3a6eab1b24c3d50c2782 - + https://github.com/dotnet/sdk - 191fa159001adea54de41498fb300e52c69be65b + 09e7ca9c764b695030dc3a6eab1b24c3d50c2782 @@ -146,9 +146,9 @@ 4e31f20172aca17cda06f85e37eb3feb528b7d9b - + https://github.com/dotnet/msbuild - 72a07679401d1272d70ce482ea03c109ddd6e601 + 235c0e7462df92e0bada1a5a9f6dca38aeba6a38 diff --git a/eng/Versions.props b/eng/Versions.props index 1b62f9e94652..2a85bda3590d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22259.15 - 6.0.400-preview.22259.15 + 6.0.400-preview.22259.19 + 6.0.400-preview.22259.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b4b53efa2ec9ef3b1ce2be32c3f6f0e4d6252641 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 May 2022 07:58:27 +0000 Subject: [PATCH 0445/1244] Update dependencies from https://github.com/dotnet/sdk build 20220510.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22259.15 -> To Version 6.0.400-preview.22260.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.3.0-2.22257.1 -> To Version 4.3.0-2.22259.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 49c263978677..dbff048e4f60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/sdk - 09e7ca9c764b695030dc3a6eab1b24c3d50c2782 + d86351f7f2e9bd056489c4ea1d935aff10ae0237 - + https://github.com/dotnet/sdk - 09e7ca9c764b695030dc3a6eab1b24c3d50c2782 + d86351f7f2e9bd056489c4ea1d935aff10ae0237 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 4e31f20172aca17cda06f85e37eb3feb528b7d9b + 5adf9607688b27041e79c607251d875a2adddadd diff --git a/eng/Versions.props b/eng/Versions.props index 2a85bda3590d..d83fb1ddd36b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22259.19 - 6.0.400-preview.22259.19 + 6.0.400-preview.22260.1 + 6.0.400-preview.22260.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1380480834a9d824129c8d47d18c0d5a2c778d21 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 May 2022 20:09:42 +0000 Subject: [PATCH 0446/1244] 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 5dc437491e58..30bdcf255464 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 7d5754ae316f..60aef3b63923 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 0447/1244] 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 5dc437491e58..30bdcf255464 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 7d5754ae316f..312ef482c633 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 0048b6ab1283..c62c3a7fa921 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 b645142d3598..c751a7b2de86 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 8f637ffc7d14bc68a96a8199325640b83036fb73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 May 2022 03:23:49 +0000 Subject: [PATCH 0448/1244] Update dependencies from https://github.com/dotnet/sdk build 20220510.23 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.1 -> To Version 6.0.400-preview.22260.23 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-2.22259.10 -> To Version 4.3.0-2.22260.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 dbff048e4f60..490a62ec0707 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/sdk - d86351f7f2e9bd056489c4ea1d935aff10ae0237 + 254ac752c041a6143375ce46e319f3e00c06d1bb - + https://github.com/dotnet/sdk - d86351f7f2e9bd056489c4ea1d935aff10ae0237 + 254ac752c041a6143375ce46e319f3e00c06d1bb @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 5adf9607688b27041e79c607251d875a2adddadd + e6a31e02a972685e4c3a6198968078acdd215e26 diff --git a/eng/Versions.props b/eng/Versions.props index d83fb1ddd36b..d6c697204447 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22260.1 - 6.0.400-preview.22260.1 + 6.0.400-preview.22260.23 + 6.0.400-preview.22260.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ed8d729bf86f58b88bb628f450956a98b47f51e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 May 2022 07:38:36 +0000 Subject: [PATCH 0449/1244] Update dependencies from https://github.com/dotnet/sdk build 20220510.30 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.23 -> To Version 6.0.400-preview.22260.30 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-2.22260.4 -> To Version 4.3.0-2.22260.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 490a62ec0707..f48c38879b10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/sdk - 254ac752c041a6143375ce46e319f3e00c06d1bb + 0ae87810898f58010b49cfcb93b0991e2466549f - + https://github.com/dotnet/sdk - 254ac752c041a6143375ce46e319f3e00c06d1bb + 0ae87810898f58010b49cfcb93b0991e2466549f @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - e6a31e02a972685e4c3a6198968078acdd215e26 + e6b5dd830f1b790bd80e62272129cc040d0a2fdc diff --git a/eng/Versions.props b/eng/Versions.props index d6c697204447..01677a235055 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22260.23 - 6.0.400-preview.22260.23 + 6.0.400-preview.22260.30 + 6.0.400-preview.22260.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f4831d9ec80bdb90bce45f106048d49c5978f372 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 May 2022 15:40:14 +0000 Subject: [PATCH 0450/1244] Update dependencies from https://github.com/dotnet/sdk build 20220511.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22261.3 Dependency coherency updates Microsoft.Build From Version 17.3.0-preview-22259-01 -> To Version 17.3.0-preview-22261-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 f48c38879b10..0b0cb50907b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/sdk - 0ae87810898f58010b49cfcb93b0991e2466549f + e214030eeec011e8903cb445b1431fe4c6273dcc - + https://github.com/dotnet/sdk - 0ae87810898f58010b49cfcb93b0991e2466549f + e214030eeec011e8903cb445b1431fe4c6273dcc @@ -146,9 +146,9 @@ e6b5dd830f1b790bd80e62272129cc040d0a2fdc - + https://github.com/dotnet/msbuild - 235c0e7462df92e0bada1a5a9f6dca38aeba6a38 + c9087cfd402fe63252dc0d4d01d6798a449749f5 diff --git a/eng/Versions.props b/eng/Versions.props index 01677a235055..36f7a6f42bc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22260.30 - 6.0.400-preview.22260.30 + 6.0.400-preview.22261.3 + 6.0.400-preview.22261.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7118da0861709fe8a61ff2594e11f18360b882a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 May 2022 16:48:06 +0000 Subject: [PATCH 0451/1244] Update dependencies from https://github.com/dotnet/sdk build 20220511.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22261.4 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++++ eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++++----------- 3 files changed, 69 insertions(+), 57 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a84139e5913..96ed2db16a7b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,12 +7,18 @@ + + + + + + @@ -35,8 +41,14 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b0cb50907b4..6c7b7067a7f8 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 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime be98e88c760526452df94ef452fff4602fb5bded - + 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 @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/sdk - e214030eeec011e8903cb445b1431fe4c6273dcc + 953f0affd926c05b1edfc8a0f5b043d00ee8cd3f - + https://github.com/dotnet/sdk - e214030eeec011e8903cb445b1431fe4c6273dcc + 953f0affd926c05b1edfc8a0f5b043d00ee8cd3f https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcb07d637abf53791e2c55c63d9207fc3232fe83 + 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 36f7a6f42bc9..ba8035c1dc5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.4-servicing.22165.3 + 6.0.5-servicing.22215.9 @@ -44,20 +44,20 @@ - 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.400-preview.22261.3 - 6.0.400-preview.22261.3 + 6.0.400-preview.22261.4 + 6.0.400-preview.22261.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 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 From e7e3f6810fdc730ce75809332be73fa9e1f44b66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 May 2022 22:20:56 +0000 Subject: [PATCH 0452/1244] Update dependencies from https://github.com/dotnet/sdk build 20220511.17 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22261.17 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build From Version 6.0.4 -> To Version 6.0.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 6c7b7067a7f8..d26b1aac3334 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/sdk - 953f0affd926c05b1edfc8a0f5b043d00ee8cd3f + 92fc31d65d91deb09c128e4bbe14af72df7beb37 - + https://github.com/dotnet/sdk - 953f0affd926c05b1edfc8a0f5b043d00ee8cd3f + 92fc31d65d91deb09c128e4bbe14af72df7beb37 diff --git a/eng/Versions.props b/eng/Versions.props index ba8035c1dc5a..697a354f0e17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22261.4 - 6.0.400-preview.22261.4 + 6.0.400-preview.22261.17 + 6.0.400-preview.22261.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c9abd25c045fa0751b17267515d7cff68742ad0e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 12 May 2022 16:42:14 +0000 Subject: [PATCH 0453/1244] 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 d049dc4cea8f..8ae20890d63f 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 c62c3a7fa921..bada13902b0d 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 0454/1244] 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 30bdcf255464..284909916803 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,9 +22,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ae20890d63f..bea7c41e297d 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 8e2b01df3fc35fe0c7fd0a5b638884485a0aea7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 11:15:48 -0700 Subject: [PATCH 0455/1244] Update dependencies from https://github.com/dotnet/arcade build 20220511.7 (#13835) Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22254.3 -> To Version 6.0.0-beta.22261.7 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 f48c38879b10..3a24f0547fb5 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 01677a235055..12e81de58a31 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 c751a7b2de86..de4424c2a3e1 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 3ba5fa513263d941be88641f27463a0e3d1df23f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 12 May 2022 20:04:33 +0000 Subject: [PATCH 0456/1244] 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 284909916803..44bb1133f339 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 bea7c41e297d..591badacbab0 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 bada13902b0d..305b5eda5b46 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 c751a7b2de86..de4424c2a3e1 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 e22d016def3c6758224525e8f58a6269dbe8e8fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 May 2022 20:20:44 +0000 Subject: [PATCH 0457/1244] Update dependencies from https://github.com/dotnet/sdk build 20220512.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22262.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 96ed2db16a7b..c49dc6d82478 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -41,9 +38,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d26b1aac3334..0b2723d3cb87 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/sdk - 92fc31d65d91deb09c128e4bbe14af72df7beb37 + c3e10410c2dffd7a98f7ce5f869e622c177a849e - + https://github.com/dotnet/sdk - 92fc31d65d91deb09c128e4bbe14af72df7beb37 + c3e10410c2dffd7a98f7ce5f869e622c177a849e diff --git a/eng/Versions.props b/eng/Versions.props index 697a354f0e17..d4c2d3ee0a49 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22261.17 - 6.0.400-preview.22261.17 + 6.0.400-preview.22262.11 + 6.0.400-preview.22262.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a6d7629c98b88d14fb5cb0c8f04da4354fe5c93f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 May 2022 22:40:36 +0000 Subject: [PATCH 0458/1244] Update dependencies from https://github.com/dotnet/sdk build 20220512.18 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22262.18 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build From Version 6.0.4 -> To Version 6.0.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 0b2723d3cb87..4f44a97d06f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 8ab012bfcb75e9565c79157abeefb02ff4775d6e - + https://github.com/dotnet/sdk - c3e10410c2dffd7a98f7ce5f869e622c177a849e + b16ba5b9e5981f36f251dda5be221181a5cda4de - + https://github.com/dotnet/sdk - c3e10410c2dffd7a98f7ce5f869e622c177a849e + b16ba5b9e5981f36f251dda5be221181a5cda4de diff --git a/eng/Versions.props b/eng/Versions.props index d4c2d3ee0a49..89fadaf3157c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22262.11 - 6.0.400-preview.22262.11 + 6.0.400-preview.22262.18 + 6.0.400-preview.22262.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48843f3e8f6dd53d6f96663e10cd447d8d34c7e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 May 2022 04:12:42 +0000 Subject: [PATCH 0459/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220512.1 (#13834) [release/6.0.4xx] 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 3a24f0547fb5..8233284d74c2 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 - b1f5e7bc4d52db0031868cdd5e90b76118c2c31a + 07eecddb8505ad0dccb6ff6f23379d6b67aedc64 From bc534ac149206531fc82e99728b8f24de95ec20f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 May 2022 05:24:15 +0000 Subject: [PATCH 0460/1244] Update dependencies from https://github.com/dotnet/sdk build 20220512.31 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22262.31 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,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ------ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index c49dc6d82478..9a84139e5913 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,9 +13,6 @@ - - - @@ -40,9 +37,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f44a97d06f9..cd88652936d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 8ab012bfcb75e9565c79157abeefb02ff4775d6e + c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/templating - 8ab012bfcb75e9565c79157abeefb02ff4775d6e + c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/templating - 8ab012bfcb75e9565c79157abeefb02ff4775d6e + c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - b16ba5b9e5981f36f251dda5be221181a5cda4de + ba8aa632c292d25a0c8feac14281e5ec8f319c9b - + https://github.com/dotnet/sdk - b16ba5b9e5981f36f251dda5be221181a5cda4de + ba8aa632c292d25a0c8feac14281e5ec8f319c9b @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - e6b5dd830f1b790bd80e62272129cc040d0a2fdc + 4ca1035c55c88a0be12ceb79edf40b4285496878 - + https://github.com/dotnet/msbuild - c9087cfd402fe63252dc0d4d01d6798a449749f5 + b44c689ff99fe65fce40a55e362281384e0fae4a diff --git a/eng/Versions.props b/eng/Versions.props index 89fadaf3157c..ccf6dacd32f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22259.1 + 6.0.400-preview.22262.2 @@ -56,8 +56,8 @@ - 6.0.400-preview.22262.18 - 6.0.400-preview.22262.18 + 6.0.400-preview.22262.31 + 6.0.400-preview.22262.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22259.1 + 6.0.400-preview.22262.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From fef0562ee6433380c250945665f3223fc796830a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 May 2022 06:58:04 +0000 Subject: [PATCH 0461/1244] Update dependencies from https://github.com/dotnet/sdk build 20220512.32 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22262.32 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,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.4 -> To Version 6.0.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 cd88652936d2..cda4006e53c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - ba8aa632c292d25a0c8feac14281e5ec8f319c9b + 0db148e91cde6bc5c3d77d087b3f56929a77d0a5 - + https://github.com/dotnet/sdk - ba8aa632c292d25a0c8feac14281e5ec8f319c9b + 0db148e91cde6bc5c3d77d087b3f56929a77d0a5 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - e629bca828439e8f1dd8e869987f7ee7d395cf61 + 02ea83fc21d9f1d8defdf05aee171abc32af1172 - + https://github.com/dotnet/fsharp - e629bca828439e8f1dd8e869987f7ee7d395cf61 + 02ea83fc21d9f1d8defdf05aee171abc32af1172 diff --git a/eng/Versions.props b/eng/Versions.props index ccf6dacd32f0..94b7e5855077 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22262.31 - 6.0.400-preview.22262.31 + 6.0.400-preview.22262.32 + 6.0.400-preview.22262.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 873a395a93072e68dee61730e3d7dbd4aa55b9ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 May 2022 13:11:54 +0000 Subject: [PATCH 0462/1244] Update dependencies from https://github.com/dotnet/sdk build 20220513.6 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22263.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.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.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.4 -> To Version 6.0.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 cda4006e53c6..bbfadebfba22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 0db148e91cde6bc5c3d77d087b3f56929a77d0a5 + 56a8a70497c144f9855bf18aac5cea69ef2c783e - + https://github.com/dotnet/sdk - 0db148e91cde6bc5c3d77d087b3f56929a77d0a5 + 56a8a70497c144f9855bf18aac5cea69ef2c783e @@ -146,9 +146,9 @@ 4ca1035c55c88a0be12ceb79edf40b4285496878 - + https://github.com/dotnet/msbuild - b44c689ff99fe65fce40a55e362281384e0fae4a + 9fd120730f6319606b57d412820897e4861d61ac diff --git a/eng/Versions.props b/eng/Versions.props index 94b7e5855077..07b0b9a0012b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22262.32 - 6.0.400-preview.22262.32 + 6.0.400-preview.22263.6 + 6.0.400-preview.22263.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b14efdd3e8e6de81f643e22d83f7ce94610fc3bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 May 2022 18:41:45 +0000 Subject: [PATCH 0463/1244] Update dependencies from https://github.com/dotnet/sdk build 20220513.20 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22263.20 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,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.4 -> To Version 6.0.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 bbfadebfba22..60d507450a63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 56a8a70497c144f9855bf18aac5cea69ef2c783e + 535407f77ebbf868f9b25dcb3f233a7daad7cc9b - + https://github.com/dotnet/sdk - 56a8a70497c144f9855bf18aac5cea69ef2c783e + 535407f77ebbf868f9b25dcb3f233a7daad7cc9b @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 4ca1035c55c88a0be12ceb79edf40b4285496878 + 6acb38ddbc67c3c9fd2b1807aec95e5722c174e8 diff --git a/eng/Versions.props b/eng/Versions.props index 07b0b9a0012b..220fc2c77a9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22263.6 - 6.0.400-preview.22263.6 + 6.0.400-preview.22263.20 + 6.0.400-preview.22263.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ff5d93bff8eb2a1ff6abf1c19af6b809e080deff Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Fri, 13 May 2022 14:24:31 -0700 Subject: [PATCH 0464/1244] [6.0.4xx] Update template versions from dotnet/aspnetcore (#13841) --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 12e81de58a31..81cdd3878d90 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 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 0465/1244] [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 fcf6c3e03185..a529f79d1cc2 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 cd64d69bd17f37ef15c143881b2dab08050b71cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 May 2022 22:09:56 +0000 Subject: [PATCH 0466/1244] Update dependencies from https://github.com/dotnet/sdk build 20220513.32 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22263.32 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,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.4 -> To Version 6.0.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 60d507450a63..fe8a80df86b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 535407f77ebbf868f9b25dcb3f233a7daad7cc9b + 3272241a037501906c5524d3ebc63aa50830d2da - + https://github.com/dotnet/sdk - 535407f77ebbf868f9b25dcb3f233a7daad7cc9b + 3272241a037501906c5524d3ebc63aa50830d2da diff --git a/eng/Versions.props b/eng/Versions.props index 220fc2c77a9c..fb9ad9ca5900 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22263.20 - 6.0.400-preview.22263.20 + 6.0.400-preview.22263.32 + 6.0.400-preview.22263.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f9a11cb35588038d62bc69356fb3ad003e50c597 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 May 2022 04:17:28 +0000 Subject: [PATCH 0467/1244] Update dependencies from https://github.com/dotnet/sdk build 20220515.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22265.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.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.400-preview.22259.1 -> To Version 6.0.400-preview.22262.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 fe8a80df86b1..05ac22fd90a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 3272241a037501906c5524d3ebc63aa50830d2da + 52703c399dbba560461c12b17267357642fe4c09 - + https://github.com/dotnet/sdk - 3272241a037501906c5524d3ebc63aa50830d2da + 52703c399dbba560461c12b17267357642fe4c09 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 6acb38ddbc67c3c9fd2b1807aec95e5722c174e8 + a61e6b243d51f6a0f49bd689a2aa67b97f6eb5dc diff --git a/eng/Versions.props b/eng/Versions.props index fb9ad9ca5900..510e2f7d405a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22263.32 - 6.0.400-preview.22263.32 + 6.0.400-preview.22265.4 + 6.0.400-preview.22265.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5bd0203039fa9213dfc0990ab5287cb7f8301e9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 May 2022 12:55:04 +0000 Subject: [PATCH 0468/1244] Update dependencies from https://github.com/dotnet/sdk build 20220516.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22266.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 6.0.200-1.22219.3 -> To Version 6.0.200-1.22178.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 bca1cdafb612..d4a9b2cb596d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 52703c399dbba560461c12b17267357642fe4c09 + b0cb8ac2186acc08f4740443b8a0363a4fe04cd7 - + https://github.com/dotnet/sdk - 52703c399dbba560461c12b17267357642fe4c09 + b0cb8ac2186acc08f4740443b8a0363a4fe04cd7 @@ -135,9 +135,9 @@ 717d0cf94925e9cf67466dbee46c1019930eb212 - + https://github.com/dotnet/linker - 28db36b95cf83c8e2ad11e67a2ad0de301b4cad6 + 01c4f5905959c29f86781b85187bb676fc517ee9 linker @@ -146,9 +146,9 @@ a61e6b243d51f6a0f49bd689a2aa67b97f6eb5dc - + https://github.com/dotnet/msbuild - 9fd120730f6319606b57d412820897e4861d61ac + 78bb45f0f7033ba5658903dacd6164e83af68c94 diff --git a/eng/Versions.props b/eng/Versions.props index f485370f65e1..53e994964e7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22265.4 - 6.0.400-preview.22265.4 + 6.0.400-preview.22266.1 + 6.0.400-preview.22266.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e82ac26a5f7d030328bd18f441a495908aee354 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 May 2022 17:26:18 +0000 Subject: [PATCH 0469/1244] Update dependencies from https://github.com/dotnet/sdk build 20220516.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22266.11 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 6.0.200-1.22219.3 -> To Version 6.0.200-1.22178.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 d4a9b2cb596d..ca74694a8217 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - b0cb8ac2186acc08f4740443b8a0363a4fe04cd7 + 1359e969dcfc060925b6ec82b5a474cc0e075592 - + https://github.com/dotnet/sdk - b0cb8ac2186acc08f4740443b8a0363a4fe04cd7 + 1359e969dcfc060925b6ec82b5a474cc0e075592 @@ -146,9 +146,9 @@ a61e6b243d51f6a0f49bd689a2aa67b97f6eb5dc - + https://github.com/dotnet/msbuild - 78bb45f0f7033ba5658903dacd6164e83af68c94 + 0d97294033259b0adb61c23b85dfbce6a8dbb6a3 diff --git a/eng/Versions.props b/eng/Versions.props index 53e994964e7d..33a6c560e21a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22266.1 - 6.0.400-preview.22266.1 + 6.0.400-preview.22266.11 + 6.0.400-preview.22266.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f477fd69d25a11d563524a15959a2102eb1e3c92 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 16 May 2022 18:14:23 +0000 Subject: [PATCH 0470/1244] 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 44bb1133f339..3c5e1c788f8a 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 591badacbab0..99445d60569a 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 553e1626d3c7..0158d3754f07 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 500d20e8e4ca6c33fd67f0db9e782fab2bda596e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 May 2022 03:20:57 +0000 Subject: [PATCH 0471/1244] Update dependencies from https://github.com/dotnet/sdk build 20220516.46 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22266.46 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22266.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 ca74694a8217..46568780c805 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 1359e969dcfc060925b6ec82b5a474cc0e075592 + 20c6e850bd6bae803f8fa505011438f272687b97 - + https://github.com/dotnet/sdk - 1359e969dcfc060925b6ec82b5a474cc0e075592 + 20c6e850bd6bae803f8fa505011438f272687b97 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 02ea83fc21d9f1d8defdf05aee171abc32af1172 + 734bd59b6febe9b7a338e358096e85051baeb3f9 - + https://github.com/dotnet/fsharp - 02ea83fc21d9f1d8defdf05aee171abc32af1172 + 734bd59b6febe9b7a338e358096e85051baeb3f9 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - a61e6b243d51f6a0f49bd689a2aa67b97f6eb5dc + 2731a165255d88b5b3fb6353b2b6ea658b3c755d diff --git a/eng/Versions.props b/eng/Versions.props index 33a6c560e21a..24b94baee789 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22266.11 - 6.0.400-preview.22266.11 + 6.0.400-preview.22266.46 + 6.0.400-preview.22266.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9f2e7c22c582998f71140cceafb2a727da9e5d56 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 May 2022 04:22:40 +0000 Subject: [PATCH 0472/1244] Update dependencies from https://github.com/dotnet/sdk build 20220516.48 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22266.48 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22266.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 46568780c805..186120f29ec2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 20c6e850bd6bae803f8fa505011438f272687b97 + 348ca651c401917f0ddd0c08f6cb10577ba76341 - + https://github.com/dotnet/sdk - 20c6e850bd6bae803f8fa505011438f272687b97 + 348ca651c401917f0ddd0c08f6cb10577ba76341 @@ -146,9 +146,9 @@ 2731a165255d88b5b3fb6353b2b6ea658b3c755d - + https://github.com/dotnet/msbuild - 0d97294033259b0adb61c23b85dfbce6a8dbb6a3 + b3626202175e5c91998eaca0dc0881cb7f2e5da5 diff --git a/eng/Versions.props b/eng/Versions.props index 24b94baee789..7da1c2d38b44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22266.46 - 6.0.400-preview.22266.46 + 6.0.400-preview.22266.48 + 6.0.400-preview.22266.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4e28c5a6be951a3f57ab575843d70dc5cc38acf2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 May 2022 09:20:17 +0000 Subject: [PATCH 0473/1244] Update dependencies from https://github.com/dotnet/sdk build 20220517.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22267.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22266.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 186120f29ec2..70c93608651e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 348ca651c401917f0ddd0c08f6cb10577ba76341 + b0c27fa8b332e79e390f257956bb32fb69af11c2 - + https://github.com/dotnet/sdk - 348ca651c401917f0ddd0c08f6cb10577ba76341 + b0c27fa8b332e79e390f257956bb32fb69af11c2 diff --git a/eng/Versions.props b/eng/Versions.props index 7da1c2d38b44..35f180f1a614 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22266.48 - 6.0.400-preview.22266.48 + 6.0.400-preview.22267.1 + 6.0.400-preview.22267.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 35b5a8783dd44f8cae8b7d7c240eae85ab95fa39 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 17 May 2022 16:49:13 +0000 Subject: [PATCH 0474/1244] 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 3c5e1c788f8a..7167859ca6cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99445d60569a..b7a5c89e85aa 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 0158d3754f07..bab7a0320898 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 dce53aeba11bc70cd176d0fb238a368134ea5668 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 May 2022 19:47:22 +0000 Subject: [PATCH 0475/1244] Update dependencies from https://github.com/dotnet/sdk build 20220517.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22267.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.4-beta.22262.2 -> To Version 12.0.4-beta.22266.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 70c93608651e..e884de6950cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - b0c27fa8b332e79e390f257956bb32fb69af11c2 + cfca4492ceaaff8980e8364005ebfee70a09fa98 - + https://github.com/dotnet/sdk - b0c27fa8b332e79e390f257956bb32fb69af11c2 + cfca4492ceaaff8980e8364005ebfee70a09fa98 diff --git a/eng/Versions.props b/eng/Versions.props index 35f180f1a614..07a6fe99eba7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22267.1 - 6.0.400-preview.22267.1 + 6.0.400-preview.22267.11 + 6.0.400-preview.22267.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ad148b922cafbb57b64a7d1738eb21b3cdf5f6f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 May 2022 22:28:36 +0000 Subject: [PATCH 0476/1244] Update dependencies from https://github.com/dotnet/sdk build 20220517.17 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22267.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.4-beta.22262.2 -> To Version 12.0.4-beta.22266.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 e884de6950cc..e7bfdb99b829 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - cfca4492ceaaff8980e8364005ebfee70a09fa98 + 11ddd40dfc9eeff86f2cad29c0d017dfe507dfc7 - + https://github.com/dotnet/sdk - cfca4492ceaaff8980e8364005ebfee70a09fa98 + 11ddd40dfc9eeff86f2cad29c0d017dfe507dfc7 diff --git a/eng/Versions.props b/eng/Versions.props index 07a6fe99eba7..a5ac80e6f0ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22267.11 - 6.0.400-preview.22267.11 + 6.0.400-preview.22267.17 + 6.0.400-preview.22267.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1d7424d93bd4db660091b6e9610b619b0abb123e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 May 2022 08:11:40 +0000 Subject: [PATCH 0477/1244] Update dependencies from https://github.com/dotnet/sdk build 20220518.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22268.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22266.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 e7bfdb99b829..6537fb19cd68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 11ddd40dfc9eeff86f2cad29c0d017dfe507dfc7 + 1bbb77d697f8dc6094ddedd67f2f3e897596c741 - + https://github.com/dotnet/sdk - 11ddd40dfc9eeff86f2cad29c0d017dfe507dfc7 + 1bbb77d697f8dc6094ddedd67f2f3e897596c741 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 2731a165255d88b5b3fb6353b2b6ea658b3c755d + 893704470a0feca233fe71e03622a023f0260c24 diff --git a/eng/Versions.props b/eng/Versions.props index a5ac80e6f0ea..8fefd90e319a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22267.17 - 6.0.400-preview.22267.17 + 6.0.400-preview.22268.1 + 6.0.400-preview.22268.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6da560ac9e97c63352d3c83fb8991de42e151ca2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 May 2022 14:41:49 +0000 Subject: [PATCH 0478/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220518.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22268.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22219.3 -> To Version 6.0.200-1.22178.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bca1cdafb612..8c32b6e425e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,9 +135,9 @@ 717d0cf94925e9cf67466dbee46c1019930eb212 - + https://github.com/dotnet/linker - 28db36b95cf83c8e2ad11e67a2ad0de301b4cad6 + 01c4f5905959c29f86781b85187bb676fc517ee9 linker @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/source-build-reference-packages - 07eecddb8505ad0dccb6ff6f23379d6b67aedc64 + 8ea40b4e4a381b819a7f9946e72d036f37cb75d4 From 3b5b37d71d98b37d55c5778f6e08072100376d79 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 18 May 2022 16:15:17 +0000 Subject: [PATCH 0479/1244] 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 b7a5c89e85aa..50c2b0c6a9b4 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 808804b54d3a3f1dca2cb1efbfa885b4c461b0be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 May 2022 19:57:21 +0000 Subject: [PATCH 0480/1244] Update dependencies from https://github.com/dotnet/sdk build 20220518.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22268.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.4-beta.22262.2 -> To Version 12.0.4-beta.22266.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 6537fb19cd68..0957862dcc3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 1bbb77d697f8dc6094ddedd67f2f3e897596c741 + 8451fe33a37c5ec9bd81d23446444ae8851c3d7a - + https://github.com/dotnet/sdk - 1bbb77d697f8dc6094ddedd67f2f3e897596c741 + 8451fe33a37c5ec9bd81d23446444ae8851c3d7a @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 893704470a0feca233fe71e03622a023f0260c24 + 87fe2513000f22a898e2c23d5a4ac85c2bcf7391 diff --git a/eng/Versions.props b/eng/Versions.props index 8fefd90e319a..dee3da4538c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22268.1 - 6.0.400-preview.22268.1 + 6.0.400-preview.22268.13 + 6.0.400-preview.22268.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cc7da5b9f3cc9a537b4b2553b4a73f5ff2a952d3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 18 May 2022 21:57:33 +0000 Subject: [PATCH 0481/1244] 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 7167859ca6cd..9f25c4eaa6a8 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 50c2b0c6a9b4..29a2d4088a3a 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 bab7a0320898..b0b5c1ebaa28 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 426502e86911..cf15d1bfca8b 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 63b29c23054a99262efad36077906537e012c920 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 18 May 2022 20:14:23 -0700 Subject: [PATCH 0482/1244] Revert changes to eng/folder from branch merge --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a529f79d1cc2..fcf6c3e03185 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.17 + 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.25 + 3.1.24 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.34 + 2.1.30 From 988aa00ffca019194980c99b31174ffd1587ec6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 May 2022 09:48:50 +0000 Subject: [PATCH 0483/1244] Update dependencies from https://github.com/dotnet/sdk build 20220519.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22269.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22266.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 0957862dcc3e..f4141494ba79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 8451fe33a37c5ec9bd81d23446444ae8851c3d7a + 384cb3c69ad3725aa8132a3db4c4de8d0d8b08c4 - + https://github.com/dotnet/sdk - 8451fe33a37c5ec9bd81d23446444ae8851c3d7a + 384cb3c69ad3725aa8132a3db4c4de8d0d8b08c4 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 87fe2513000f22a898e2c23d5a4ac85c2bcf7391 + 5b9a9d44eee29f433d6c9ef9740642dd4d08e963 diff --git a/eng/Versions.props b/eng/Versions.props index dee3da4538c3..16f868179418 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22268.13 - 6.0.400-preview.22268.13 + 6.0.400-preview.22269.3 + 6.0.400-preview.22269.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5652727602473e7fc11da393f5a0d9ee3331d989 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 19 May 2022 14:27:48 +0000 Subject: [PATCH 0484/1244] 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 9f25c4eaa6a8..f50bca67fb4d 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 29a2d4088a3a..3d9d00946c45 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 b0b5c1ebaa28..ccd89551de4c 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 f6a6ffec1cc95671bd74b63fe4f22486076b30ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 May 2022 03:01:26 +0000 Subject: [PATCH 0485/1244] Update dependencies from https://github.com/dotnet/sdk build 20220519.23 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22269.23 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22269.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 f4141494ba79..4a935496ef75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 384cb3c69ad3725aa8132a3db4c4de8d0d8b08c4 + c21dabb74e6f2aa8a6e37cbe7e0c75e281fcd934 - + https://github.com/dotnet/sdk - 384cb3c69ad3725aa8132a3db4c4de8d0d8b08c4 + c21dabb74e6f2aa8a6e37cbe7e0c75e281fcd934 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 734bd59b6febe9b7a338e358096e85051baeb3f9 + 1335005638890ffd27f2ba7fa3ecf6f686a9991f - + https://github.com/dotnet/fsharp - 734bd59b6febe9b7a338e358096e85051baeb3f9 + 1335005638890ffd27f2ba7fa3ecf6f686a9991f diff --git a/eng/Versions.props b/eng/Versions.props index 16f868179418..0da403c42cc1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22269.3 - 6.0.400-preview.22269.3 + 6.0.400-preview.22269.23 + 6.0.400-preview.22269.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fc8b01c3782100a77521e4ec69e364c9974f2936 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 May 2022 09:23:12 +0000 Subject: [PATCH 0486/1244] Update dependencies from https://github.com/dotnet/sdk build 20220520.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22270.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22269.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 4a935496ef75..2099de6e0596 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - c21dabb74e6f2aa8a6e37cbe7e0c75e281fcd934 + 7ac930dc28f149717c70aaad9e7ab335cd340278 - + https://github.com/dotnet/sdk - c21dabb74e6f2aa8a6e37cbe7e0c75e281fcd934 + 7ac930dc28f149717c70aaad9e7ab335cd340278 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 5b9a9d44eee29f433d6c9ef9740642dd4d08e963 + 92ebb62d9d596095c2e61ca61e3435d62c4d80f7 diff --git a/eng/Versions.props b/eng/Versions.props index 0da403c42cc1..19c3588ce257 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22269.23 - 6.0.400-preview.22269.23 + 6.0.400-preview.22270.1 + 6.0.400-preview.22270.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f4578fd4eebd4ff8fa448d099fb29966891cccf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 May 2022 23:09:43 +0000 Subject: [PATCH 0487/1244] Update dependencies from https://github.com/dotnet/sdk build 20220520.10 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22270.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22269.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 2099de6e0596..3053c2baa99c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 7ac930dc28f149717c70aaad9e7ab335cd340278 + c03f9876e3e6c80c7ffc0833e4542414310f1cb8 - + https://github.com/dotnet/sdk - 7ac930dc28f149717c70aaad9e7ab335cd340278 + c03f9876e3e6c80c7ffc0833e4542414310f1cb8 diff --git a/eng/Versions.props b/eng/Versions.props index 19c3588ce257..28d7a2977a0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22270.1 - 6.0.400-preview.22270.1 + 6.0.400-preview.22270.10 + 6.0.400-preview.22270.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 90156234d0325b7d68a68a08a6f093dca404579d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 May 2022 00:20:53 +0000 Subject: [PATCH 0488/1244] Update dependencies from https://github.com/dotnet/sdk build 20220520.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22270.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.4-beta.22262.2 -> To Version 12.0.4-beta.22269.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 3053c2baa99c..04c619be0064 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - c03f9876e3e6c80c7ffc0833e4542414310f1cb8 + 23e4305d836f32f2466250ca920fab8a78e153b6 - + https://github.com/dotnet/sdk - c03f9876e3e6c80c7ffc0833e4542414310f1cb8 + 23e4305d836f32f2466250ca920fab8a78e153b6 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 92ebb62d9d596095c2e61ca61e3435d62c4d80f7 + 23f4924e275d8c92168d510580cb38e329f70795 diff --git a/eng/Versions.props b/eng/Versions.props index 28d7a2977a0f..3d3ab2f5034a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22270.10 - 6.0.400-preview.22270.10 + 6.0.400-preview.22270.11 + 6.0.400-preview.22270.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b06f62554362fd90a7f430864de10df7e920fc10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 May 2022 06:45:42 +0000 Subject: [PATCH 0489/1244] Update dependencies from https://github.com/dotnet/sdk build 20220522.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22272.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22269.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 04c619be0064..fc66ff64a85e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - 23e4305d836f32f2466250ca920fab8a78e153b6 + a6386cefc8679bfa77d977c26fa7c4ba8f4d9376 - + https://github.com/dotnet/sdk - 23e4305d836f32f2466250ca920fab8a78e153b6 + a6386cefc8679bfa77d977c26fa7c4ba8f4d9376 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 23f4924e275d8c92168d510580cb38e329f70795 + a51b65c86bb0f42a79c47798c10ad75d5c343f92 diff --git a/eng/Versions.props b/eng/Versions.props index 3d3ab2f5034a..bce0d6151ee9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22270.11 - 6.0.400-preview.22270.11 + 6.0.400-preview.22272.4 + 6.0.400-preview.22272.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e2f938e70b72d7a1310b550604e89a72b05bffc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 May 2022 12:03:26 +0000 Subject: [PATCH 0490/1244] Update dependencies from https://github.com/dotnet/sdk build 20220523.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22273.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22269.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 fc66ff64a85e..0f8525e866c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c5ab390e42d0023fba2668fc1f6b2914c7838eda - + https://github.com/dotnet/sdk - a6386cefc8679bfa77d977c26fa7c4ba8f4d9376 + af3506f8e4e3b7a4a3ce77f97c91db81ca2c863e - + https://github.com/dotnet/sdk - a6386cefc8679bfa77d977c26fa7c4ba8f4d9376 + af3506f8e4e3b7a4a3ce77f97c91db81ca2c863e @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - a51b65c86bb0f42a79c47798c10ad75d5c343f92 + 038b1a9de7cf82a66c8e57fc3262454beadbbabc diff --git a/eng/Versions.props b/eng/Versions.props index bce0d6151ee9..c18e96c84ebd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22272.4 - 6.0.400-preview.22272.4 + 6.0.400-preview.22273.1 + 6.0.400-preview.22273.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 364d80b1821a1ac6fa07b0834b4585f16a288271 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 May 2022 21:45:32 +0000 Subject: [PATCH 0491/1244] Update dependencies from https://github.com/dotnet/sdk build 20220523.16 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22273.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.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.400-preview.22262.2 -> To Version 6.0.400-preview.22273.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 0f8525e866c3..5617f02666e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - c5ab390e42d0023fba2668fc1f6b2914c7838eda + 0a6983319294c352686ce641003d77b6b9ec0ade - + https://github.com/dotnet/templating - c5ab390e42d0023fba2668fc1f6b2914c7838eda + 0a6983319294c352686ce641003d77b6b9ec0ade - + https://github.com/dotnet/templating - c5ab390e42d0023fba2668fc1f6b2914c7838eda + 0a6983319294c352686ce641003d77b6b9ec0ade - + https://github.com/dotnet/sdk - af3506f8e4e3b7a4a3ce77f97c91db81ca2c863e + 7c35858d0c599135ec91c1e68991f3fbb154ffd9 - + https://github.com/dotnet/sdk - af3506f8e4e3b7a4a3ce77f97c91db81ca2c863e + 7c35858d0c599135ec91c1e68991f3fbb154ffd9 diff --git a/eng/Versions.props b/eng/Versions.props index c18e96c84ebd..6c11fe517533 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22262.2 + 6.0.400-preview.22273.3 @@ -56,8 +56,8 @@ - 6.0.400-preview.22273.1 - 6.0.400-preview.22273.1 + 6.0.400-preview.22273.16 + 6.0.400-preview.22273.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22262.2 + 6.0.400-preview.22273.3 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 12e2f27948230453068b06b21b3e7af3d4931cbc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 23 May 2022 22:47:27 +0000 Subject: [PATCH 0492/1244] 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 3d9d00946c45..c9a76a23c526 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 ccd89551de4c..5ae0b2beff39 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 f440d22a33dc77c79c37a3ae8189f89df892c1f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 May 2022 22:53:46 +0000 Subject: [PATCH 0493/1244] Update dependencies from https://github.com/dotnet/sdk build 20220523.21 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22273.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.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.400-preview.22262.2 -> To Version 6.0.400-preview.22273.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 5617f02666e0..0ce0d3fe0c3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 0a6983319294c352686ce641003d77b6b9ec0ade - + https://github.com/dotnet/sdk - 7c35858d0c599135ec91c1e68991f3fbb154ffd9 + 9815980d5ffb6217f0cf5b33c8aa12aa9cfe2a1f - + https://github.com/dotnet/sdk - 7c35858d0c599135ec91c1e68991f3fbb154ffd9 + 9815980d5ffb6217f0cf5b33c8aa12aa9cfe2a1f diff --git a/eng/Versions.props b/eng/Versions.props index 6c11fe517533..c8b0941cb7cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22273.16 - 6.0.400-preview.22273.16 + 6.0.400-preview.22273.21 + 6.0.400-preview.22273.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d6d1e4a114d7d56cc6b1780833aa522b92a10dce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 May 2022 03:27:04 +0000 Subject: [PATCH 0494/1244] Update dependencies from https://github.com/dotnet/sdk build 20220523.25 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22273.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.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.400-preview.22262.2 -> To Version 6.0.400-preview.22273.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 0ce0d3fe0c3e..30f93ab35a01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 0a6983319294c352686ce641003d77b6b9ec0ade - + https://github.com/dotnet/sdk - 9815980d5ffb6217f0cf5b33c8aa12aa9cfe2a1f + 476e2de213f09989777df273e71821a34cb57acd - + https://github.com/dotnet/sdk - 9815980d5ffb6217f0cf5b33c8aa12aa9cfe2a1f + 476e2de213f09989777df273e71821a34cb57acd diff --git a/eng/Versions.props b/eng/Versions.props index c8b0941cb7cc..f601cb47f46a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22273.21 - 6.0.400-preview.22273.21 + 6.0.400-preview.22273.25 + 6.0.400-preview.22273.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 735a05452d88c1cb2125f603ff50829121d96334 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 24 May 2022 14:26:19 -0500 Subject: [PATCH 0495/1244] Update MAUI GA manifests Context: https://aka.ms/dotnet/maui/6.0.300.json Update to MAUI GA releases. After `.\build.cmd -pack -publish`, manually tested the workloads: > .\bin\redist\Debug\dotnet\dotnet.exe workload install android --skip-manifest-update Installing pack Microsoft.Android.Sdk version 32.0.301... ... Installing pack Microsoft.NETCore.App.Runtime.Mono.android-arm version 6.0.5... I updated `$(MonoWorkloadManifestVersion)` as we require at least 6.0.5 in MAUI GA. --- eng/Versions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f485370f65e1..6ca7a1608a55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,13 +176,13 @@ - 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.312 + 32.0.301 + 15.4.303 + 15.4.303 + 12.3.303 + 15.4.303 + 6.0.5 6.0.4 $(MicrosoftNETWorkloadEmscriptenManifest60200Version) From 2cd1eed21f146e37527ff93e547ad89214c5e759 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 24 May 2022 15:40:53 -0700 Subject: [PATCH 0496/1244] 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 a637ba1b3851..135fbbf1e3cb 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 000000000000..c585046134bf --- /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 000000000000..0497a6fb544c --- /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 0497/1244] 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 c9a76a23c526..0500c818085e 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 5ae0b2beff39..053adef12d75 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 eba30c0d65b1c75076ac132f181304b3c25a7878 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 May 2022 06:52:53 +0000 Subject: [PATCH 0498/1244] Update dependencies from https://github.com/dotnet/sdk build 20220524.14 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22274.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.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.400-preview.22262.2 -> To Version 6.0.400-preview.22273.3 (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 30f93ab35a01..96e8a64acfe8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 0a6983319294c352686ce641003d77b6b9ec0ade - + https://github.com/dotnet/sdk - 476e2de213f09989777df273e71821a34cb57acd + 7c9338199b6d1cf9e1196ed3bcd677f82b5ac5a1 - + https://github.com/dotnet/sdk - 476e2de213f09989777df273e71821a34cb57acd + 7c9338199b6d1cf9e1196ed3bcd677f82b5ac5a1 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 1335005638890ffd27f2ba7fa3ecf6f686a9991f + 989560389f52986e093adcdd2f5eabad8e6a0742 - + https://github.com/dotnet/fsharp - 1335005638890ffd27f2ba7fa3ecf6f686a9991f + 989560389f52986e093adcdd2f5eabad8e6a0742 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 038b1a9de7cf82a66c8e57fc3262454beadbbabc + 828ca46ab6ef59fc1747df27ff31b0fd86621669 diff --git a/eng/Versions.props b/eng/Versions.props index f601cb47f46a..13b9ecfe889e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22273.25 - 6.0.400-preview.22273.25 + 6.0.400-preview.22274.14 + 6.0.400-preview.22274.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cc9dfaf03e9169705beb2242f208621f47f5bf6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 May 2022 09:20:43 +0000 Subject: [PATCH 0499/1244] Update dependencies from https://github.com/dotnet/sdk build 20220525.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22275.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.400-preview.22262.2 -> To Version 6.0.400-preview.22273.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 96e8a64acfe8..f7ab3f837c95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 0a6983319294c352686ce641003d77b6b9ec0ade - + https://github.com/dotnet/sdk - 7c9338199b6d1cf9e1196ed3bcd677f82b5ac5a1 + 349e9963ceec377dd74e049b69a9c4b5ed8c75a9 - + https://github.com/dotnet/sdk - 7c9338199b6d1cf9e1196ed3bcd677f82b5ac5a1 + 349e9963ceec377dd74e049b69a9c4b5ed8c75a9 diff --git a/eng/Versions.props b/eng/Versions.props index 13b9ecfe889e..28edee398b8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22274.14 - 6.0.400-preview.22274.14 + 6.0.400-preview.22275.2 + 6.0.400-preview.22275.2 $(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 0500/1244] 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 a529f79d1cc2..15557a298555 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 fd9a3f2786e08e5c516a2dbc7d8a4ab707aa11e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 May 2022 09:22:21 +0000 Subject: [PATCH 0501/1244] Update dependencies from https://github.com/dotnet/sdk build 20220526.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22276.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.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.400-preview.22262.2 -> To Version 6.0.400-preview.22273.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 f7ab3f837c95..f989efe9217a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 0a6983319294c352686ce641003d77b6b9ec0ade - + https://github.com/dotnet/sdk - 349e9963ceec377dd74e049b69a9c4b5ed8c75a9 + 2b3c90cae5a96b1e97ff1d349b1a39be0a4c6399 - + https://github.com/dotnet/sdk - 349e9963ceec377dd74e049b69a9c4b5ed8c75a9 + 2b3c90cae5a96b1e97ff1d349b1a39be0a4c6399 @@ -151,9 +151,9 @@ b3626202175e5c91998eaca0dc0881cb7f2e5da5 - + https://github.com/nuget/nuget.client - 5ac16d75a58665c240cd8ac267c0382a5d34cb75 + 9e244ebc11baf68ea2da0b7595b11726d0da99e5 diff --git a/eng/Versions.props b/eng/Versions.props index 28edee398b8c..0fdfafd35b8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22275.2 - 6.0.400-preview.22275.2 + 6.0.400-preview.22276.1 + 6.0.400-preview.22276.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8fd1c7203e51b0e627c551b7dd31497395764fa0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 May 2022 11:29:05 +0000 Subject: [PATCH 0502/1244] Update dependencies from https://github.com/dotnet/sdk build 20220526.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22276.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.400-preview.22262.2 -> To Version 6.0.400-preview.22275.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 f989efe9217a..ec0dbad845e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 0a6983319294c352686ce641003d77b6b9ec0ade + e6cab8640ec0bf38864d73632aff702abb2c6f82 - + https://github.com/dotnet/templating - 0a6983319294c352686ce641003d77b6b9ec0ade + e6cab8640ec0bf38864d73632aff702abb2c6f82 - + https://github.com/dotnet/templating - 0a6983319294c352686ce641003d77b6b9ec0ade + e6cab8640ec0bf38864d73632aff702abb2c6f82 - + https://github.com/dotnet/sdk - 2b3c90cae5a96b1e97ff1d349b1a39be0a4c6399 + dcadb9a2da1d832a2dfb896ae925fa2a28a920c6 - + https://github.com/dotnet/sdk - 2b3c90cae5a96b1e97ff1d349b1a39be0a4c6399 + dcadb9a2da1d832a2dfb896ae925fa2a28a920c6 diff --git a/eng/Versions.props b/eng/Versions.props index 0fdfafd35b8a..5f8ff42a088d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22273.3 + 6.0.400-preview.22275.2 @@ -56,8 +56,8 @@ - 6.0.400-preview.22276.1 - 6.0.400-preview.22276.1 + 6.0.400-preview.22276.3 + 6.0.400-preview.22276.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22273.3 + 6.0.400-preview.22275.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 8845807f72799e15d09e7c1a306ad903983eedb0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 27 May 2022 10:22:17 -0700 Subject: [PATCH 0503/1244] 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 f311e197b43d..96fa6035b891 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 a267c532f751f7466186e32d88723c5c16392789 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 May 2022 04:49:56 +0000 Subject: [PATCH 0504/1244] Update dependencies from https://github.com/dotnet/sdk build 20220529.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22279.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.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.400-preview.22262.2 -> To Version 6.0.400-preview.22275.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 ec0dbad845e8..0c5e8fa2deb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating e6cab8640ec0bf38864d73632aff702abb2c6f82 - + https://github.com/dotnet/sdk - dcadb9a2da1d832a2dfb896ae925fa2a28a920c6 + 95034c6376dd657be8143bbcff760586ebd78d69 - + https://github.com/dotnet/sdk - dcadb9a2da1d832a2dfb896ae925fa2a28a920c6 + 95034c6376dd657be8143bbcff760586ebd78d69 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 989560389f52986e093adcdd2f5eabad8e6a0742 + ad3e6de201b69df65113fc2a0e3f66abdc5df640 - + https://github.com/dotnet/fsharp - 989560389f52986e093adcdd2f5eabad8e6a0742 + ad3e6de201b69df65113fc2a0e3f66abdc5df640 diff --git a/eng/Versions.props b/eng/Versions.props index 5f8ff42a088d..b5a4e1973449 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22276.3 - 6.0.400-preview.22276.3 + 6.0.400-preview.22279.3 + 6.0.400-preview.22279.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 720dcd9117a2e583238a4343bfb69dd404dc2920 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 May 2022 06:48:36 +0000 Subject: [PATCH 0505/1244] Update dependencies from https://github.com/dotnet/sdk build 20220529.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22279.6 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.400-preview.22262.2 -> To Version 6.0.400-preview.22275.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 0c5e8fa2deb5..279ecd33c547 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating e6cab8640ec0bf38864d73632aff702abb2c6f82 - + https://github.com/dotnet/sdk - 95034c6376dd657be8143bbcff760586ebd78d69 + 90719e32559b16a53318028a14b0a834bb9d6334 - + https://github.com/dotnet/sdk - 95034c6376dd657be8143bbcff760586ebd78d69 + 90719e32559b16a53318028a14b0a834bb9d6334 @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - 828ca46ab6ef59fc1747df27ff31b0fd86621669 + e62c649a6fa90f0a591285d9103a4fd0a02d370e - + https://github.com/dotnet/msbuild - b3626202175e5c91998eaca0dc0881cb7f2e5da5 + f1dae6ab690483458d37b8900f1d1e4a5fc72851 diff --git a/eng/Versions.props b/eng/Versions.props index b5a4e1973449..fafdb14ea246 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22279.3 - 6.0.400-preview.22279.3 + 6.0.400-preview.22279.6 + 6.0.400-preview.22279.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b917e77ecfc85161e949fdb4d03d3b5a7fc954ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 May 2022 08:10:07 +0000 Subject: [PATCH 0506/1244] Update dependencies from https://github.com/dotnet/sdk build 20220530.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22280.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.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.400-preview.22262.2 -> To Version 6.0.400-preview.22276.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 279ecd33c547..0cd37b04f7f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - e6cab8640ec0bf38864d73632aff702abb2c6f82 + da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/templating - e6cab8640ec0bf38864d73632aff702abb2c6f82 + da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/templating - e6cab8640ec0bf38864d73632aff702abb2c6f82 + da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - 90719e32559b16a53318028a14b0a834bb9d6334 + dccd87721274388e1d7b9e3bb1e9db75abfeed53 - + https://github.com/dotnet/sdk - 90719e32559b16a53318028a14b0a834bb9d6334 + dccd87721274388e1d7b9e3bb1e9db75abfeed53 diff --git a/eng/Versions.props b/eng/Versions.props index fafdb14ea246..b92d3d7d2325 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22275.2 + 6.0.400-preview.22276.4 @@ -56,8 +56,8 @@ - 6.0.400-preview.22279.6 - 6.0.400-preview.22279.6 + 6.0.400-preview.22280.1 + 6.0.400-preview.22280.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22275.2 + 6.0.400-preview.22276.4 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 99accb6a1a83054e81272655cd6ce25cc5570371 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 30 May 2022 18:29:17 -0700 Subject: [PATCH 0507/1244] Ran update-dependencies on build 133323 and manually pushing --- 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 0cd37b04f7f9..e07cbbbd7d02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,9 +135,9 @@ 717d0cf94925e9cf67466dbee46c1019930eb212 - + https://github.com/dotnet/linker - 01c4f5905959c29f86781b85187bb676fc517ee9 + 28db36b95cf83c8e2ad11e67a2ad0de301b4cad6 linker From 083cda29c1ea35cae1ec9a9dbdda0775f703935e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 31 May 2022 19:33:10 +0000 Subject: [PATCH 0508/1244] Update dependencies from https://github.com/dotnet/sdk build 20220531.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22280.1 -> To Version 6.0.400-preview.22281.6 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-2.22278.4 -> To Version 4.3.0-2.22280.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 e07cbbbd7d02..68343dd89430 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - dccd87721274388e1d7b9e3bb1e9db75abfeed53 + 3aa8d1ad4708edccd379b01a7b9ca7e735346e43 - + https://github.com/dotnet/sdk - dccd87721274388e1d7b9e3bb1e9db75abfeed53 + 3aa8d1ad4708edccd379b01a7b9ca7e735346e43 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - e62c649a6fa90f0a591285d9103a4fd0a02d370e + efafad4192412b1205c72e17fd4a2c3eb136b727 diff --git a/eng/Versions.props b/eng/Versions.props index 7bd315174932..c43840647459 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22280.1 - 6.0.400-preview.22280.1 + 6.0.400-preview.22281.6 + 6.0.400-preview.22281.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 91b739db17b19384a37289f350c17a7d967f9ade Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 31 May 2022 22:55:57 +0000 Subject: [PATCH 0509/1244] Update dependencies from https://github.com/dotnet/sdk build 20220531.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22281.6 -> To Version 6.0.400-preview.22281.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-2.22280.1 -> To Version 4.3.0-2.22281.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 68343dd89430..b7a2ec9addac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - 3aa8d1ad4708edccd379b01a7b9ca7e735346e43 + 9e310e07ab966979583e0792363a62a3e13090e0 - + https://github.com/dotnet/sdk - 3aa8d1ad4708edccd379b01a7b9ca7e735346e43 + 9e310e07ab966979583e0792363a62a3e13090e0 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - efafad4192412b1205c72e17fd4a2c3eb136b727 + 508f4b491f42594f2a4f090d6a7e0526e879728c diff --git a/eng/Versions.props b/eng/Versions.props index c43840647459..52f7c34af19f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22281.6 - 6.0.400-preview.22281.6 + 6.0.400-preview.22281.8 + 6.0.400-preview.22281.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a641083495b5968295b9f2882e1214a732a5a91c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 31 May 2022 23:57:32 +0000 Subject: [PATCH 0510/1244] Update dependencies from https://github.com/dotnet/sdk build 20220531.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22281.6 -> To Version 6.0.400-preview.22281.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-2.22280.1 -> To Version 4.3.0-2.22281.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 b7a2ec9addac..03afcb9bd5be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - 9e310e07ab966979583e0792363a62a3e13090e0 + 7f7aca22fad92c6c0f452940a74b5799e48e1535 - + https://github.com/dotnet/sdk - 9e310e07ab966979583e0792363a62a3e13090e0 + 7f7aca22fad92c6c0f452940a74b5799e48e1535 diff --git a/eng/Versions.props b/eng/Versions.props index 52f7c34af19f..a0c2fda4c21f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22281.8 - 6.0.400-preview.22281.8 + 6.0.400-preview.22281.11 + 6.0.400-preview.22281.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b5d27ce9ab12ee82cc9c29d9aca3944a09787369 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Jun 2022 01:29:22 +0000 Subject: [PATCH 0511/1244] Update dependencies from https://github.com/dotnet/sdk build 20220531.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22281.6 -> To Version 6.0.400-preview.22281.13 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-2.22280.1 -> To Version 4.3.0-2.22281.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 03afcb9bd5be..5774d4ff0871 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - 7f7aca22fad92c6c0f452940a74b5799e48e1535 + 7e4ddc1a03d5eb375b1367b7c5aba73e5de71a24 - + https://github.com/dotnet/sdk - 7f7aca22fad92c6c0f452940a74b5799e48e1535 + 7e4ddc1a03d5eb375b1367b7c5aba73e5de71a24 diff --git a/eng/Versions.props b/eng/Versions.props index a0c2fda4c21f..ce316ce87adf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22281.11 - 6.0.400-preview.22281.11 + 6.0.400-preview.22281.13 + 6.0.400-preview.22281.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 43ff73901ff486d4d70c2acc2f7a72c696ebc4b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Jun 2022 07:08:03 +0000 Subject: [PATCH 0512/1244] Update dependencies from https://github.com/dotnet/sdk build 20220531.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22281.13 -> To Version 6.0.400-preview.22281.20 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22278.1 -> To Version 12.0.4-beta.22281.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 5774d4ff0871..322fb933ff3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - 7e4ddc1a03d5eb375b1367b7c5aba73e5de71a24 + 01566845f576775b6da77cebfe44c27cdf4bc124 - + https://github.com/dotnet/sdk - 7e4ddc1a03d5eb375b1367b7c5aba73e5de71a24 + 01566845f576775b6da77cebfe44c27cdf4bc124 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - ad3e6de201b69df65113fc2a0e3f66abdc5df640 + e1e4d6a8b17d45ef992e35d8609bea5967697897 - + https://github.com/dotnet/fsharp - ad3e6de201b69df65113fc2a0e3f66abdc5df640 + e1e4d6a8b17d45ef992e35d8609bea5967697897 diff --git a/eng/Versions.props b/eng/Versions.props index ce316ce87adf..97421f733cb6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22281.13 - 6.0.400-preview.22281.13 + 6.0.400-preview.22281.20 + 6.0.400-preview.22281.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5a024b782ee6d462b2169780b854740d867ff077 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Jun 2022 10:23:00 +0000 Subject: [PATCH 0513/1244] Update dependencies from https://github.com/dotnet/sdk build 20220601.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22281.20 -> To Version 6.0.400-preview.22301.1 Dependency coherency updates NuGet.Build.Tasks From Version 6.3.0-preview.2.66 -> To Version 6.3.0-preview.2.73 (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 322fb933ff3f..4f9530594bd5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - 01566845f576775b6da77cebfe44c27cdf4bc124 + a9ced2b48f413d6017e345e5a36b577408b1a1e5 - + https://github.com/dotnet/sdk - 01566845f576775b6da77cebfe44c27cdf4bc124 + a9ced2b48f413d6017e345e5a36b577408b1a1e5 @@ -151,9 +151,9 @@ f1dae6ab690483458d37b8900f1d1e4a5fc72851 - + https://github.com/nuget/nuget.client - 9e244ebc11baf68ea2da0b7595b11726d0da99e5 + d1b4bb43c13d56a6fa774e0fa61c070902dc27aa diff --git a/eng/Versions.props b/eng/Versions.props index 97421f733cb6..e97e006a1492 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22281.20 - 6.0.400-preview.22281.20 + 6.0.400-preview.22301.1 + 6.0.400-preview.22301.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 887ca99c188679fca2003f2a90e34e724d807ea1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Jun 2022 17:09:10 +0000 Subject: [PATCH 0514/1244] Update dependencies from https://github.com/dotnet/sdk build 20220601.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22301.1 -> To Version 6.0.400-preview.22301.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 4f9530594bd5..aef9de2101c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - a9ced2b48f413d6017e345e5a36b577408b1a1e5 + 6b2d96d07f8d19ee9c942d8624e8f43fbb1fc3e9 - + https://github.com/dotnet/sdk - a9ced2b48f413d6017e345e5a36b577408b1a1e5 + 6b2d96d07f8d19ee9c942d8624e8f43fbb1fc3e9 diff --git a/eng/Versions.props b/eng/Versions.props index e97e006a1492..8024246d5784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22301.1 - 6.0.400-preview.22301.1 + 6.0.400-preview.22301.8 + 6.0.400-preview.22301.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9db9aec098f5aab9fc440eec2b305fa533986f37 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Jun 2022 18:15:29 +0000 Subject: [PATCH 0515/1244] Update dependencies from https://github.com/dotnet/sdk build 20220601.10 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22301.1 -> To Version 6.0.400-preview.22301.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.0.4-beta.22281.2 -> To Version 12.0.4-beta.22281.4 (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 aef9de2101c6..a6c5e0c2caa9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - 6b2d96d07f8d19ee9c942d8624e8f43fbb1fc3e9 + bdb3e810cea9d7be4d5bd37fdb2dc9f074bb7ad6 - + https://github.com/dotnet/sdk - 6b2d96d07f8d19ee9c942d8624e8f43fbb1fc3e9 + bdb3e810cea9d7be4d5bd37fdb2dc9f074bb7ad6 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - e1e4d6a8b17d45ef992e35d8609bea5967697897 + 2b8fcc0c0a1cf1d69380159c7d03be993bba4016 - + https://github.com/dotnet/fsharp - e1e4d6a8b17d45ef992e35d8609bea5967697897 + 2b8fcc0c0a1cf1d69380159c7d03be993bba4016 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 508f4b491f42594f2a4f090d6a7e0526e879728c + e95c4956afe9a91ee5e03dd4521d57da1cfd0748 diff --git a/eng/Versions.props b/eng/Versions.props index 8024246d5784..ce705c967797 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22301.8 - 6.0.400-preview.22301.8 + 6.0.400-preview.22301.10 + 6.0.400-preview.22301.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e6be41bedc604141156fad4edb3c332d735ce33 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Jun 2022 07:21:05 +0000 Subject: [PATCH 0516/1244] Update dependencies from https://github.com/dotnet/sdk build 20220601.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22301.10 -> To Version 6.0.400-preview.22301.26 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-3.22281.14 -> To Version 4.3.0-3.22301.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 a6c5e0c2caa9..f592ab48eba2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - bdb3e810cea9d7be4d5bd37fdb2dc9f074bb7ad6 + 8257f118cc1f7ebcd22fd5ec85360f292655d65b - + https://github.com/dotnet/sdk - bdb3e810cea9d7be4d5bd37fdb2dc9f074bb7ad6 + 8257f118cc1f7ebcd22fd5ec85360f292655d65b @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - e95c4956afe9a91ee5e03dd4521d57da1cfd0748 + f2abe2ca16ba096ebdf49c08d9e8076904e149f4 diff --git a/eng/Versions.props b/eng/Versions.props index ce705c967797..cea1e5ccf058 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22301.10 - 6.0.400-preview.22301.10 + 6.0.400-preview.22301.26 + 6.0.400-preview.22301.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 772aa20c051f1a28bc3051cb03ed5e9129c84ea5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Jun 2022 19:57:43 +0000 Subject: [PATCH 0517/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220602.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22302.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 8c32b6e425e9..440ea747a04b 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 + 6eb1f46c315e850c8ac318fa56a0f3e05c2214c5 From c7593262dcce28cda500bda3e74c4b8b8ab1531a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Jun 2022 22:34:18 +0000 Subject: [PATCH 0518/1244] Update dependencies from https://github.com/dotnet/sdk build 20220602.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22301.26 -> To Version 6.0.400-preview.22302.15 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-3.22301.10 -> To Version 4.3.0-3.22301.12 (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 f592ab48eba2..27b7a70519bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - 8257f118cc1f7ebcd22fd5ec85360f292655d65b + ff94ea9de2e15fdf03f39a91fb407a56389bab94 - + https://github.com/dotnet/sdk - 8257f118cc1f7ebcd22fd5ec85360f292655d65b + ff94ea9de2e15fdf03f39a91fb407a56389bab94 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - f2abe2ca16ba096ebdf49c08d9e8076904e149f4 + d4cbcb54a3351d642ca589767dc1b205c4ab0363 diff --git a/eng/Versions.props b/eng/Versions.props index cea1e5ccf058..1dae7687ec78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22301.26 - 6.0.400-preview.22301.26 + 6.0.400-preview.22302.15 + 6.0.400-preview.22302.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9eab439e8f87e1c6ec4f59870c6be7c5da050775 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Jun 2022 15:01:43 +0000 Subject: [PATCH 0519/1244] Update dependencies from https://github.com/dotnet/sdk build 20220603.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22302.15 -> To Version 6.0.400-preview.22303.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22281.4 -> To Version 12.0.4-beta.22303.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 27b7a70519bf..0b7fd8d41b9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - ff94ea9de2e15fdf03f39a91fb407a56389bab94 + 26dcd7cb5d0e0a887dedcb8bce14fa9f3efcd887 - + https://github.com/dotnet/sdk - ff94ea9de2e15fdf03f39a91fb407a56389bab94 + 26dcd7cb5d0e0a887dedcb8bce14fa9f3efcd887 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 2b8fcc0c0a1cf1d69380159c7d03be993bba4016 + 6e15b9d0ad090f03b8063e90434f9b9d1489142d - + https://github.com/dotnet/fsharp - 2b8fcc0c0a1cf1d69380159c7d03be993bba4016 + 6e15b9d0ad090f03b8063e90434f9b9d1489142d @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - d4cbcb54a3351d642ca589767dc1b205c4ab0363 + eba8963036210b5a92ed96a1aea6027dab0a34d5 - + https://github.com/dotnet/msbuild - f1dae6ab690483458d37b8900f1d1e4a5fc72851 + a2df02e6af1ed33882f36932ac2111cc98591dff diff --git a/eng/Versions.props b/eng/Versions.props index 1dae7687ec78..30f88e50aa1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22302.15 - 6.0.400-preview.22302.15 + 6.0.400-preview.22303.4 + 6.0.400-preview.22303.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11ff603a9cc84b24ab84139c13701624214ccfbd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Jun 2022 23:13:32 +0000 Subject: [PATCH 0520/1244] Update dependencies from https://github.com/dotnet/sdk build 20220603.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22303.4 -> To Version 6.0.400-preview.22303.15 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22303.1 -> To Version 12.0.4-beta.22303.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 0b7fd8d41b9d..f232e3770b9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - 26dcd7cb5d0e0a887dedcb8bce14fa9f3efcd887 + 6c8fdcf04fb0b689d589256cfde5523587266ae5 - + https://github.com/dotnet/sdk - 26dcd7cb5d0e0a887dedcb8bce14fa9f3efcd887 + 6c8fdcf04fb0b689d589256cfde5523587266ae5 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 6e15b9d0ad090f03b8063e90434f9b9d1489142d + e98da109be18e804ad2b9ba23282e856ef4e5b23 - + https://github.com/dotnet/fsharp - 6e15b9d0ad090f03b8063e90434f9b9d1489142d + e98da109be18e804ad2b9ba23282e856ef4e5b23 diff --git a/eng/Versions.props b/eng/Versions.props index 30f88e50aa1a..a58f1ea94a98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22303.4 - 6.0.400-preview.22303.4 + 6.0.400-preview.22303.15 + 6.0.400-preview.22303.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d9b148b61231c8b54cc4af5d0d914fc9d0550cdd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Jun 2022 07:59:53 +0000 Subject: [PATCH 0521/1244] Update dependencies from https://github.com/dotnet/sdk build 20220606.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22303.15 -> To Version 6.0.400-preview.22306.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22303.4 -> To Version 12.0.4-beta.22305.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 f232e3770b9e..3ee74b7b334b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating da41e436df71a042862cfbb1c9b553643e2f9f60 - + https://github.com/dotnet/sdk - 6c8fdcf04fb0b689d589256cfde5523587266ae5 + e0a378aa3aca4b39a31e6a92e0fff33ea17b59fc - + https://github.com/dotnet/sdk - 6c8fdcf04fb0b689d589256cfde5523587266ae5 + e0a378aa3aca4b39a31e6a92e0fff33ea17b59fc @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - e98da109be18e804ad2b9ba23282e856ef4e5b23 + a4208e9126950b98ad74ec281cfc95bf161b01b2 - + https://github.com/dotnet/fsharp - e98da109be18e804ad2b9ba23282e856ef4e5b23 + a4208e9126950b98ad74ec281cfc95bf161b01b2 diff --git a/eng/Versions.props b/eng/Versions.props index a58f1ea94a98..c6ebdd3af6b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22303.15 - 6.0.400-preview.22303.15 + 6.0.400-preview.22306.1 + 6.0.400-preview.22306.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eeca7b601c6bbf160e20a59be3f34b181827ec49 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 6 Jun 2022 02:54:52 -0700 Subject: [PATCH 0522/1244] Restore the change for IL Link --- 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 440ea747a04b..df9e197d6be2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,9 +135,9 @@ 717d0cf94925e9cf67466dbee46c1019930eb212 - + https://github.com/dotnet/linker - 01c4f5905959c29f86781b85187bb676fc517ee9 + 28db36b95cf83c8e2ad11e67a2ad0de301b4cad6 linker From ae8b05a2ddd5a06a9e99f941d9574a5e0b8fc3f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Jun 2022 00:11:37 +0000 Subject: [PATCH 0523/1244] Update dependencies from https://github.com/dotnet/sdk build 20220606.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22306.1 -> To Version 6.0.400-preview.22306.13 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.400-preview.22276.4 -> To Version 6.0.400-preview.22306.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 3ee74b7b334b..9d4bcc6abcd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - da41e436df71a042862cfbb1c9b553643e2f9f60 + a652ef175e113b02d9259e44c0d837a37696a370 - + https://github.com/dotnet/templating - da41e436df71a042862cfbb1c9b553643e2f9f60 + a652ef175e113b02d9259e44c0d837a37696a370 - + https://github.com/dotnet/templating - da41e436df71a042862cfbb1c9b553643e2f9f60 + a652ef175e113b02d9259e44c0d837a37696a370 - + https://github.com/dotnet/sdk - e0a378aa3aca4b39a31e6a92e0fff33ea17b59fc + 38b43a4356db9edc7d4768d2cc549734b48a964c - + https://github.com/dotnet/sdk - e0a378aa3aca4b39a31e6a92e0fff33ea17b59fc + 38b43a4356db9edc7d4768d2cc549734b48a964c @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - eba8963036210b5a92ed96a1aea6027dab0a34d5 + 134278cd43e1c3ac701a651a3369f3eecd3a37bb - + https://github.com/dotnet/msbuild - a2df02e6af1ed33882f36932ac2111cc98591dff + 1c045cf58dcb0d2f0474364550eeab37877257a1 diff --git a/eng/Versions.props b/eng/Versions.props index c6ebdd3af6b4..8cc4d7e450c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22276.4 + 6.0.400-preview.22306.2 @@ -56,8 +56,8 @@ - 6.0.400-preview.22306.1 - 6.0.400-preview.22306.1 + 6.0.400-preview.22306.13 + 6.0.400-preview.22306.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22276.4 + 6.0.400-preview.22306.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 9988564da99eb1d42b88b99f0c750a56c8142d81 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Jun 2022 10:00:18 -0700 Subject: [PATCH 0524/1244] 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 a529f79d1cc2..ebdbb063454d 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 36b92cafe5d0b01250ffd651e8435c2817c5aef3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Jun 2022 03:03:28 +0000 Subject: [PATCH 0525/1244] Update dependencies from https://github.com/dotnet/sdk build 20220607.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22306.13 -> To Version 6.0.400-preview.22307.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 9d4bcc6abcd4..98aa2d57723f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating a652ef175e113b02d9259e44c0d837a37696a370 - + https://github.com/dotnet/sdk - 38b43a4356db9edc7d4768d2cc549734b48a964c + cd7e54c97ad30935c8cdebe603b6633ee34328db - + https://github.com/dotnet/sdk - 38b43a4356db9edc7d4768d2cc549734b48a964c + cd7e54c97ad30935c8cdebe603b6633ee34328db diff --git a/eng/Versions.props b/eng/Versions.props index 8cc4d7e450c0..25b594b69179 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22306.13 - 6.0.400-preview.22306.13 + 6.0.400-preview.22307.22 + 6.0.400-preview.22307.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b970c4b70ed224e1706b4aeb875e6f484efd8411 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Jun 2022 18:54:35 +0000 Subject: [PATCH 0526/1244] Update dependencies from https://github.com/dotnet/sdk build 20220608.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22308.4 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-3.22305.4 -> To Version 4.3.0-2.22307.7 (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 98aa2d57723f..35501acbe3bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating a652ef175e113b02d9259e44c0d837a37696a370 - + https://github.com/dotnet/sdk - cd7e54c97ad30935c8cdebe603b6633ee34328db + 68ac393283adc5ee6618069ac002942e98cad18c - + https://github.com/dotnet/sdk - cd7e54c97ad30935c8cdebe603b6633ee34328db + 68ac393283adc5ee6618069ac002942e98cad18c @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 134278cd43e1c3ac701a651a3369f3eecd3a37bb + 069a85a786acae3be2c7b49e330b7f968a624c88 diff --git a/eng/Versions.props b/eng/Versions.props index 25b594b69179..d58d1c539236 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22307.22 - 6.0.400-preview.22307.22 + 6.0.400-preview.22308.4 + 6.0.400-preview.22308.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c872893e63cfd4b864b979944092a93931121aac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Jun 2022 22:25:43 +0000 Subject: [PATCH 0527/1244] Update dependencies from https://github.com/dotnet/sdk build 20220608.10 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22308.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.0.4-beta.22305.1 -> To Version 12.0.4-beta.22308.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 35501acbe3bc..8a66e5457a1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating a652ef175e113b02d9259e44c0d837a37696a370 - + https://github.com/dotnet/sdk - 68ac393283adc5ee6618069ac002942e98cad18c + 43302aad97ef65f7146df00d33734dde4566c6c8 - + https://github.com/dotnet/sdk - 68ac393283adc5ee6618069ac002942e98cad18c + 43302aad97ef65f7146df00d33734dde4566c6c8 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - a4208e9126950b98ad74ec281cfc95bf161b01b2 + 0e5bfb1f321c9a06e341f7c862af8e5291cebc9c - + https://github.com/dotnet/fsharp - a4208e9126950b98ad74ec281cfc95bf161b01b2 + 0e5bfb1f321c9a06e341f7c862af8e5291cebc9c diff --git a/eng/Versions.props b/eng/Versions.props index d58d1c539236..952d5fc5f95d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22308.4 - 6.0.400-preview.22308.4 + 6.0.400-preview.22308.10 + 6.0.400-preview.22308.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0c7c5381b97fbafe8496e790353d4a7c211d6012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Thu, 9 Jun 2022 08:06:36 +0200 Subject: [PATCH 0528/1244] Fix cross-gen for DumpMinitool --- src/redist/targets/Crossgen.targets | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 8949af13254c..f440ca5f3b9e 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -41,8 +41,10 @@ - + + + From 0a0ec693cfe5f28927c3b60843c85b25ea61dba9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Jun 2022 11:49:55 +0000 Subject: [PATCH 0529/1244] Update dependencies from https://github.com/dotnet/sdk build 20220609.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22309.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.0.4-beta.22305.1 -> To Version 12.0.4-beta.22308.7 (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 8a66e5457a1d..6111da596203 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating a652ef175e113b02d9259e44c0d837a37696a370 - + https://github.com/dotnet/sdk - 43302aad97ef65f7146df00d33734dde4566c6c8 + bcbe90f82533f595c057077b91ed601c64859570 - + https://github.com/dotnet/sdk - 43302aad97ef65f7146df00d33734dde4566c6c8 + bcbe90f82533f595c057077b91ed601c64859570 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 0e5bfb1f321c9a06e341f7c862af8e5291cebc9c + ae0266d7808d3882a8741ecfd858a3e962f57092 - + https://github.com/dotnet/fsharp - 0e5bfb1f321c9a06e341f7c862af8e5291cebc9c + ae0266d7808d3882a8741ecfd858a3e962f57092 diff --git a/eng/Versions.props b/eng/Versions.props index 952d5fc5f95d..474a1fbcfa7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22308.10 - 6.0.400-preview.22308.10 + 6.0.400-preview.22309.2 + 6.0.400-preview.22309.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 787b7ce62922d421e7bd31a3ef30def150e5cc2a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Jun 2022 15:03:29 +0000 Subject: [PATCH 0530/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220609.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22309.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 df9e197d6be2..36f345901c85 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 - 6eb1f46c315e850c8ac318fa56a0f3e05c2214c5 + e0d96c3f3b9e15553efb2b970e5af6e7a8677bcb From 17c1d67be5da71b1c385a6155e9181f26ec7eb3c Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 9 Jun 2022 12:57:38 -0500 Subject: [PATCH 0531/1244] [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 c8a0a71f155c..2cf4ad6288ce 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 ab338c52e402..b52e87c52a38 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 000000000000..1d284c47ecac --- /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 131e6ed24bd3971018064e33868e4bd538117ced Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Jun 2022 04:09:51 +0000 Subject: [PATCH 0532/1244] Update dependencies from https://github.com/dotnet/sdk build 20220609.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22309.17 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 12.0.4-beta.22305.1 -> To Version 12.0.4-beta.22308.7 (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 6111da596203..725bbdc10012 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating a652ef175e113b02d9259e44c0d837a37696a370 - + https://github.com/dotnet/sdk - bcbe90f82533f595c057077b91ed601c64859570 + de05f26a1d65b14e24cb7564e55d8b6082e9becf - + https://github.com/dotnet/sdk - bcbe90f82533f595c057077b91ed601c64859570 + de05f26a1d65b14e24cb7564e55d8b6082e9becf @@ -151,9 +151,9 @@ 1c045cf58dcb0d2f0474364550eeab37877257a1 - + https://github.com/nuget/nuget.client - d1b4bb43c13d56a6fa774e0fa61c070902dc27aa + 9c469e4dbfa8ba6085f0cd47d58207de90304a5a diff --git a/eng/Versions.props b/eng/Versions.props index 474a1fbcfa7a..8259b81f732f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22309.2 - 6.0.400-preview.22309.2 + 6.0.400-preview.22309.17 + 6.0.400-preview.22309.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0ccc85fe5130800fef9dd5704455830084395afa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Jun 2022 06:56:34 +0000 Subject: [PATCH 0533/1244] Update dependencies from https://github.com/dotnet/sdk build 20220609.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22309.23 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,NuGet.Build.Tasks From Version 6.0.400-preview.22306.2 -> To Version 6.0.400-preview.22309.5 (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 725bbdc10012..2499f787383b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - a652ef175e113b02d9259e44c0d837a37696a370 + 843e80279c4bd0a2ea876c51a33e0a99be9a3116 - + https://github.com/dotnet/templating - a652ef175e113b02d9259e44c0d837a37696a370 + 843e80279c4bd0a2ea876c51a33e0a99be9a3116 - + https://github.com/dotnet/templating - a652ef175e113b02d9259e44c0d837a37696a370 + 843e80279c4bd0a2ea876c51a33e0a99be9a3116 - + https://github.com/dotnet/sdk - de05f26a1d65b14e24cb7564e55d8b6082e9becf + f91164b98d39495bdde4cfc33dc0128623dffee8 - + https://github.com/dotnet/sdk - de05f26a1d65b14e24cb7564e55d8b6082e9becf + f91164b98d39495bdde4cfc33dc0128623dffee8 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - ae0266d7808d3882a8741ecfd858a3e962f57092 + 1a1ccfaa5df256286397703a1a06b8df70dd0277 - + https://github.com/dotnet/fsharp - ae0266d7808d3882a8741ecfd858a3e962f57092 + 1a1ccfaa5df256286397703a1a06b8df70dd0277 diff --git a/eng/Versions.props b/eng/Versions.props index 8259b81f732f..44f0b4aeea83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22306.2 + 6.0.400-preview.22309.5 @@ -56,8 +56,8 @@ - 6.0.400-preview.22309.17 - 6.0.400-preview.22309.17 + 6.0.400-preview.22309.23 + 6.0.400-preview.22309.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22306.2 + 6.0.400-preview.22309.5 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 1d99eb666f597b63ed3ad69ae8dd2a60859a46dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Jun 2022 19:10:20 +0000 Subject: [PATCH 0534/1244] Update dependencies from https://github.com/dotnet/sdk build 20220610.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22310.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.Compilers.Toolset,NuGet.Build.Tasks From Version 6.0.400-preview.22306.2 -> To Version 6.0.400-preview.22309.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 2499f787383b..769c9c145766 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 843e80279c4bd0a2ea876c51a33e0a99be9a3116 - + https://github.com/dotnet/sdk - f91164b98d39495bdde4cfc33dc0128623dffee8 + 1b3ebc6ec06435ae11d9215b6e35f9208f2f5adb - + https://github.com/dotnet/sdk - f91164b98d39495bdde4cfc33dc0128623dffee8 + 1b3ebc6ec06435ae11d9215b6e35f9208f2f5adb @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 1a1ccfaa5df256286397703a1a06b8df70dd0277 + 45ecfa9e9c543b773045a719db82396376a42d0f - + https://github.com/dotnet/fsharp - 1a1ccfaa5df256286397703a1a06b8df70dd0277 + 45ecfa9e9c543b773045a719db82396376a42d0f diff --git a/eng/Versions.props b/eng/Versions.props index 44f0b4aeea83..7e2180674445 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22309.23 - 6.0.400-preview.22309.23 + 6.0.400-preview.22310.5 + 6.0.400-preview.22310.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From df9d0b48b14c2829408344e1282e5de2e3b22111 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 10 Jun 2022 12:28:33 -0700 Subject: [PATCH 0535/1244] Update .vsts-ci.yml --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index a28265b3ee6d..20ed9983637e 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 28948923ce6ee6366fbda292696d440e0ad158e2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 10 Jun 2022 13:22:26 -0700 Subject: [PATCH 0536/1244] 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 a28265b3ee6d..20ed9983637e 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 e585cf928459155b1065b6eb4f64199fb6d1059d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Jun 2022 03:18:55 +0000 Subject: [PATCH 0537/1244] Update dependencies from https://github.com/dotnet/sdk build 20220612.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22312.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22311.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 769c9c145766..436687583a05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 843e80279c4bd0a2ea876c51a33e0a99be9a3116 - + https://github.com/dotnet/sdk - 1b3ebc6ec06435ae11d9215b6e35f9208f2f5adb + e8177e0c74c3df4356bddd02c1c60b178eb0267e - + https://github.com/dotnet/sdk - 1b3ebc6ec06435ae11d9215b6e35f9208f2f5adb + e8177e0c74c3df4356bddd02c1c60b178eb0267e @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 45ecfa9e9c543b773045a719db82396376a42d0f + 2dd5e367928e9a0f9ad8520377501a8628fc0448 - + https://github.com/dotnet/fsharp - 45ecfa9e9c543b773045a719db82396376a42d0f + 2dd5e367928e9a0f9ad8520377501a8628fc0448 diff --git a/eng/Versions.props b/eng/Versions.props index 7e2180674445..b4db473deb4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22310.5 - 6.0.400-preview.22310.5 + 6.0.400-preview.22312.8 + 6.0.400-preview.22312.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 85086602adc3280d9ad4752e91d45d14f5e54dc2 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 13 Jun 2022 18:26:28 -0400 Subject: [PATCH 0538/1244] [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 eab5162908d2..001a16c019f9 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 000000000000..f47d22c98601 --- /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 9a26cd6950d3..613ed2e26900 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 000000000000..dded6ec2f159 --- /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 000000000000..e101f8041150 --- /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 4a38b3c1482ab07c7c1b662648343cb5d5787792 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Jun 2022 22:49:44 +0000 Subject: [PATCH 0539/1244] Update dependencies from https://github.com/dotnet/sdk build 20220613.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22313.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 436687583a05..4fd7b926d5f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 843e80279c4bd0a2ea876c51a33e0a99be9a3116 - + https://github.com/dotnet/sdk - e8177e0c74c3df4356bddd02c1c60b178eb0267e + 14e080731f3c2ff90317e4122b2c33bcdcfc6d4e - + https://github.com/dotnet/sdk - e8177e0c74c3df4356bddd02c1c60b178eb0267e + 14e080731f3c2ff90317e4122b2c33bcdcfc6d4e @@ -121,18 +121,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 2dd5e367928e9a0f9ad8520377501a8628fc0448 + 8bd40eb4fffaa44eda4741eb9603075c2fad1060 - + https://github.com/dotnet/fsharp - 2dd5e367928e9a0f9ad8520377501a8628fc0448 + 8bd40eb4fffaa44eda4741eb9603075c2fad1060 - + https://github.com/microsoft/vstest - 717d0cf94925e9cf67466dbee46c1019930eb212 + a3b70563933c2bc118fb6baa3e560174db3a7cb2 diff --git a/eng/Versions.props b/eng/Versions.props index b4db473deb4f..0e125724d96b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22312.8 - 6.0.400-preview.22312.8 + 6.0.400-preview.22313.5 + 6.0.400-preview.22313.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-release-20220408-11 + 17.3.0-preview-20220613-05 From d34b4bc9cb541eede05506dc55605f9902389d06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Jun 2022 05:16:12 +0000 Subject: [PATCH 0540/1244] Update dependencies from https://github.com/dotnet/sdk build 20220613.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22313.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.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 4fd7b926d5f6..65a173de4185 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 843e80279c4bd0a2ea876c51a33e0a99be9a3116 - + https://github.com/dotnet/sdk - 14e080731f3c2ff90317e4122b2c33bcdcfc6d4e + a28a2c0bd5db57728e186dbca4e5fca0e734cca6 - + https://github.com/dotnet/sdk - 14e080731f3c2ff90317e4122b2c33bcdcfc6d4e + a28a2c0bd5db57728e186dbca4e5fca0e734cca6 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 8bd40eb4fffaa44eda4741eb9603075c2fad1060 + a1c3c7649b8656cc9826820ef48a6cc8c57c2d63 - + https://github.com/dotnet/fsharp - 8bd40eb4fffaa44eda4741eb9603075c2fad1060 + a1c3c7649b8656cc9826820ef48a6cc8c57c2d63 diff --git a/eng/Versions.props b/eng/Versions.props index 0e125724d96b..be3c50ad078a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22313.5 - 6.0.400-preview.22313.5 + 6.0.400-preview.22313.11 + 6.0.400-preview.22313.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From afa31ba60b281a244a2ced0a298aebb9033c7869 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Jun 2022 06:28:07 +0000 Subject: [PATCH 0541/1244] Update dependencies from https://github.com/dotnet/sdk build 20220613.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22313.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.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 65a173de4185..539c05a21881 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 843e80279c4bd0a2ea876c51a33e0a99be9a3116 - + https://github.com/dotnet/sdk - a28a2c0bd5db57728e186dbca4e5fca0e734cca6 + 6f6934f95b4d4c6af6a825020e8ef59e308eec49 - + https://github.com/dotnet/sdk - a28a2c0bd5db57728e186dbca4e5fca0e734cca6 + 6f6934f95b4d4c6af6a825020e8ef59e308eec49 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 069a85a786acae3be2c7b49e330b7f968a624c88 + 404f7a16d8b885c8f3efbb7e6758a73e1de7a28f diff --git a/eng/Versions.props b/eng/Versions.props index be3c50ad078a..bd88e008f719 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22313.11 - 6.0.400-preview.22313.11 + 6.0.400-preview.22313.13 + 6.0.400-preview.22313.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 003993b07f94610d4225da0cfe25d553bfe15dc1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Jun 2022 07:49:07 +0000 Subject: [PATCH 0542/1244] Update dependencies from https://github.com/dotnet/sdk build 20220613.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22313.15 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.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 539c05a21881..bd55f6083a57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 843e80279c4bd0a2ea876c51a33e0a99be9a3116 - + https://github.com/dotnet/sdk - 6f6934f95b4d4c6af6a825020e8ef59e308eec49 + e76dcab7a07d417a278dd054956386ed05ab7883 - + https://github.com/dotnet/sdk - 6f6934f95b4d4c6af6a825020e8ef59e308eec49 + e76dcab7a07d417a278dd054956386ed05ab7883 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 404f7a16d8b885c8f3efbb7e6758a73e1de7a28f + 2c888310c9ec822f6302334a9410179d1c26c32a diff --git a/eng/Versions.props b/eng/Versions.props index bd88e008f719..58bf9104cf74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22313.13 - 6.0.400-preview.22313.13 + 6.0.400-preview.22313.15 + 6.0.400-preview.22313.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 87fc91672ad935de206644ced6f1ea9278d15fde Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 14 Jun 2022 01:10:25 -0700 Subject: [PATCH 0543/1244] Add support for targeting Windows version 22621 and update Windows SDK projections. --- 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 8543f5e5cee9..efb09817fd55 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 96fa6035b891..840a2133bd49 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 bf2305953518..59f28eee89af 100644 --- a/test/EndToEnd/GivenWindowsApp.cs +++ b/test/EndToEnd/GivenWindowsApp.cs @@ -17,7 +17,8 @@ public class GivenWindowsApp : TestBase [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 c26eab078e6df6f319c5f9419e55f8aa9a9a8295 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Jun 2022 18:32:05 +0000 Subject: [PATCH 0544/1244] Update dependencies from https://github.com/dotnet/sdk build 20220614.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22314.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.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 bd55f6083a57..5eb3ec85f3e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 843e80279c4bd0a2ea876c51a33e0a99be9a3116 - + https://github.com/dotnet/sdk - e76dcab7a07d417a278dd054956386ed05ab7883 + ea19ab64f6d84fb4c42c0e9733bd283755be321d - + https://github.com/dotnet/sdk - e76dcab7a07d417a278dd054956386ed05ab7883 + ea19ab64f6d84fb4c42c0e9733bd283755be321d diff --git a/eng/Versions.props b/eng/Versions.props index 58bf9104cf74..adfdc95b2b9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22313.15 - 6.0.400-preview.22313.15 + 6.0.400-preview.22314.5 + 6.0.400-preview.22314.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9a4017803e918c3344a53f6d562c30b375d9996a Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 14 Jun 2022 12:09:07 -0700 Subject: [PATCH 0545/1244] 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 ce2c31a77ecc..e32fe08844e8 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 46f03f644c37deea81daf5791f25d6eb7791cdf0 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 14 Jun 2022 15:41:51 -0500 Subject: [PATCH 0546/1244] Remove source-build nuget.client patch that was backported (#13972) --- ...ild-and-Microsoft.Extensions.Command.patch | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Pin-Microsoft.Build-and-Microsoft.Extensions.Command.patch 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 deleted file mode 100644 index 1d284c47ecac..000000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Pin-Microsoft.Build-and-Microsoft.Extensions.Command.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 46ba3d49a86ba601f323befa2aa53ab8fc1e411a Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 14 Jun 2022 14:58:21 -0700 Subject: [PATCH 0547/1244] [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#13962) * Update format of multiple /p parameters * [release/6.0.3xx] Add razor-compiler to Source Build (#13652) * Remove NuGet.Client source-build patches Co-authored-by: Marc Paine Co-authored-by: Logan Bussell Co-authored-by: Jason Zhai --- .../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 eab5162908d2..001a16c019f9 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 000000000000..f47d22c98601 --- /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 9a26cd6950d3..613ed2e26900 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 000000000000..dded6ec2f159 --- /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 000000000000..e101f8041150 --- /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 985a0871754b6aaf88fa41ca31b1dcdc9a3176d7 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 14 Jun 2022 16:06:11 -0700 Subject: [PATCH 0548/1244] Update asp.net templates (#13967) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7e2180674445..bfacfd9220a1 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 0549/1244] 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 8543f5e5cee9..efb09817fd55 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 96fa6035b891..840a2133bd49 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 bf2305953518..59f28eee89af 100644 --- a/test/EndToEnd/GivenWindowsApp.cs +++ b/test/EndToEnd/GivenWindowsApp.cs @@ -17,7 +17,8 @@ public class GivenWindowsApp : TestBase [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 57d6928a192041d086e355b42c9c4eae8de21b37 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Jun 2022 23:59:12 +0000 Subject: [PATCH 0550/1244] Update dependencies from https://github.com/dotnet/arcade build 20220614.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22261.7 -> To Version 6.0.0-beta.22314.7 --- 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 769c9c145766..ef4c90061b65 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 bfacfd9220a1..da570c80d8ae 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 de4424c2a3e1..80e9668ffbf9 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 3b7c25c763cc14fb52d7ee8400ac16437015cc21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Jun 2022 02:20:08 +0000 Subject: [PATCH 0551/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220614.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22314.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 36f345901c85..83256d48d74d 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 - e0d96c3f3b9e15553efb2b970e5af6e7a8677bcb + bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b From 143414c8b6e8157a3a0eb44f7af698a5bfb17ea3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jun 2022 09:45:47 +0000 Subject: [PATCH 0552/1244] [release/6.0.4xx] Update dependencies from dotnet/sdk (#13985) [release/6.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.4-beta.22313.5 to 12.0.4-beta.22314.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.5-beta.22313.5 to 6.0.5-beta.22314.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.3.0-preview-20220613-05 to 17.3.0-preview-20220614-07 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0642cdce560..c50ae30f9d9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 843e80279c4bd0a2ea876c51a33e0a99be9a3116 - + https://github.com/dotnet/sdk - ea19ab64f6d84fb4c42c0e9733bd283755be321d + 4bcd52f79e0c775681dbfc60d5ef9e7b2bdb3ce0 - + https://github.com/dotnet/sdk - ea19ab64f6d84fb4c42c0e9733bd283755be321d + 4bcd52f79e0c775681dbfc60d5ef9e7b2bdb3ce0 @@ -121,18 +121,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - a1c3c7649b8656cc9826820ef48a6cc8c57c2d63 + 73b51785eff89a72729043d26c229384377eaf13 - + https://github.com/dotnet/fsharp - a1c3c7649b8656cc9826820ef48a6cc8c57c2d63 + 73b51785eff89a72729043d26c229384377eaf13 - + https://github.com/microsoft/vstest - a3b70563933c2bc118fb6baa3e560174db3a7cb2 + 4361d428ee70704050f1b4f76fa98069b8afd9f5 diff --git a/eng/Versions.props b/eng/Versions.props index 1d4db21430b0..d2ecfdfb2e32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22314.5 - 6.0.400-preview.22314.5 + 6.0.400-preview.22315.2 + 6.0.400-preview.22315.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-preview-20220613-05 + 17.3.0-preview-20220614-07 From 84746fd13a0bc7beb049e100793915b72bbbf423 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jun 2022 17:00:38 +0000 Subject: [PATCH 0553/1244] Update dependencies from https://github.com/dotnet/sdk build 20220615.3 (#13987) [release/6.0.4xx] 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 c50ae30f9d9e..aff8d0df6a0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 843e80279c4bd0a2ea876c51a33e0a99be9a3116 - + https://github.com/dotnet/sdk - 4bcd52f79e0c775681dbfc60d5ef9e7b2bdb3ce0 + 422a1efa82e474110476f8f0d76c3cdcfe724cf2 - + https://github.com/dotnet/sdk - 4bcd52f79e0c775681dbfc60d5ef9e7b2bdb3ce0 + 422a1efa82e474110476f8f0d76c3cdcfe724cf2 diff --git a/eng/Versions.props b/eng/Versions.props index d2ecfdfb2e32..b075c955b2e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22315.2 - 6.0.400-preview.22315.2 + 6.0.400-preview.22315.3 + 6.0.400-preview.22315.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6f98d9441d219b7bd638144073a3441f224ee3d4 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 15 Jun 2022 17:56:07 -0500 Subject: [PATCH 0554/1244] 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 ff9296640dd1..c4f3f6ec2a33 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 64a3acb5d06a5035062a48f994e8f5e4a5b2766d Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 15 Jun 2022 17:56:59 -0500 Subject: [PATCH 0555/1244] Fixups to make the tarball committable (#13894) (#13995) --- .../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 ff9296640dd1..c4f3f6ec2a33 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 ae695c8600003dd885feffca704cd653d24281fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:04:13 +0000 Subject: [PATCH 0556/1244] Update dependencies from https://github.com/dotnet/sdk build 20220616.3 (#13997) [release/6.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.3.0-preview-20220614-07 to 17.3.0-preview-20220615-12 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.3.0-2.22313.23 to 4.3.0-2.22314.23 (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 aff8d0df6a0c..ead1b16fb9be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 843e80279c4bd0a2ea876c51a33e0a99be9a3116 - + https://github.com/dotnet/sdk - 422a1efa82e474110476f8f0d76c3cdcfe724cf2 + 0b5950c55319a612008e44b152cde3aafb22aec6 - + https://github.com/dotnet/sdk - 422a1efa82e474110476f8f0d76c3cdcfe724cf2 + 0b5950c55319a612008e44b152cde3aafb22aec6 @@ -130,9 +130,9 @@ 73b51785eff89a72729043d26c229384377eaf13 - + https://github.com/microsoft/vstest - 4361d428ee70704050f1b4f76fa98069b8afd9f5 + 32d8acfdf9ae351c19d928ef8b2bd54a3f7d3925 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 2c888310c9ec822f6302334a9410179d1c26c32a + 6c191c842691f41808c758ce70bf57df2c2f42f4 diff --git a/eng/Versions.props b/eng/Versions.props index b075c955b2e1..606a3f77c217 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22315.3 - 6.0.400-preview.22315.3 + 6.0.400-preview.22316.3 + 6.0.400-preview.22316.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-preview-20220614-07 + 17.3.0-preview-20220615-12 From b5e20af6f571a6fe003184996f70541f9a1027cb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 20 Jun 2022 20:28:03 +0000 Subject: [PATCH 0557/1244] 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 f50bca67fb4d..6040289775da 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 0500c818085e..d99555dd3933 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 0558/1244] 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 d99555dd3933..98b29c6b8105 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 e121f07ceb45..81b56d1ba255 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 de4424c2a3e1..80e9668ffbf9 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 a5036eb6ebf3e8f434d6f2bcaac829ffa06473ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 09:26:25 -0700 Subject: [PATCH 0559/1244] [release/6.0.4xx] Update dependencies from dotnet/sdk (#14001) * Update dependencies from https://github.com/dotnet/sdk build 20220620.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22316.3 -> To Version 6.0.400-preview.22320.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22314.2 -> To Version 12.0.4-beta.22320.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220620.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22316.3 -> To Version 6.0.400-preview.22320.14 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22314.2 -> To Version 12.0.4-beta.22320.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220620.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22316.3 -> To Version 6.0.400-preview.22320.15 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22314.2 -> To Version 12.0.4-beta.22320.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220621.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22316.3 -> To Version 6.0.400-preview.22321.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,NuGet.Build.Tasks From Version 12.0.4-beta.22314.2 -> To Version 12.0.4-beta.22320.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220621.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22316.3 -> To Version 6.0.400-preview.22321.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,NuGet.Build.Tasks From Version 6.0.400-preview.22309.5 -> To Version 6.0.400-preview.22320.4 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ead1b16fb9be..7bab982646f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 843e80279c4bd0a2ea876c51a33e0a99be9a3116 + 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/templating - 843e80279c4bd0a2ea876c51a33e0a99be9a3116 + 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/templating - 843e80279c4bd0a2ea876c51a33e0a99be9a3116 + 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/sdk - 0b5950c55319a612008e44b152cde3aafb22aec6 + e9a5945b549b3e299dcbec79ea4db7b4b058b55d - + https://github.com/dotnet/sdk - 0b5950c55319a612008e44b152cde3aafb22aec6 + e9a5945b549b3e299dcbec79ea4db7b4b058b55d @@ -121,18 +121,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 73b51785eff89a72729043d26c229384377eaf13 + ed82f184d5b0ba600ea6f7b05b982adfde4ebb9c - + https://github.com/dotnet/fsharp - 73b51785eff89a72729043d26c229384377eaf13 + ed82f184d5b0ba600ea6f7b05b982adfde4ebb9c - + https://github.com/microsoft/vstest - 32d8acfdf9ae351c19d928ef8b2bd54a3f7d3925 + 8a3ae5cadd49c6a3d3e39214985390e2f5229b73 @@ -151,9 +151,9 @@ 1c045cf58dcb0d2f0474364550eeab37877257a1 - + https://github.com/nuget/nuget.client - 9c469e4dbfa8ba6085f0cd47d58207de90304a5a + 6f99a10b228b521bb5d2c7412bb2e3c43e6e7b3f diff --git a/eng/Versions.props b/eng/Versions.props index 606a3f77c217..c357e5cb97df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22309.5 + 6.0.400-preview.22320.4 @@ -56,8 +56,8 @@ - 6.0.400-preview.22316.3 - 6.0.400-preview.22316.3 + 6.0.400-preview.22321.4 + 6.0.400-preview.22321.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22309.5 + 6.0.400-preview.22320.4 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-preview-20220615-12 + 17.3.0-preview-20220620-08 From 37732f15bbb19757dad3813c02b209457ede579e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Jun 2022 17:55:22 +0000 Subject: [PATCH 0560/1244] Update dependencies from https://github.com/dotnet/sdk build 20220621.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22321.4 -> To Version 6.0.400-preview.22321.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 12.0.4-beta.22320.5 -> To Version 12.0.4-beta.22321.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bab982646f2..21835d96e7bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/sdk - e9a5945b549b3e299dcbec79ea4db7b4b058b55d + dd413a0f3f4f58df359bb11964f9c7a750868640 - + https://github.com/dotnet/sdk - e9a5945b549b3e299dcbec79ea4db7b4b058b55d + dd413a0f3f4f58df359bb11964f9c7a750868640 @@ -121,18 +121,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - ed82f184d5b0ba600ea6f7b05b982adfde4ebb9c + 12284149592c9b202cde02e65855b2304baac1ec - + https://github.com/dotnet/fsharp - ed82f184d5b0ba600ea6f7b05b982adfde4ebb9c + 12284149592c9b202cde02e65855b2304baac1ec - + https://github.com/microsoft/vstest - 8a3ae5cadd49c6a3d3e39214985390e2f5229b73 + 2af4de6ba420fe26272f5b3de4477e5a9a728daa diff --git a/eng/Versions.props b/eng/Versions.props index c357e5cb97df..3c538d980f5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22321.4 - 6.0.400-preview.22321.4 + 6.0.400-preview.22321.8 + 6.0.400-preview.22321.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-preview-20220620-08 + 17.3.0-preview-20220621-01 From 668680f1fefae5dc6f7efb275f53c5624a4e0a7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Jun 2022 19:14:50 +0000 Subject: [PATCH 0561/1244] Update dependencies from https://github.com/dotnet/sdk build 20220621.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22321.4 -> To Version 6.0.400-preview.22321.15 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.0.4-beta.22320.5 -> To Version 12.0.4-beta.22321.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 21835d96e7bd..9486f655ce26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/sdk - dd413a0f3f4f58df359bb11964f9c7a750868640 + 7bfccb63b0b391cf70d627454b25022b5f5dbf10 - + https://github.com/dotnet/sdk - dd413a0f3f4f58df359bb11964f9c7a750868640 + 7bfccb63b0b391cf70d627454b25022b5f5dbf10 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 6c191c842691f41808c758ce70bf57df2c2f42f4 + 8330dc11eb31d433b3bd4a16d8ac045716998d30 diff --git a/eng/Versions.props b/eng/Versions.props index 3c538d980f5a..b2880258c93a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22321.8 - 6.0.400-preview.22321.8 + 6.0.400-preview.22321.15 + 6.0.400-preview.22321.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 07faa7f82b64f642b39640058614460c160138e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Jun 2022 20:58:32 +0000 Subject: [PATCH 0562/1244] Update dependencies from https://github.com/dotnet/sdk build 20220621.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22321.4 -> To Version 6.0.400-preview.22321.19 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.0.4-beta.22320.5 -> To Version 12.0.4-beta.22321.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 9486f655ce26..9f7b407a486e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/sdk - 7bfccb63b0b391cf70d627454b25022b5f5dbf10 + fe63e97c7220bcaf1043c55e2e9a92dc704f4c15 - + https://github.com/dotnet/sdk - 7bfccb63b0b391cf70d627454b25022b5f5dbf10 + fe63e97c7220bcaf1043c55e2e9a92dc704f4c15 diff --git a/eng/Versions.props b/eng/Versions.props index b2880258c93a..e656a8ea41d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22321.15 - 6.0.400-preview.22321.15 + 6.0.400-preview.22321.19 + 6.0.400-preview.22321.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f7e5816c9417bf2698497f162e142ed360440b7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Jun 2022 04:03:25 +0000 Subject: [PATCH 0563/1244] Update dependencies from https://github.com/dotnet/sdk build 20220621.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22321.19 -> To Version 6.0.400-preview.22321.33 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-3.22320.19 -> To Version 4.3.0-3.22321.7 (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 9f7b407a486e..b279d79b4867 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/sdk - fe63e97c7220bcaf1043c55e2e9a92dc704f4c15 + 448dad55d0ffd7fd4b8e6c98a7bb138fd4f199c0 - + https://github.com/dotnet/sdk - fe63e97c7220bcaf1043c55e2e9a92dc704f4c15 + 448dad55d0ffd7fd4b8e6c98a7bb138fd4f199c0 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 8330dc11eb31d433b3bd4a16d8ac045716998d30 + 8e3d3fb66ee52dabcd52e800e0871d7daa23a228 diff --git a/eng/Versions.props b/eng/Versions.props index e656a8ea41d1..ce33a409bfe9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22321.19 - 6.0.400-preview.22321.19 + 6.0.400-preview.22321.33 + 6.0.400-preview.22321.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 47dcdfe275ff84546f5e0b9c13f4e25ebbff25ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Jun 2022 07:46:52 +0000 Subject: [PATCH 0564/1244] Update dependencies from https://github.com/dotnet/sdk build 20220621.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22321.33 -> To Version 6.0.400-preview.22321.39 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-3.22321.7 -> To Version 4.3.0-3.22321.8 (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 b279d79b4867..da7544fce4df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/sdk - 448dad55d0ffd7fd4b8e6c98a7bb138fd4f199c0 + f52ad717480084f4972c78672c82bab8063080e2 - + https://github.com/dotnet/sdk - 448dad55d0ffd7fd4b8e6c98a7bb138fd4f199c0 + f52ad717480084f4972c78672c82bab8063080e2 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 8e3d3fb66ee52dabcd52e800e0871d7daa23a228 + 3bd38ba691ad9776bd4f641a6b9fd46295010372 diff --git a/eng/Versions.props b/eng/Versions.props index ce33a409bfe9..544ec92ff3bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22321.33 - 6.0.400-preview.22321.33 + 6.0.400-preview.22321.39 + 6.0.400-preview.22321.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b67eace3caff4a3406b23c186d3556c247140e6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Jun 2022 09:36:53 +0000 Subject: [PATCH 0565/1244] Update dependencies from https://github.com/dotnet/sdk build 20220622.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22321.39 -> To Version 6.0.400-preview.22322.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22321.1 -> To Version 12.0.4-beta.22321.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 da7544fce4df..6c66d555289e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/sdk - f52ad717480084f4972c78672c82bab8063080e2 + dd3c7be0bbcdce0895921e9a1984b32482485c19 - + https://github.com/dotnet/sdk - f52ad717480084f4972c78672c82bab8063080e2 + dd3c7be0bbcdce0895921e9a1984b32482485c19 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 12284149592c9b202cde02e65855b2304baac1ec + 7116cb851d3e8ff3e39b601409febbfbbecce6ab - + https://github.com/dotnet/fsharp - 12284149592c9b202cde02e65855b2304baac1ec + 7116cb851d3e8ff3e39b601409febbfbbecce6ab diff --git a/eng/Versions.props b/eng/Versions.props index 544ec92ff3bb..3baf0a8a6ce2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22321.39 - 6.0.400-preview.22321.39 + 6.0.400-preview.22322.1 + 6.0.400-preview.22322.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ca9e6f05bc61bb27f9e956d59dbc20c386b2a99c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 16:11:19 -0700 Subject: [PATCH 0566/1244] [release/6.0.4xx] Update dependencies from dotnet/sdk (#14015) * Update dependencies from https://github.com/dotnet/sdk build 20220622.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22322.1 -> To Version 6.0.400-preview.22322.7 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.3.0-preview-20220621-01 -> To Version 17.3.0-preview-20220622-04 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220622.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22322.1 -> To Version 6.0.400-preview.22322.11 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.3.0-preview-20220621-01 -> To Version 17.3.0-preview-20220622-04 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220622.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22322.1 -> To Version 6.0.400-preview.22322.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 12.0.4-beta.22321.5 -> To Version 12.0.4-beta.22322.1 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- 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 6c66d555289e..9e8ea9224dca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/sdk - dd3c7be0bbcdce0895921e9a1984b32482485c19 + 896beee9ab1e659f760a4fe081b0d28362dc4b18 - + https://github.com/dotnet/sdk - dd3c7be0bbcdce0895921e9a1984b32482485c19 + 896beee9ab1e659f760a4fe081b0d28362dc4b18 @@ -121,18 +121,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 7116cb851d3e8ff3e39b601409febbfbbecce6ab + 33c02fc761a44cb00f941da5ac32e3f41ea6bedd - + https://github.com/dotnet/fsharp - 7116cb851d3e8ff3e39b601409febbfbbecce6ab + 33c02fc761a44cb00f941da5ac32e3f41ea6bedd - + https://github.com/microsoft/vstest - 2af4de6ba420fe26272f5b3de4477e5a9a728daa + 2d93ce7659d83bfe85dc31a2adb48256c51098cd @@ -146,9 +146,9 @@ 3bd38ba691ad9776bd4f641a6b9fd46295010372 - + https://github.com/dotnet/msbuild - 1c045cf58dcb0d2f0474364550eeab37877257a1 + e504ba9f4f1ac7a8d86a4962ef4f6923f8d7815f diff --git a/eng/Versions.props b/eng/Versions.props index 3baf0a8a6ce2..fddd14c2058d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22322.1 - 6.0.400-preview.22322.1 + 6.0.400-preview.22322.13 + 6.0.400-preview.22322.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-preview-20220621-01 + 17.3.0-preview-20220622-04 From a5e9769d830d6f106b66559fd4a02cce1ec957da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Jun 2022 23:40:33 +0000 Subject: [PATCH 0567/1244] Update dependencies from https://github.com/dotnet/sdk build 20220622.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22322.13 -> To Version 6.0.400-preview.22322.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 9e8ea9224dca..7fb53c4eafdd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/sdk - 896beee9ab1e659f760a4fe081b0d28362dc4b18 + 3b9f8f768d79227a9798a535179611fe37898e18 - + https://github.com/dotnet/sdk - 896beee9ab1e659f760a4fe081b0d28362dc4b18 + 3b9f8f768d79227a9798a535179611fe37898e18 diff --git a/eng/Versions.props b/eng/Versions.props index fddd14c2058d..26fff36f47d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22322.13 - 6.0.400-preview.22322.13 + 6.0.400-preview.22322.22 + 6.0.400-preview.22322.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e0cc63f11d71fe285544b127908b700da399f6aa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Jun 2022 23:43:34 +0000 Subject: [PATCH 0568/1244] 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 6040289775da..ec5638937bb2 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 98b29c6b8105..14557e9a4da3 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 81b56d1ba255..58f372aff572 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 3159eccbc194346cf2af594183151ecff82166bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Jun 2022 05:35:59 +0000 Subject: [PATCH 0569/1244] Update dependencies from https://github.com/dotnet/sdk build 20220622.35 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22322.22 -> To Version 6.0.400-preview.22322.35 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.0.4-beta.22322.1 -> To Version 12.0.4-beta.22322.6 (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 7fb53c4eafdd..fe8211817210 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/sdk - 3b9f8f768d79227a9798a535179611fe37898e18 + aad9d44bd4bd4aad838b5e4ee17de7d07c177a32 - + https://github.com/dotnet/sdk - 3b9f8f768d79227a9798a535179611fe37898e18 + aad9d44bd4bd4aad838b5e4ee17de7d07c177a32 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 33c02fc761a44cb00f941da5ac32e3f41ea6bedd + 09bf981828093ca2fbc6ba319420733d030debbc - + https://github.com/dotnet/fsharp - 33c02fc761a44cb00f941da5ac32e3f41ea6bedd + 09bf981828093ca2fbc6ba319420733d030debbc @@ -146,9 +146,9 @@ 3bd38ba691ad9776bd4f641a6b9fd46295010372 - + https://github.com/dotnet/msbuild - e504ba9f4f1ac7a8d86a4962ef4f6923f8d7815f + 334835f647360028b75d827347fd73ec5433a481 diff --git a/eng/Versions.props b/eng/Versions.props index 26fff36f47d6..5d6932ea7caa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22322.22 - 6.0.400-preview.22322.22 + 6.0.400-preview.22322.35 + 6.0.400-preview.22322.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 738fe72821a0aa019b2d0ce40dd7cae80b0745a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Jun 2022 07:45:28 +0000 Subject: [PATCH 0570/1244] Update dependencies from https://github.com/dotnet/sdk build 20220622.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22322.35 -> To Version 6.0.400-preview.22322.39 --- 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 fe8211817210..7716b4add8db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/sdk - aad9d44bd4bd4aad838b5e4ee17de7d07c177a32 + d248ccd367f5d71db91dfdd08266b944d3b71e0b - + https://github.com/dotnet/sdk - aad9d44bd4bd4aad838b5e4ee17de7d07c177a32 + d248ccd367f5d71db91dfdd08266b944d3b71e0b diff --git a/eng/Versions.props b/eng/Versions.props index 5d6932ea7caa..a46ae11d6e66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22322.35 - 6.0.400-preview.22322.35 + 6.0.400-preview.22322.39 + 6.0.400-preview.22322.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7bb9e6c7c5302933f96b75811e585e616220ba11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Jun 2022 10:33:02 +0000 Subject: [PATCH 0571/1244] Update dependencies from https://github.com/dotnet/sdk build 20220623.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22322.39 -> To Version 6.0.400-preview.22323.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22322.6 -> To Version 12.0.4-beta.22322.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 7716b4add8db..3079498929de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4ffcc8a85649b22d710db1b5342cc2fd358431dc - + https://github.com/dotnet/sdk - d248ccd367f5d71db91dfdd08266b944d3b71e0b + fc8e5cc04f45b9b02f3bea7fab4953392430963b - + https://github.com/dotnet/sdk - d248ccd367f5d71db91dfdd08266b944d3b71e0b + fc8e5cc04f45b9b02f3bea7fab4953392430963b @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 09bf981828093ca2fbc6ba319420733d030debbc + 3bffbd6ecbea0a41343d9c5fe68a750aa22fcca0 - + https://github.com/dotnet/fsharp - 09bf981828093ca2fbc6ba319420733d030debbc + 3bffbd6ecbea0a41343d9c5fe68a750aa22fcca0 diff --git a/eng/Versions.props b/eng/Versions.props index a46ae11d6e66..507ad35c6b30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22322.39 - 6.0.400-preview.22322.39 + 6.0.400-preview.22323.1 + 6.0.400-preview.22323.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3ffbd85ba1e7f434ace89be6897634936b956b07 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Thu, 23 Jun 2022 14:30:11 +0000 Subject: [PATCH 0572/1244] 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 5e2360ec7616..679bfbbbeb2b 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 0fa032d6cbac..000000000000 --- 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 de5ee2122728..000000000000 --- 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 0573/1244] 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 ec5638937bb2..88f3011d302a 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 14557e9a4da3..fd65edc0a2c4 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 58f372aff572..a8c1e49a643d 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 eb8f2f182f12ab51613d031da95c5cb888b43984 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Jun 2022 18:32:07 +0000 Subject: [PATCH 0574/1244] Update dependencies from https://github.com/dotnet/sdk build 20220623.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22323.1 -> To Version 6.0.400-preview.22323.8 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.400-preview.22320.4 -> To Version 6.0.400-preview.22323.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 3079498929de..400737ec2a48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 4ffcc8a85649b22d710db1b5342cc2fd358431dc + f12ae931a9ecc54ae5ae8ddb5b27dd356dd373d7 - + https://github.com/dotnet/templating - 4ffcc8a85649b22d710db1b5342cc2fd358431dc + f12ae931a9ecc54ae5ae8ddb5b27dd356dd373d7 - + https://github.com/dotnet/templating - 4ffcc8a85649b22d710db1b5342cc2fd358431dc + f12ae931a9ecc54ae5ae8ddb5b27dd356dd373d7 - + https://github.com/dotnet/sdk - fc8e5cc04f45b9b02f3bea7fab4953392430963b + 3bdf81df91c0703a9ae1892b0e46e7c6e0e669e0 - + https://github.com/dotnet/sdk - fc8e5cc04f45b9b02f3bea7fab4953392430963b + 3bdf81df91c0703a9ae1892b0e46e7c6e0e669e0 diff --git a/eng/Versions.props b/eng/Versions.props index 507ad35c6b30..86927edab9ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22320.4 + 6.0.400-preview.22323.1 @@ -56,8 +56,8 @@ - 6.0.400-preview.22323.1 - 6.0.400-preview.22323.1 + 6.0.400-preview.22323.8 + 6.0.400-preview.22323.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22320.4 + 6.0.400-preview.22323.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 18f002dda7d3751dc06c9091a7129a6e4ae80aa7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Jun 2022 19:44:03 +0000 Subject: [PATCH 0575/1244] 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 88f3011d302a..4f5d253888ad 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 fd65edc0a2c4..229d3fa85a3b 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 a8c1e49a643d..54076f4ddfdf 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 9f9e52f48db24125cdcea5196aa506ff59fa5705 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Jun 2022 03:28:20 +0000 Subject: [PATCH 0576/1244] Update dependencies from https://github.com/dotnet/sdk build 20220623.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22323.8 -> To Version 6.0.400-preview.22323.19 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 12.0.4-beta.22322.8 -> To Version 12.0.4-beta.22323.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 400737ec2a48..b9b5af755ebd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f12ae931a9ecc54ae5ae8ddb5b27dd356dd373d7 - + https://github.com/dotnet/sdk - 3bdf81df91c0703a9ae1892b0e46e7c6e0e669e0 + 37fa7cafb22211dcf5cf87b91e67fe636839ab32 - + https://github.com/dotnet/sdk - 3bdf81df91c0703a9ae1892b0e46e7c6e0e669e0 + 37fa7cafb22211dcf5cf87b91e67fe636839ab32 @@ -121,18 +121,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 3bffbd6ecbea0a41343d9c5fe68a750aa22fcca0 + 9ea0906370cb4f99d16e87cdb105214673f69af1 - + https://github.com/dotnet/fsharp - 3bffbd6ecbea0a41343d9c5fe68a750aa22fcca0 + 9ea0906370cb4f99d16e87cdb105214673f69af1 - + https://github.com/microsoft/vstest - 2d93ce7659d83bfe85dc31a2adb48256c51098cd + e46ca8a834fdfd2bf8018c17b01e3d08e46c63c7 diff --git a/eng/Versions.props b/eng/Versions.props index 86927edab9ba..60c116ed1a65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22323.8 - 6.0.400-preview.22323.8 + 6.0.400-preview.22323.19 + 6.0.400-preview.22323.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-preview-20220622-04 + 17.3.0-preview-20220623-05 From ee0a053da3d4afcf6b71588900270317ca23d6af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Jun 2022 07:08:24 +0000 Subject: [PATCH 0577/1244] Update dependencies from https://github.com/dotnet/sdk build 20220623.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22323.19 -> To Version 6.0.400-preview.22323.22 Dependency coherency updates Microsoft.Build From Version 17.3.0-preview-22322-07 -> To Version 17.3.0-preview-22323-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 b9b5af755ebd..58127fc2a54e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating f12ae931a9ecc54ae5ae8ddb5b27dd356dd373d7 - + https://github.com/dotnet/sdk - 37fa7cafb22211dcf5cf87b91e67fe636839ab32 + 7cf3917d42e72ddcb98c412c7e6fb7c81dc1e559 - + https://github.com/dotnet/sdk - 37fa7cafb22211dcf5cf87b91e67fe636839ab32 + 7cf3917d42e72ddcb98c412c7e6fb7c81dc1e559 @@ -146,9 +146,9 @@ 3bd38ba691ad9776bd4f641a6b9fd46295010372 - + https://github.com/dotnet/msbuild - 334835f647360028b75d827347fd73ec5433a481 + b99b39a350392d9d4a438b5251cc2b06d708db5a diff --git a/eng/Versions.props b/eng/Versions.props index 60c116ed1a65..643b2a429caf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22323.19 - 6.0.400-preview.22323.19 + 6.0.400-preview.22323.22 + 6.0.400-preview.22323.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 28222ae76c6eea3d565bb4b5c46810431bacac91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Jun 2022 10:29:58 -0700 Subject: [PATCH 0578/1244] Update dependencies from https://github.com/dotnet/sdk build 20220624.3 (#14035) Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22323.22 -> To Version 6.0.400-preview.22324.3 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.400-preview.22323.1 -> To Version 6.0.400-preview.22323.12 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- 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 58127fc2a54e..6bc700bc925b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - f12ae931a9ecc54ae5ae8ddb5b27dd356dd373d7 + 02dbfd356969e3f5f719d033319cfa839d09666c - + https://github.com/dotnet/templating - f12ae931a9ecc54ae5ae8ddb5b27dd356dd373d7 + 02dbfd356969e3f5f719d033319cfa839d09666c - + https://github.com/dotnet/templating - f12ae931a9ecc54ae5ae8ddb5b27dd356dd373d7 + 02dbfd356969e3f5f719d033319cfa839d09666c - + https://github.com/dotnet/sdk - 7cf3917d42e72ddcb98c412c7e6fb7c81dc1e559 + 6d70a313d0abdce25dca6261acdcd42be3b64920 - + https://github.com/dotnet/sdk - 7cf3917d42e72ddcb98c412c7e6fb7c81dc1e559 + 6d70a313d0abdce25dca6261acdcd42be3b64920 diff --git a/eng/Versions.props b/eng/Versions.props index 643b2a429caf..3262661cbe8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22323.1 + 6.0.400-preview.22323.12 @@ -56,8 +56,8 @@ - 6.0.400-preview.22323.22 - 6.0.400-preview.22323.22 + 6.0.400-preview.22324.3 + 6.0.400-preview.22324.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22323.1 + 6.0.400-preview.22323.12 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 23778067030ab2619957c73e5abab6870dc55f8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Jun 2022 18:07:45 +0000 Subject: [PATCH 0579/1244] Update dependencies from https://github.com/dotnet/sdk build 20220624.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22324.3 -> To Version 6.0.400-preview.22324.7 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.3.0-preview-20220623-05 -> To Version 17.3.0-preview-20220624-03 (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 6bc700bc925b..1e87eb68019e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 02dbfd356969e3f5f719d033319cfa839d09666c - + https://github.com/dotnet/sdk - 6d70a313d0abdce25dca6261acdcd42be3b64920 + a546725e4b4e9a06b9b7e07ec62882613bf740b2 - + https://github.com/dotnet/sdk - 6d70a313d0abdce25dca6261acdcd42be3b64920 + a546725e4b4e9a06b9b7e07ec62882613bf740b2 @@ -130,9 +130,9 @@ 9ea0906370cb4f99d16e87cdb105214673f69af1 - + https://github.com/microsoft/vstest - e46ca8a834fdfd2bf8018c17b01e3d08e46c63c7 + 5b3bb9c3d27938ecd9a86160c233aebaaf7a71bd diff --git a/eng/Versions.props b/eng/Versions.props index 3262661cbe8b..3772797126aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22324.3 - 6.0.400-preview.22324.3 + 6.0.400-preview.22324.7 + 6.0.400-preview.22324.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-preview-20220623-05 + 17.3.0-preview-20220624-03 From 30138ca5c1976b44cda129489d3131f043e3a2be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Jun 2022 08:27:45 +0000 Subject: [PATCH 0580/1244] Update dependencies from https://github.com/dotnet/sdk build 20220627.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22324.7 -> To Version 6.0.400-preview.22327.1 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.4-beta.22323.4 -> To Version 12.0.4-beta.22324.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 6 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e87eb68019e..719110ce0a74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 02dbfd356969e3f5f719d033319cfa839d09666c - + https://github.com/dotnet/sdk - a546725e4b4e9a06b9b7e07ec62882613bf740b2 + b959783e20f1a06f72944df097a17a81d132d74e - + https://github.com/dotnet/sdk - a546725e4b4e9a06b9b7e07ec62882613bf740b2 + b959783e20f1a06f72944df097a17a81d132d74e @@ -121,18 +121,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 9ea0906370cb4f99d16e87cdb105214673f69af1 + 18e9ef16a372c2f3d348561abd3fd5722b3ed3bf - + https://github.com/dotnet/fsharp - 9ea0906370cb4f99d16e87cdb105214673f69af1 + 18e9ef16a372c2f3d348561abd3fd5722b3ed3bf - + https://github.com/microsoft/vstest - 5b3bb9c3d27938ecd9a86160c233aebaaf7a71bd + ac884f5ae063c89171328b3da03c4f4f65774352 @@ -141,19 +141,19 @@ linker - + https://github.com/dotnet/roslyn - 3bd38ba691ad9776bd4f641a6b9fd46295010372 + 0bbbbeb4e226c47cc17e8ea28078058cae5866e9 - + https://github.com/dotnet/msbuild - b99b39a350392d9d4a438b5251cc2b06d708db5a + cd5f87420c9170af906f64075b45b44a038ba0d5 - + https://github.com/nuget/nuget.client - 6f99a10b228b521bb5d2c7412bb2e3c43e6e7b3f + 84e277cd819a84e85e1893c2596a68dd55e6f252 diff --git a/eng/Versions.props b/eng/Versions.props index 3772797126aa..c223564cdde8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22324.7 - 6.0.400-preview.22324.7 + 6.0.400-preview.22327.1 + 6.0.400-preview.22327.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-preview-20220624-03 + 17.3.0-preview-20220626-01 From 4d6e71ec99b74f5c665785609c8c9faa0b443db1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Jun 2022 23:39:00 +0000 Subject: [PATCH 0581/1244] Update dependencies from https://github.com/dotnet/sdk build 20220627.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22327.1 -> To Version 6.0.400-preview.22327.13 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.400-preview.22323.12 -> To Version 6.0.400-preview.22327.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 719110ce0a74..4ec235864658 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 02dbfd356969e3f5f719d033319cfa839d09666c + 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/templating - 02dbfd356969e3f5f719d033319cfa839d09666c + 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/templating - 02dbfd356969e3f5f719d033319cfa839d09666c + 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - b959783e20f1a06f72944df097a17a81d132d74e + 09dd391ddf79859b188ce8b433bdbefa8472bbef - + https://github.com/dotnet/sdk - b959783e20f1a06f72944df097a17a81d132d74e + 09dd391ddf79859b188ce8b433bdbefa8472bbef diff --git a/eng/Versions.props b/eng/Versions.props index c223564cdde8..59d80ed7b0d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22323.12 + 6.0.400-preview.22327.5 @@ -56,8 +56,8 @@ - 6.0.400-preview.22327.1 - 6.0.400-preview.22327.1 + 6.0.400-preview.22327.13 + 6.0.400-preview.22327.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22323.12 + 6.0.400-preview.22327.5 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 3374bfbdea0d5ebebb6a13055b07ed95be053337 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jun 2022 03:12:13 +0000 Subject: [PATCH 0582/1244] Update dependencies from https://github.com/dotnet/sdk build 20220627.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22327.13 -> To Version 6.0.400-preview.22327.17 Dependency coherency updates Microsoft.Build From Version 17.3.0-preview-22324-06 -> To Version 17.3.0-preview-22327-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 4ec235864658..483fd51fb301 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - 09dd391ddf79859b188ce8b433bdbefa8472bbef + b64f590452c9cb75b8823e3df43a76843e18aeb5 - + https://github.com/dotnet/sdk - 09dd391ddf79859b188ce8b433bdbefa8472bbef + b64f590452c9cb75b8823e3df43a76843e18aeb5 @@ -146,9 +146,9 @@ 0bbbbeb4e226c47cc17e8ea28078058cae5866e9 - + https://github.com/dotnet/msbuild - cd5f87420c9170af906f64075b45b44a038ba0d5 + 6a7e83780393726140b011e5234a89db85118b44 diff --git a/eng/Versions.props b/eng/Versions.props index 59d80ed7b0d5..d7d5354dc3ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22327.13 - 6.0.400-preview.22327.13 + 6.0.400-preview.22327.17 + 6.0.400-preview.22327.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9bc12c076970c858bf3215659caf27ddc50a0519 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jun 2022 07:16:19 +0000 Subject: [PATCH 0583/1244] Update dependencies from https://github.com/dotnet/sdk build 20220627.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22327.17 -> To Version 6.0.400-preview.22327.22 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.3.0-preview-20220626-01 -> To Version 17.3.0-release-20220627-03 (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 483fd51fb301..0c2f1e561061 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - b64f590452c9cb75b8823e3df43a76843e18aeb5 + aa1df5a2efd53db85fe91294cc443d08ba3a9895 - + https://github.com/dotnet/sdk - b64f590452c9cb75b8823e3df43a76843e18aeb5 + aa1df5a2efd53db85fe91294cc443d08ba3a9895 @@ -130,9 +130,9 @@ 18e9ef16a372c2f3d348561abd3fd5722b3ed3bf - + https://github.com/microsoft/vstest - ac884f5ae063c89171328b3da03c4f4f65774352 + 4fbb74fc9fdb39d278ee0886f5310dbdc1efd88c diff --git a/eng/Versions.props b/eng/Versions.props index d7d5354dc3ff..d85328d0d12f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22327.17 - 6.0.400-preview.22327.17 + 6.0.400-preview.22327.22 + 6.0.400-preview.22327.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-preview-20220626-01 + 17.3.0-release-20220627-03 From f917ff4248bdeeccb5942fe00539e5c211ce2541 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jun 2022 08:25:44 +0000 Subject: [PATCH 0584/1244] Update dependencies from https://github.com/dotnet/sdk build 20220628.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22327.17 -> To Version 6.0.400-preview.22328.1 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 17.3.0-preview-20220626-01 -> To Version 17.3.0-release-20220627-03 (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 0c2f1e561061..353fa4c0f7b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - aa1df5a2efd53db85fe91294cc443d08ba3a9895 + 725f6c926b9aefd0514c1dbbfe794bc2b634688d - + https://github.com/dotnet/sdk - aa1df5a2efd53db85fe91294cc443d08ba3a9895 + 725f6c926b9aefd0514c1dbbfe794bc2b634688d @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 0bbbbeb4e226c47cc17e8ea28078058cae5866e9 + 38d619cec31cf7c4c35ea2ecd5a1ab6605e0d651 diff --git a/eng/Versions.props b/eng/Versions.props index d85328d0d12f..75220734bbd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22327.22 - 6.0.400-preview.22327.22 + 6.0.400-preview.22328.1 + 6.0.400-preview.22328.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 36a20d67f9bd15f302573fae79524718d8e37f38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jun 2022 10:09:37 +0000 Subject: [PATCH 0585/1244] Update dependencies from https://github.com/dotnet/sdk build 20220628.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22328.1 -> To Version 6.0.400-preview.22328.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.0.4-beta.22324.5 -> To Version 12.0.4-beta.22327.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 353fa4c0f7b6..6a2cb790d427 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - 725f6c926b9aefd0514c1dbbfe794bc2b634688d + 6c8f41324a7bcb3085933cd99b295fbfffd32000 - + https://github.com/dotnet/sdk - 725f6c926b9aefd0514c1dbbfe794bc2b634688d + 6c8f41324a7bcb3085933cd99b295fbfffd32000 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp - 18e9ef16a372c2f3d348561abd3fd5722b3ed3bf + ddc90b20287a765a9d526da42b3be0dd8e907ec5 - + https://github.com/dotnet/fsharp - 18e9ef16a372c2f3d348561abd3fd5722b3ed3bf + ddc90b20287a765a9d526da42b3be0dd8e907ec5 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 38d619cec31cf7c4c35ea2ecd5a1ab6605e0d651 + 8bbf4994aa08f919f3ff4dc5440c666b6ccc7566 diff --git a/eng/Versions.props b/eng/Versions.props index 75220734bbd4..d7eb93f31621 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22328.1 - 6.0.400-preview.22328.1 + 6.0.400-preview.22328.3 + 6.0.400-preview.22328.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a489e7a223c49a8af1edd14b5973fc7588e17f68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jun 2022 18:36:18 +0000 Subject: [PATCH 0586/1244] Update dependencies from https://github.com/dotnet/sdk build 20220628.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22328.1 -> To Version 6.0.400-preview.22328.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.0.4-beta.22324.5 -> To Version 12.0.4-beta.22327.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 6a2cb790d427..b360ed7fce8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - 6c8f41324a7bcb3085933cd99b295fbfffd32000 + 77926d939371990e1cfb1d2545303849a6c62fff - + https://github.com/dotnet/sdk - 6c8f41324a7bcb3085933cd99b295fbfffd32000 + 77926d939371990e1cfb1d2545303849a6c62fff @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 8bbf4994aa08f919f3ff4dc5440c666b6ccc7566 + 52399a48b7e1fdef32dd2b381f7158f661a231e1 diff --git a/eng/Versions.props b/eng/Versions.props index d7eb93f31621..9f2dda7d1678 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22328.3 - 6.0.400-preview.22328.3 + 6.0.400-preview.22328.11 + 6.0.400-preview.22328.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a37a7a7d064815641a17f87a80a371cc566a8fdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 09:23:11 +0000 Subject: [PATCH 0587/1244] [release/6.0.4xx] Update dependencies from dotnet/sdk (#14052) [release/6.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.3.0-3.22328.1 to 4.3.0-3.22328.29 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.3.0-preview-22327-02 to 17.3.0-preview-22328-04 (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 b360ed7fce8f..c8edeb2c2e43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - 77926d939371990e1cfb1d2545303849a6c62fff + ff88f3c9b5994c1f64ec30078181f10a6f1eb4e0 - + https://github.com/dotnet/sdk - 77926d939371990e1cfb1d2545303849a6c62fff + ff88f3c9b5994c1f64ec30078181f10a6f1eb4e0 @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - 52399a48b7e1fdef32dd2b381f7158f661a231e1 + 99e426c27410fd6f3ae098ae87f94b3f5e80e78a - + https://github.com/dotnet/msbuild - 6a7e83780393726140b011e5234a89db85118b44 + 9d9417646aa0be63a560711924bb1227dcd9b4ac diff --git a/eng/Versions.props b/eng/Versions.props index 9f2dda7d1678..93575accd55a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22328.11 - 6.0.400-preview.22328.11 + 6.0.400-preview.22329.2 + 6.0.400-preview.22329.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8c5b725f5fcfa506a6d59aeafb0391570495823e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 29 Jun 2022 13:00:55 -0700 Subject: [PATCH 0588/1244] 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 840a2133bd49..dddadab15430 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,7 +26,7 @@ 30 - $([MSBuild]::Add($(VersionFeature), 25)) + $([MSBuild]::Add($(VersionFeature), 26)) 17 From ee4f22993df160397ae0d6c80880892a6ba6bc6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Jun 2022 20:28:59 +0000 Subject: [PATCH 0589/1244] Update dependencies from https://github.com/dotnet/sdk build 20220629.10 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22329.2 -> To Version 6.0.400-preview.22329.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 c8edeb2c2e43..adfd4d19470c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - ff88f3c9b5994c1f64ec30078181f10a6f1eb4e0 + 0bf15045330de9d7b347c7ebdbd25921516c2e75 - + https://github.com/dotnet/sdk - ff88f3c9b5994c1f64ec30078181f10a6f1eb4e0 + 0bf15045330de9d7b347c7ebdbd25921516c2e75 diff --git a/eng/Versions.props b/eng/Versions.props index 93575accd55a..d3bf047cd229 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22329.2 - 6.0.400-preview.22329.2 + 6.0.400-preview.22329.10 + 6.0.400-preview.22329.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8b99513f18a7f3aa5cf02388a27f56f9292dfdcc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Jun 2022 21:42:06 +0000 Subject: [PATCH 0590/1244] Update dependencies from https://github.com/dotnet/sdk build 20220629.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22329.10 -> To Version 6.0.400-preview.22329.12 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.3.0-3.22328.29 -> To Version 4.3.0-3.22329.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 adfd4d19470c..b6229d2a6c68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - 0bf15045330de9d7b347c7ebdbd25921516c2e75 + c4383e6db7e5737ab383ada8c77a6af67950a908 - + https://github.com/dotnet/sdk - 0bf15045330de9d7b347c7ebdbd25921516c2e75 + c4383e6db7e5737ab383ada8c77a6af67950a908 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 99e426c27410fd6f3ae098ae87f94b3f5e80e78a + d629a38daea1a8bf0738f4c36ecb058c882d03a9 @@ -151,9 +151,9 @@ 9d9417646aa0be63a560711924bb1227dcd9b4ac - + https://github.com/nuget/nuget.client - 84e277cd819a84e85e1893c2596a68dd55e6f252 + 3dd86e0c670862f76351c87ca7dc3454d0faf8d6 diff --git a/eng/Versions.props b/eng/Versions.props index d3bf047cd229..0485cac3a313 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22329.10 - 6.0.400-preview.22329.10 + 6.0.400-preview.22329.12 + 6.0.400-preview.22329.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f620353e49908381f0559863bc4738f9f910b5a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Jun 2022 23:01:29 +0000 Subject: [PATCH 0591/1244] Update dependencies from https://github.com/dotnet/sdk build 20220629.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22329.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.5 -> To Version 6.0.6 (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 b6229d2a6c68..4d99a1967fd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad940638f459efe0d17d60ccf52454a32ea7e561 + 7d10adc397690db6f5c73da866aa443232ff1c88 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad940638f459efe0d17d60ccf52454a32ea7e561 + 7d10adc397690db6f5c73da866aa443232ff1c88 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad940638f459efe0d17d60ccf52454a32ea7e561 + 7d10adc397690db6f5c73da866aa443232ff1c88 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad940638f459efe0d17d60ccf52454a32ea7e561 + 7d10adc397690db6f5c73da866aa443232ff1c88 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 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 - e5f183b656a0e8bc087108130a5a9b54ae94494e + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - c4383e6db7e5737ab383ada8c77a6af67950a908 + e34821504abbcf97a83f87e3de013a465af87618 - + https://github.com/dotnet/sdk - c4383e6db7e5737ab383ada8c77a6af67950a908 + e34821504abbcf97a83f87e3de013a465af87618 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee + 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b + dabcf2041548f7594b21e9bf865463abdfd14307 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0485cac3a313..227212b76994 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.4-servicing.22164.7 + 6.0.6-servicing.22267.5 - 6.0.5-servicing.22215.9 + 6.0.6-servicing.22268.4 @@ -44,44 +44,44 @@ - 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.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.400-preview.22329.12 - 6.0.400-preview.22329.12 + 6.0.400-preview.22329.14 + 6.0.400-preview.22329.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.3 + 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 + 6.0.6-servicing.22267.7 + 6.0.6-servicing.22267.7 + 6.0.6 + 6.0.6 + 6.0.6 + 6.0.6 2.1.0 - 6.0.5-servicing.22215.11 - 6.0.5-servicing.22215.11 - 6.0.5 - 6.0.5 + 6.0.6-servicing.22268.6 + 6.0.6-servicing.22268.6 + 6.0.6 + 6.0.6 From 090e994bebe333f49cbb644d32765571e3504454 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jun 2022 00:09:48 +0000 Subject: [PATCH 0592/1244] Update dependencies from https://github.com/dotnet/sdk build 20220629.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22329.16 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 From Version 6.0.5 -> To Version 6.0.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 4d99a1967fd8..e0834752bba8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - e34821504abbcf97a83f87e3de013a465af87618 + 6501764c897319566e7d4c69635084be72f9f094 - + https://github.com/dotnet/sdk - e34821504abbcf97a83f87e3de013a465af87618 + 6501764c897319566e7d4c69635084be72f9f094 @@ -146,9 +146,9 @@ d629a38daea1a8bf0738f4c36ecb058c882d03a9 - + https://github.com/dotnet/msbuild - 9d9417646aa0be63a560711924bb1227dcd9b4ac + 77c72dd0f1758e994cf2ebd2ddd6d1ada695d261 diff --git a/eng/Versions.props b/eng/Versions.props index 227212b76994..138c06205ac2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22329.14 - 6.0.400-preview.22329.14 + 6.0.400-preview.22329.16 + 6.0.400-preview.22329.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 56fc94fa806133ec1a610b93a947482e5d6b1b60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jun 2022 01:23:42 +0000 Subject: [PATCH 0593/1244] Update dependencies from https://github.com/dotnet/sdk build 20220629.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22329.17 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 From Version 6.0.5 -> To Version 6.0.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 e0834752bba8..c55eabe47a64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - 6501764c897319566e7d4c69635084be72f9f094 + c22914c9212fac587a8ae1179463021a59a94e61 - + https://github.com/dotnet/sdk - 6501764c897319566e7d4c69635084be72f9f094 + c22914c9212fac587a8ae1179463021a59a94e61 diff --git a/eng/Versions.props b/eng/Versions.props index 138c06205ac2..9e1265f82447 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22329.16 - 6.0.400-preview.22329.16 + 6.0.400-preview.22329.17 + 6.0.400-preview.22329.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0ef95c17968ba1f069dad1dddb7cad1cf1708e45 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jun 2022 03:10:57 +0000 Subject: [PATCH 0594/1244] Update dependencies from https://github.com/dotnet/sdk build 20220629.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22329.22 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.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.5 -> To Version 6.0.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 c55eabe47a64..c7674116ad4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - c22914c9212fac587a8ae1179463021a59a94e61 + 61cddd178f795dce1c025f3a066d14c205aeca6c - + https://github.com/dotnet/sdk - c22914c9212fac587a8ae1179463021a59a94e61 + 61cddd178f795dce1c025f3a066d14c205aeca6c @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - d629a38daea1a8bf0738f4c36ecb058c882d03a9 + 1841c97e14a2a3f683564f4c0cee9a4e65d82be9 diff --git a/eng/Versions.props b/eng/Versions.props index 9e1265f82447..9befda92fdf8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22329.17 - 6.0.400-preview.22329.17 + 6.0.400-preview.22329.22 + 6.0.400-preview.22329.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5bed471c0f6d44c3bab8bd7bbad0bcafb2b8ccf0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jun 2022 07:02:40 +0000 Subject: [PATCH 0595/1244] Update dependencies from https://github.com/dotnet/sdk build 20220629.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22329.27 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.5 -> To Version 6.0.6 (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 c7674116ad4a..f3976e286388 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - 61cddd178f795dce1c025f3a066d14c205aeca6c + 789a5dc7b6c308d0f6682f718c45fb41cd08635c - + https://github.com/dotnet/sdk - 61cddd178f795dce1c025f3a066d14c205aeca6c + 789a5dc7b6c308d0f6682f718c45fb41cd08635c @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf dabcf2041548f7594b21e9bf865463abdfd14307 - + https://github.com/dotnet/fsharp - ddc90b20287a765a9d526da42b3be0dd8e907ec5 + 4dce55c3e6615594134d829d0b5c6b275707ca33 - + https://github.com/dotnet/fsharp - ddc90b20287a765a9d526da42b3be0dd8e907ec5 + 4dce55c3e6615594134d829d0b5c6b275707ca33 diff --git a/eng/Versions.props b/eng/Versions.props index 9befda92fdf8..4ca8334f8d88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22329.22 - 6.0.400-preview.22329.22 + 6.0.400-preview.22329.27 + 6.0.400-preview.22329.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 346856fb66af1e28f467b4bfba96e1a5df0ff181 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jun 2022 08:29:24 +0000 Subject: [PATCH 0596/1244] Update dependencies from https://github.com/dotnet/sdk build 20220630.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22330.2 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.5 -> To Version 6.0.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 f3976e286388..4e44a45c6b67 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - 789a5dc7b6c308d0f6682f718c45fb41cd08635c + 0b4ee38b0ea59a03763ca13b9eb5132540dd86da - + https://github.com/dotnet/sdk - 789a5dc7b6c308d0f6682f718c45fb41cd08635c + 0b4ee38b0ea59a03763ca13b9eb5132540dd86da @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 1841c97e14a2a3f683564f4c0cee9a4e65d82be9 + 79fa7a4e69d91637816d234c554618ccc29d1887 diff --git a/eng/Versions.props b/eng/Versions.props index 4ca8334f8d88..28bd36fb51ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22329.27 - 6.0.400-preview.22329.27 + 6.0.400-preview.22330.2 + 6.0.400-preview.22330.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c6a8b2fa24fdbe52858cb112865c53a4f41b5fb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jun 2022 11:44:31 +0000 Subject: [PATCH 0597/1244] Update dependencies from https://github.com/dotnet/sdk build 20220630.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22330.4 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.5 -> To Version 6.0.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 4e44a45c6b67..36c1cc0e3fc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - 0b4ee38b0ea59a03763ca13b9eb5132540dd86da + ec75190eadbdbc322bb7d55f4769a135af64a3f5 - + https://github.com/dotnet/sdk - 0b4ee38b0ea59a03763ca13b9eb5132540dd86da + ec75190eadbdbc322bb7d55f4769a135af64a3f5 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 79fa7a4e69d91637816d234c554618ccc29d1887 + 29e657c0582904529bae2a87c227220e03f509cf diff --git a/eng/Versions.props b/eng/Versions.props index 28bd36fb51ad..1b0af883b990 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22330.2 - 6.0.400-preview.22330.2 + 6.0.400-preview.22330.4 + 6.0.400-preview.22330.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 33743c8b9dd5ac9ba13e9647f9118facbbc80260 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 30 Jun 2022 10:03:32 -0700 Subject: [PATCH 0598/1244] Update aspnetcore patch --- .../aspnetcore/0007-WebHost-delegate-nullability.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 426502e86911..cf15d1bfca8b 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 7d9996016ae1e503eeabb1363e9fca4003273ad0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Jul 2022 03:51:36 +0000 Subject: [PATCH 0599/1244] Update dependencies from https://github.com/dotnet/sdk build 20220630.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22330.4 -> To Version 6.0.400-preview.22330.16 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.400-preview.22327.5 -> To Version 6.0.400-preview.22330.1 (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 36c1cc0e3fc1..77fb2fa4adf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 32ef7187ec6606559bcd8895db0e7313491f8457 + 4fba13f8c6414d685e7a30efd41a4af05fb099c5 - + https://github.com/dotnet/templating - 32ef7187ec6606559bcd8895db0e7313491f8457 + 4fba13f8c6414d685e7a30efd41a4af05fb099c5 - + https://github.com/dotnet/templating - 32ef7187ec6606559bcd8895db0e7313491f8457 + 4fba13f8c6414d685e7a30efd41a4af05fb099c5 - + https://github.com/dotnet/sdk - ec75190eadbdbc322bb7d55f4769a135af64a3f5 + 294772694c506ed44394cf76c19efcd16123e182 - + https://github.com/dotnet/sdk - ec75190eadbdbc322bb7d55f4769a135af64a3f5 + 294772694c506ed44394cf76c19efcd16123e182 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf dabcf2041548f7594b21e9bf865463abdfd14307 - + https://github.com/dotnet/fsharp - 4dce55c3e6615594134d829d0b5c6b275707ca33 + 3b674eb3a3aad38bbd0decfe75ea5aeeed12b499 - + https://github.com/dotnet/fsharp - 4dce55c3e6615594134d829d0b5c6b275707ca33 + 3b674eb3a3aad38bbd0decfe75ea5aeeed12b499 diff --git a/eng/Versions.props b/eng/Versions.props index 1b0af883b990..930ae87ba48b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22327.5 + 6.0.400-preview.22330.1 @@ -56,8 +56,8 @@ - 6.0.400-preview.22330.4 - 6.0.400-preview.22330.4 + 6.0.400-preview.22330.16 + 6.0.400-preview.22330.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22327.5 + 6.0.400-preview.22330.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 5d309242cb875e00ae24e645695f0324ae537211 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Jul 2022 09:38:58 +0000 Subject: [PATCH 0600/1244] Update dependencies from https://github.com/dotnet/sdk build 20220701.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22330.4 -> To Version 6.0.400-preview.22351.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.400-preview.22327.5 -> To Version 6.0.400-preview.22330.1 (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 77fb2fa4adf6..363888c510df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4fba13f8c6414d685e7a30efd41a4af05fb099c5 - + https://github.com/dotnet/sdk - 294772694c506ed44394cf76c19efcd16123e182 + 46291e27655034ce22494062ad21595340aa316a - + https://github.com/dotnet/sdk - 294772694c506ed44394cf76c19efcd16123e182 + 46291e27655034ce22494062ad21595340aa316a @@ -146,7 +146,7 @@ 29e657c0582904529bae2a87c227220e03f509cf - + https://github.com/dotnet/msbuild 77c72dd0f1758e994cf2ebd2ddd6d1ada695d261 diff --git a/eng/Versions.props b/eng/Versions.props index 930ae87ba48b..fcd5e402b77a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22330.16 - 6.0.400-preview.22330.16 + 6.0.400-preview.22351.1 + 6.0.400-preview.22351.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8a608b5043d71848edfd742d16d604aefd3955b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 2 Jul 2022 00:11:20 +0000 Subject: [PATCH 0601/1244] Update dependencies from https://github.com/dotnet/sdk build 20220701.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22351.1 -> To Version 6.0.400-preview.22351.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 363888c510df..1b6758429da3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4fba13f8c6414d685e7a30efd41a4af05fb099c5 - + https://github.com/dotnet/sdk - 46291e27655034ce22494062ad21595340aa316a + 1fd8c9b3b70e3ebace67c77d35176644b1c2e8cc - + https://github.com/dotnet/sdk - 46291e27655034ce22494062ad21595340aa316a + 1fd8c9b3b70e3ebace67c77d35176644b1c2e8cc diff --git a/eng/Versions.props b/eng/Versions.props index fcd5e402b77a..af864e003d58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22351.1 - 6.0.400-preview.22351.1 + 6.0.400-preview.22351.6 + 6.0.400-preview.22351.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 35e532cfe066696afaac0df6e7b18ea02dc12c4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 2 Jul 2022 01:15:45 +0000 Subject: [PATCH 0602/1244] Update dependencies from https://github.com/dotnet/sdk build 20220701.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22351.1 -> To Version 6.0.400-preview.22351.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 1b6758429da3..ed9353018913 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4fba13f8c6414d685e7a30efd41a4af05fb099c5 - + https://github.com/dotnet/sdk - 1fd8c9b3b70e3ebace67c77d35176644b1c2e8cc + 02bb1e5b70925a299386e6cec6ce9d184e502208 - + https://github.com/dotnet/sdk - 1fd8c9b3b70e3ebace67c77d35176644b1c2e8cc + 02bb1e5b70925a299386e6cec6ce9d184e502208 diff --git a/eng/Versions.props b/eng/Versions.props index af864e003d58..4d0639bef157 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22351.6 - 6.0.400-preview.22351.6 + 6.0.400-preview.22351.11 + 6.0.400-preview.22351.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ff9ad3ef2362aaca11a2246103f45056faab09b7 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 5 Jul 2022 00:38:26 -0700 Subject: [PATCH 0603/1244] Update alpine.3.13 to the new one --- .vsts-ci.yml | 4 ++-- eng/docker/{alpine.3.13 => alpine.3.15}/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename eng/docker/{alpine.3.13 => alpine.3.15}/Dockerfile (93%) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 20ed9983637e..74bea93e8021 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -238,7 +238,7 @@ stages: _TestArg: '' Build_Linux_musl_Debug_x64: _BuildConfig: Debug - _DockerParameter: '--docker alpine.3.13' + _DockerParameter: '--docker alpine.3.15' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-musl-x64' _BuildArchitecture: 'x64' @@ -283,7 +283,7 @@ stages: _TestArg: '' Build_Linux_musl_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker alpine.3.13' + _DockerParameter: '--docker alpine.3.15' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-musl-x64' _BuildArchitecture: 'x64' diff --git a/eng/docker/alpine.3.13/Dockerfile b/eng/docker/alpine.3.15/Dockerfile similarity index 93% rename from eng/docker/alpine.3.13/Dockerfile rename to eng/docker/alpine.3.15/Dockerfile index 272f9596ac66..2d7e656981fe 100644 --- a/eng/docker/alpine.3.13/Dockerfile +++ b/eng/docker/alpine.3.15/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-20210714125444-ae5be29 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-20220610131707-f0ea7ba RUN apk update && apk upgrade && apk add --no-cache curl ncurses From 2eaeea46973b06c56d668316dbde58ced40c558b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 5 Jul 2022 15:00:58 +0000 Subject: [PATCH 0604/1244] 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 4f5d253888ad..208608d74e58 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 229d3fa85a3b..d3ecfe824e04 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 4efe6994e36054c034d2f7b3e63f45f03a1c48ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Jul 2022 15:01:11 +0000 Subject: [PATCH 0605/1244] 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.22262.1 -> To Version 6.0.0-servicing.22355.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 83256d48d74d..2054c20fba6c 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 - 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 0606/1244] 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 e121f07ceb45..a6c7e9fff8e6 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 0607/1244] 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 4f5d253888ad..208608d74e58 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 229d3fa85a3b..d92910dd8140 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 54076f4ddfdf..c20453783ecc 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 e77bb371d7309738cd75d088bb15e9c9f5b06878 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Jul 2022 00:32:05 +0000 Subject: [PATCH 0608/1244] Update dependencies from https://github.com/dotnet/sdk build 20220705.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22351.11 -> To Version 6.0.400-preview.22355.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 ed9353018913..7905af2dc09d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4fba13f8c6414d685e7a30efd41a4af05fb099c5 - + https://github.com/dotnet/sdk - 02bb1e5b70925a299386e6cec6ce9d184e502208 + c48fc73bd169eba4957dfae32b8e2bc4070b5210 - + https://github.com/dotnet/sdk - 02bb1e5b70925a299386e6cec6ce9d184e502208 + c48fc73bd169eba4957dfae32b8e2bc4070b5210 diff --git a/eng/Versions.props b/eng/Versions.props index 4d0639bef157..c6b484073006 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22351.11 - 6.0.400-preview.22351.11 + 6.0.400-preview.22355.11 + 6.0.400-preview.22355.11 $(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 0609/1244] 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 d92910dd8140..bebf8bf5212a 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 c20453783ecc..88d5ef754d3d 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 b27b4ecf9f1274ae4431a799b282c7f1cec8a1a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Jul 2022 22:38:20 +0000 Subject: [PATCH 0610/1244] Update dependencies from https://github.com/dotnet/sdk build 20220706.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22355.11 -> To Version 6.0.400-preview.22356.20 --- 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 7905af2dc09d..9cbc85253055 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4fba13f8c6414d685e7a30efd41a4af05fb099c5 - + https://github.com/dotnet/sdk - c48fc73bd169eba4957dfae32b8e2bc4070b5210 + 7e5b406e3d427266db6e0c284e437f512f47a8c6 - + https://github.com/dotnet/sdk - c48fc73bd169eba4957dfae32b8e2bc4070b5210 + 7e5b406e3d427266db6e0c284e437f512f47a8c6 diff --git a/eng/Versions.props b/eng/Versions.props index c6b484073006..fbca69db5024 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22355.11 - 6.0.400-preview.22355.11 + 6.0.400-preview.22356.20 + 6.0.400-preview.22356.20 $(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 0611/1244] 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 bebf8bf5212a..f38be3d5d471 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 88d5ef754d3d..b1ac14e13381 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 0612/1244] 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 f50bca67fb4d..9a84139e5913 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 679bfbbbeb2b..8991d2f66b27 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 e121f07ceb45..a3496372450f 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 0613/1244] 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 d3ecfe824e04..bae0da4ebcfa 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 5eb8a241c8a43372b36a4df7eb5273c36c773e45 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Jul 2022 14:58:40 +0000 Subject: [PATCH 0614/1244] 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.22262.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 2054c20fba6c..2443f8e02d0c 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 - ffa2b64e8de11f0d148b7167c647fead3f2c33cb + 9dc0c80c3c275ed32fa9aff1d86ef204550cc1f6 From d8580fbd619e4ca1dd4cd9177450bf51b09d8edc Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 8 Jul 2022 15:01:48 +0000 Subject: [PATCH 0615/1244] Remove unneccessary source-build patch --- ...-and-unsafe-paths-to-be-able-to-appl.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/fsharp/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch b/src/SourceBuild/tarball/patches/fsharp/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch deleted file mode 100644 index cff9bda2134f..000000000000 --- a/src/SourceBuild/tarball/patches/fsharp/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:53:06 -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 903ee00..4c85819 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -15,7 +15,7 @@ - - - - From d384f3f5f7aaa0a0bb2b8e0eae0b085b8d1b1a0b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 9 Jul 2022 00:56:00 +0000 Subject: [PATCH 0616/1244] 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 208608d74e58..c41d3eefb908 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 f38be3d5d471..f059b873f7cd 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 b1ac14e13381..df7d1031968a 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 ef25719e7c75d5812a05008283f04e980f264365 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Jul 2022 17:11:21 +0000 Subject: [PATCH 0617/1244] Update dependencies from https://github.com/dotnet/sdk build 20220711.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22356.20 -> To Version 6.0.400-preview.22361.7 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.3.0-release-20220627-03 -> To Version 17.3.0-release-20220708-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 9cbc85253055..9e2d61278a23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4fba13f8c6414d685e7a30efd41a4af05fb099c5 - + https://github.com/dotnet/sdk - 7e5b406e3d427266db6e0c284e437f512f47a8c6 + 1012a543a30a86ed3b6ee87c5612f522d88e9c01 - + https://github.com/dotnet/sdk - 7e5b406e3d427266db6e0c284e437f512f47a8c6 + 1012a543a30a86ed3b6ee87c5612f522d88e9c01 @@ -130,9 +130,9 @@ 3b674eb3a3aad38bbd0decfe75ea5aeeed12b499 - + https://github.com/microsoft/vstest - 4fbb74fc9fdb39d278ee0886f5310dbdc1efd88c + c7ba2ca721808f830482ace6be06ae93077e0e7b diff --git a/eng/Versions.props b/eng/Versions.props index fbca69db5024..c33e89918a93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22356.20 - 6.0.400-preview.22356.20 + 6.0.400-preview.22361.7 + 6.0.400-preview.22361.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-release-20220627-03 + 17.3.0-release-20220708-01 From 6a9c07da4d2486c218085bbfce6146bfd626615c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Jul 2022 23:21:37 +0000 Subject: [PATCH 0618/1244] Update dependencies from https://github.com/dotnet/sdk build 20220711.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22361.7 -> To Version 6.0.400-preview.22361.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 9e2d61278a23..94bf496fceed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4fba13f8c6414d685e7a30efd41a4af05fb099c5 - + https://github.com/dotnet/sdk - 1012a543a30a86ed3b6ee87c5612f522d88e9c01 + 61deac61b8e36abe334e4b4b421cdb3934ab283f - + https://github.com/dotnet/sdk - 1012a543a30a86ed3b6ee87c5612f522d88e9c01 + 61deac61b8e36abe334e4b4b421cdb3934ab283f diff --git a/eng/Versions.props b/eng/Versions.props index c33e89918a93..3a80e29ab640 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22361.7 - 6.0.400-preview.22361.7 + 6.0.400-preview.22361.12 + 6.0.400-preview.22361.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e22344fc385ce1a6868651dba9cd6e41c604536e Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 12 Jul 2022 12:13:47 -0700 Subject: [PATCH 0619/1244] Update asp.net template version (#14112) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3a80e29ab640..78b2ab852924 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 853275fdcb09c04e79ba224faa4a40fcd4025768 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 12 Jul 2022 12:13:55 -0700 Subject: [PATCH 0620/1244] 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 8c1961e3504b..3499501e1c17 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 0621/1244] 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 f059b873f7cd..bd1640496239 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 5f8c174581f6..35fb95950de2 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 50bd0f656734ee9e6d23e0f4d4e88e0fa324a862 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Jul 2022 21:49:35 +0000 Subject: [PATCH 0622/1244] Update dependencies from https://github.com/dotnet/sdk build 20220712.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.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 94bf496fceed..ec71bcaf63ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4fba13f8c6414d685e7a30efd41a4af05fb099c5 - + https://github.com/dotnet/sdk - 61deac61b8e36abe334e4b4b421cdb3934ab283f + 38c20779c26859b711d8877f068061624f81d2a6 - + https://github.com/dotnet/sdk - 61deac61b8e36abe334e4b4b421cdb3934ab283f + 38c20779c26859b711d8877f068061624f81d2a6 diff --git a/eng/Versions.props b/eng/Versions.props index 78b2ab852924..0c3787024f18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22361.12 - 6.0.400-preview.22361.12 + 6.0.400-preview.22362.14 + 6.0.400-preview.22362.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 13a3901c10fece6a535949c038a41152e40f7fc1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Jul 2022 23:04:27 +0000 Subject: [PATCH 0623/1244] Update dependencies from https://github.com/dotnet/sdk build 20220712.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.18 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks From Version 6.0.400-preview.22330.1 -> To Version 6.0.400-preview.22358.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 ec71bcaf63ac..9704f1c5fa29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 4fba13f8c6414d685e7a30efd41a4af05fb099c5 + d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - + https://github.com/dotnet/templating - 4fba13f8c6414d685e7a30efd41a4af05fb099c5 + d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - + https://github.com/dotnet/templating - 4fba13f8c6414d685e7a30efd41a4af05fb099c5 + d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - + https://github.com/dotnet/sdk - 38c20779c26859b711d8877f068061624f81d2a6 + 93583c8b84cd8c3c3fbd235a471dd14d04befb88 - + https://github.com/dotnet/sdk - 38c20779c26859b711d8877f068061624f81d2a6 + 93583c8b84cd8c3c3fbd235a471dd14d04befb88 @@ -151,9 +151,9 @@ 77c72dd0f1758e994cf2ebd2ddd6d1ada695d261 - + https://github.com/nuget/nuget.client - 3dd86e0c670862f76351c87ca7dc3454d0faf8d6 + 3f9d36bb147ad6a7833772c148d0ac7a11f6c2aa diff --git a/eng/Versions.props b/eng/Versions.props index 0c3787024f18..547795883bf6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400-preview.22330.1 + 6.0.400-preview.22358.2 @@ -56,8 +56,8 @@ - 6.0.400-preview.22362.14 - 6.0.400-preview.22362.14 + 6.0.400-preview.22362.18 + 6.0.400-preview.22362.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22330.1 + 6.0.400-preview.22358.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From ffa6a7bb74f574f1975c4269c077736de573d602 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Jul 2022 00:54:57 +0000 Subject: [PATCH 0624/1244] Update dependencies from https://github.com/dotnet/sdk build 20220712.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.24 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks From Version 6.0.400-preview.22330.1 -> To Version 6.0.400-preview.22358.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 9704f1c5fa29..c19fe86fac55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - + https://github.com/dotnet/sdk - 93583c8b84cd8c3c3fbd235a471dd14d04befb88 + d65d07375c17cee2aa374eb9b4f2d9afe5fd202c - + https://github.com/dotnet/sdk - 93583c8b84cd8c3c3fbd235a471dd14d04befb88 + d65d07375c17cee2aa374eb9b4f2d9afe5fd202c diff --git a/eng/Versions.props b/eng/Versions.props index 547795883bf6..06e2795b7e3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22362.18 - 6.0.400-preview.22362.18 + 6.0.400-preview.22362.24 + 6.0.400-preview.22362.24 $(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 0625/1244] 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 208608d74e58..a983e09b4b7e 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 bae0da4ebcfa..787c6311da70 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 a3290bfa2d775407cf53e5b73079c02d2ea8b1c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Jul 2022 15:07:24 +0000 Subject: [PATCH 0626/1244] 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.22262.1 -> To Version 6.0.0-servicing.22363.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 2443f8e02d0c..bfee1f6bf7be 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 - 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 0627/1244] 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 c41d3eefb908..3d165bb662c6 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 bd1640496239..55cc067fce76 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 35fb95950de2..dd6ebbd08d0b 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 6b9fa18ad7f3392d86afef9197903b35ed30f900 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Jul 2022 13:43:25 -0700 Subject: [PATCH 0628/1244] Install the manifests into their specific feature band rather than the current band --- src/redist/targets/BundledManifests.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 7b8536e4878d..b38fce70c0fd 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -94,7 +94,7 @@ + DestinationFolder="$(RedistLayoutPath)sdk-manifests/%(FeatureBand)/%(DestinationPath)"/> From 3b240faef4fd553d4644df858835789778ae2809 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Jul 2022 22:28:52 +0000 Subject: [PATCH 0629/1244] Update dependencies from https://github.com/dotnet/sdk build 20220713.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22362.24 -> To Version 6.0.400-preview.22363.31 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22330.3 -> To Version 12.0.4-beta.22363.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++------ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4f5d253888ad..a983e09b4b7e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,18 @@ + + - - - @@ -39,15 +38,14 @@ + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01199e28cb7a..396463345b05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - + https://github.com/dotnet/sdk - d65d07375c17cee2aa374eb9b4f2d9afe5fd202c + dda665ed55faf633e9c8d147ece4a69bf5009c49 - + https://github.com/dotnet/sdk - d65d07375c17cee2aa374eb9b4f2d9afe5fd202c + dda665ed55faf633e9c8d147ece4a69bf5009c49 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 5063a17b211e70ca0ff6fed1b57e9d04727c25a8 - + https://github.com/dotnet/fsharp - 3b674eb3a3aad38bbd0decfe75ea5aeeed12b499 + 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 - + https://github.com/dotnet/fsharp - 3b674eb3a3aad38bbd0decfe75ea5aeeed12b499 + 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 diff --git a/eng/Versions.props b/eng/Versions.props index 1d7d271d48d9..f8b7ab77a5b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22362.24 - 6.0.400-preview.22362.24 + 6.0.400-preview.22363.31 + 6.0.400-preview.22363.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From da4c6c0b23a333306f816c9211f43a4a984d3cc5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Jul 2022 17:15:27 -0700 Subject: [PATCH 0630/1244] Fix logic for putting the manifests in the right location. --- src/redist/targets/BundledManifests.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index b38fce70c0fd..63bfd724e482 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -82,19 +82,19 @@ + DestinationPath="%(BundledManifests.FeatureBand)/$([MSBuild]::ValueOrDefault('%(Identity)', '').ToLower())/localize"/> + DestinationFolder="$(RedistLayoutPath)sdk-manifests/%(DestinationPath)"/> From 559f1a1e4d2e38798be556e19c1198db60a3abc6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Jul 2022 01:08:57 +0000 Subject: [PATCH 0631/1244] Update dependencies from https://github.com/dotnet/sdk build 20220713.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22363.31 -> To Version 6.0.400-preview.22363.39 --- 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 396463345b05..0c70c5efa5b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - + https://github.com/dotnet/sdk - dda665ed55faf633e9c8d147ece4a69bf5009c49 + 3cf60fea0352616c274a89ec580b2a521a37566b - + https://github.com/dotnet/sdk - dda665ed55faf633e9c8d147ece4a69bf5009c49 + 3cf60fea0352616c274a89ec580b2a521a37566b diff --git a/eng/Versions.props b/eng/Versions.props index c097ef35a029..22a87bc440c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22363.31 - 6.0.400-preview.22363.31 + 6.0.400-preview.22363.39 + 6.0.400-preview.22363.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9ff3ee5fc979cc76714d4c84a91a1d3745abbedf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Jul 2022 05:33:51 +0000 Subject: [PATCH 0632/1244] Update dependencies from https://github.com/dotnet/sdk build 20220713.52 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22363.39 -> To Version 6.0.400-preview.22363.52 Dependency coherency updates NuGet.Build.Tasks From Version 6.3.0-rc.123 -> To Version 6.3.0-rc.128 (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 0c70c5efa5b5..ab7b5acdff82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - + https://github.com/dotnet/sdk - 3cf60fea0352616c274a89ec580b2a521a37566b + 091beeec5285670ccb0914f85d10a8ef73cba1af - + https://github.com/dotnet/sdk - 3cf60fea0352616c274a89ec580b2a521a37566b + 091beeec5285670ccb0914f85d10a8ef73cba1af @@ -151,9 +151,9 @@ 77c72dd0f1758e994cf2ebd2ddd6d1ada695d261 - + https://github.com/nuget/nuget.client - 3f9d36bb147ad6a7833772c148d0ac7a11f6c2aa + 222ff7a5329be15520034b76fa1a84098d2ae9fd diff --git a/eng/Versions.props b/eng/Versions.props index 22a87bc440c9..00c543734370 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22363.39 - 6.0.400-preview.22363.39 + 6.0.400-preview.22363.52 + 6.0.400-preview.22363.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9cec01214793b476c5bc9b8273c5ba07632f359e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Jul 2022 10:00:27 +0000 Subject: [PATCH 0633/1244] Update dependencies from https://github.com/dotnet/sdk build 20220714.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22363.52 -> To Version 6.0.400-preview.22364.3 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-3.22329.30 -> To Version 4.3.0-3.22363.19 (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 ab7b5acdff82..932a97689dd7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - + https://github.com/dotnet/sdk - 091beeec5285670ccb0914f85d10a8ef73cba1af + 4445b8be251722225295d23ad8c7607b294ba353 - + https://github.com/dotnet/sdk - 091beeec5285670ccb0914f85d10a8ef73cba1af + 4445b8be251722225295d23ad8c7607b294ba353 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 29e657c0582904529bae2a87c227220e03f509cf + 8b86c2058266c6069e71705623fe9f3b26b648cf diff --git a/eng/Versions.props b/eng/Versions.props index 00c543734370..48982d6adbde 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22363.52 - 6.0.400-preview.22363.52 + 6.0.400-preview.22364.3 + 6.0.400-preview.22364.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9a230f07c92d38263cbc4003c5f79d8d91b2bacf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Jul 2022 17:17:33 +0000 Subject: [PATCH 0634/1244] 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 3d165bb662c6..1b143b39cb34 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 55cc067fce76..1fbc10e11607 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 dd6ebbd08d0b..c87f0a85ef5c 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 5cb321b8759d06853ec97ad0d2c4341725082d7a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Jul 2022 11:12:45 -0700 Subject: [PATCH 0635/1244] 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 48982d6adbde..8b6108da9121 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,11 +10,11 @@ 4 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + rtm $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release From 6e22d938effd14fe4b4125445578bf9c8f9d979c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Jul 2022 11:13:38 -0700 Subject: [PATCH 0636/1244] Update to target 3.1.28 --- 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 dddadab15430..fe34c9857224 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,7 +26,7 @@ 30 - $([MSBuild]::Add($(VersionFeature), 26)) + $([MSBuild]::Add($(VersionFeature), 27)) 17 From 0933d6bb73866f1cbce73c3de1ad1ba0fbc86293 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Jul 2022 16:42:40 -0700 Subject: [PATCH 0637/1244] Fix bad merge. --- NuGet.config | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5964b8145118..bfbdd60d4ff4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -41,9 +39,7 @@ - - - + From 1a93c8b6ebf761d2be728e78f80f389866929307 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Jul 2022 19:40:37 +0000 Subject: [PATCH 0638/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220715.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22364.3 -> To Version 6.0.400-rtm.22365.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,Microsoft.Build From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 15 +++--- eng/Version.Details.xml | 106 ++++++++++++++++++++-------------------- eng/Versions.props | 44 ++++++++--------- 3 files changed, 84 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index a983e09b4b7e..1161d1e28fb0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,21 @@ - - - + + + + + @@ -38,14 +40,15 @@ - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 877fb6bcc78a..ca23a66fadd4 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 + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - - https://github.com/dotnet/templating - d8d193bf161de2a50a251035e4f9df2e2e85d7e7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + bb5ba57f877b922b418138a969b82b3c1b4e40ad - - https://github.com/dotnet/templating - d8d193bf161de2a50a251035e4f9df2e2e85d7e7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + bb5ba57f877b922b418138a969b82b3c1b4e40ad - - https://github.com/dotnet/templating - d8d193bf161de2a50a251035e4f9df2e2e85d7e7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + bb5ba57f877b922b418138a969b82b3c1b4e40ad - - https://github.com/dotnet/sdk - 4445b8be251722225295d23ad8c7607b294ba353 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 47efcbaac35fdc296ac814f79bbb465a3798610e - - https://github.com/dotnet/sdk - 4445b8be251722225295d23ad8c7607b294ba353 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 47efcbaac35fdc296ac814f79bbb465a3798610e - + 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 @@ -146,9 +146,9 @@ 8b86c2058266c6069e71705623fe9f3b26b648cf - + https://github.com/dotnet/msbuild - 77c72dd0f1758e994cf2ebd2ddd6d1ada695d261 + 92e0776509a23ed2c1e24bf906a92f045899b885 diff --git a/eng/Versions.props b/eng/Versions.props index 8b6108da9121..940349c0ce2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.7-servicing.22322.3 + 6.0.8-servicing.22363.7 - 6.0.7-servicing.22322.2 + 6.0.8-servicing.22363.8 - 6.0.400-preview.22358.2 + 6.0.400 @@ -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.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.400-preview.22364.3 - 6.0.400-preview.22364.3 + 6.0.400-rtm.22365.11 + 6.0.400-rtm.22365.11 $(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.22363.6 + 6.0.8-servicing.22363.6 + 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.22363.10 + 6.0.8-servicing.22363.10 + 6.0.8 + 6.0.8 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22358.2 + 6.0.400 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From a350ed8b1d271c73ac0b60db99023488bcf5aa78 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Jul 2022 23:31:21 +0000 Subject: [PATCH 0639/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220715.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22364.3 -> To Version 6.0.400-rtm.22365.19 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,Microsoft.Build From Version 6.0.7 -> To Version 6.0.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 ca23a66fadd4..910d95c0e422 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 47efcbaac35fdc296ac814f79bbb465a3798610e + ec1808f917ea97eb42f76b9ae938177b36be77e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 47efcbaac35fdc296ac814f79bbb465a3798610e + ec1808f917ea97eb42f76b9ae938177b36be77e0 diff --git a/eng/Versions.props b/eng/Versions.props index 940349c0ce2a..8f124271eec4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-rtm.22365.11 - 6.0.400-rtm.22365.11 + 6.0.400-rtm.22365.19 + 6.0.400-rtm.22365.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7b317fc1e0dfe07b20317437ae1da9a246f761ca Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 18 Jul 2022 04:37:00 +0000 Subject: [PATCH 0640/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220717.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22365.19 -> To Version 6.0.400-rtm.22367.6 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-3.22363.19 -> To Version 4.3.0-3.22365.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 910d95c0e422..bbc72d40a6ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec1808f917ea97eb42f76b9ae938177b36be77e0 + 428979958ee5fb06d88b45746a7bdb5985df1246 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec1808f917ea97eb42f76b9ae938177b36be77e0 + 428979958ee5fb06d88b45746a7bdb5985df1246 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 8b86c2058266c6069e71705623fe9f3b26b648cf + dd078d4e43fca042188bafc4548e6fe2abb62250 diff --git a/eng/Versions.props b/eng/Versions.props index 8f124271eec4..8c9e654feb06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-rtm.22365.19 - 6.0.400-rtm.22365.19 + 6.0.400-rtm.22367.6 + 6.0.400-rtm.22367.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 060275cd0b32e010d3647615e973b6b03de953ec Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 18 Jul 2022 18:57:07 +0000 Subject: [PATCH 0641/1244] [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 5acfa5b13f41..b8515744d5cd 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 28ae92a40b83..83aa438520cd 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 0642/1244] 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 1b143b39cb34..32e3ea5f6ceb 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 b8515744d5cd..d757944dd494 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 83aa438520cd..d2537c9a43b2 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 0643/1244] 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 32e3ea5f6ceb..139e6bcf17ea 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 d757944dd494..8f97e57ec5ce 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 d2537c9a43b2..492b4417804c 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 146342f407f81fb12ea23871fac93a9b0cdf7c0f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 18 Jul 2022 22:23:06 +0000 Subject: [PATCH 0644/1244] Merged PR 24234: [internal/release/6.0.4xx] 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:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20220718.21 - **Date Produced**: July 18, 2022 9:43:20 PM UTC - **Commit**: 533f5a20a40174a9fa9c3fd9c0bf954e9ebd132e - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.400-rtm.22367.6 to 6.0.400-rtm.22368.21][1] - **Microsoft.NET.Sdk**: [from 6.0.400-rtm.22367.6 to 6.0.400-rtm.22368.21][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=GC4289799&targetVersion=GC533f5a2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop... --- 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 1161d1e28fb0..b7ec3e5c7700 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbc72d40a6ef..0e71e8c28ae1 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 bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 428979958ee5fb06d88b45746a7bdb5985df1246 + 533f5a20a40174a9fa9c3fd9c0bf954e9ebd132e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 428979958ee5fb06d88b45746a7bdb5985df1246 + 533f5a20a40174a9fa9c3fd9c0bf954e9ebd132e - + 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 8c9e654feb06..88e7e5977028 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.400-rtm.22367.6 - 6.0.400-rtm.22367.6 + 6.0.400-rtm.22368.21 + 6.0.400-rtm.22368.21 $(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 f2596c2ac9680b7ee74fe68598651210875fa43b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Jul 2022 15:27:24 +0000 Subject: [PATCH 0645/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220720.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22370.1 --- NuGet.config | 6 ------ eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index a983e09b4b7e..9a84139e5913 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -38,9 +35,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 877fb6bcc78a..231e226ba00f 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 - 08e4967761f81c4c40b6872a0e639b4f588b4f00 + f936c2460308e4e91f327328b10935e96d946486 From 55859829cd6c1ba18e7782630579e88df970a049 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 21 Jul 2022 10:56:34 -0700 Subject: [PATCH 0646/1244] Actually update implicit version to 3.1.28 (#14187) --- 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 fe34c9857224..6fd052fb0c57 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,7 +26,7 @@ 30 - $([MSBuild]::Add($(VersionFeature), 27)) + $([MSBuild]::Add($(VersionFeature), 28)) 17 From f6d8ed6077a21f3b183f13a814beaec7ad36eb23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Jul 2022 15:45:39 +0000 Subject: [PATCH 0647/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220722.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22372.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 231e226ba00f..535cfe73f42b 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 - f936c2460308e4e91f327328b10935e96d946486 + 32bb1037d83fff54e9ca3c0b21cc5ab447f51fc6 From 0f9b59684cb0796d4e57fe0921d52ea19c5551ac Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 25 Jul 2022 13:22:39 +0000 Subject: [PATCH 0648/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220725.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.400-rtm.22375.3 Dependency coherency updates Microsoft.Build From Version 17.3.0 -> To Version 17.3.0 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++++- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index b7ec3e5c7700..4d97ff5b3a57 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + @@ -22,6 +22,8 @@ + + @@ -48,6 +50,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e71e8c28ae1..9f51ec116c5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 533f5a20a40174a9fa9c3fd9c0bf954e9ebd132e + 247888ccd4eaf2128b14d2c3c94d33839058ecec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 533f5a20a40174a9fa9c3fd9c0bf954e9ebd132e + 247888ccd4eaf2128b14d2c3c94d33839058ecec @@ -148,7 +148,7 @@ https://github.com/dotnet/msbuild - 92e0776509a23ed2c1e24bf906a92f045899b885 + f67e3d35edb936d1b2d4a00f74be446f5c4ba495 diff --git a/eng/Versions.props b/eng/Versions.props index 88e7e5977028..6a9436af17be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-rtm.22368.21 - 6.0.400-rtm.22368.21 + 6.0.400-rtm.22375.3 + 6.0.400-rtm.22375.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a6eb5ad33e1424ee98d32ba6f509763a07789383 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Jul 2022 15:04:08 +0000 Subject: [PATCH 0649/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220727.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22377.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 535cfe73f42b..11424d73d5b8 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 - 32bb1037d83fff54e9ca3c0b21cc5ab447f51fc6 + 55a5e6104349d0678ad0dfcec18fe339d2454b6f From d7a4d67024ebcc36fea86182a99bc09529dbbc59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Jul 2022 14:53:29 +0000 Subject: [PATCH 0650/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220728.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22378.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 11424d73d5b8..247688704627 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 - 55a5e6104349d0678ad0dfcec18fe339d2454b6f + d6c1dea56aaea28161154648cd6c485fabbc722c From f66d2fea34f6a68251c3b45522b58f2bfb3a9eac Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Aug 2022 09:18:15 -0700 Subject: [PATCH 0651/1244] 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 13730aab2e22..4e01fa50a91b 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 fdea79d1060c0f283b10aa5c2e516ce1307d8cec Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Aug 2022 09:18:19 -0700 Subject: [PATCH 0652/1244] Update branding to 6.0.401 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8b6108da9121..e9742675ff02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rtm $(VersionMajor).$(VersionMinor) From 7046244198323c8b70504fb34973dcc103fbeb85 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 2 Aug 2022 12:45:21 -0700 Subject: [PATCH 0653/1244] Servicing label --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e9742675ff02..62c902374be1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 4 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + servicing $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 8c3b1d204505937d5d93906a66b0992acb980fe1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 2 Aug 2022 12:54:22 -0700 Subject: [PATCH 0654/1244] Revert branding --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6bd2515e75c9..affa9ce1cf3a 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 a64bc66e6ced51b0cda62babb6c51fc39f049d49 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 2 Aug 2022 23:04:03 +0000 Subject: [PATCH 0655/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220802.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22402.24 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++++++++++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4d97ff5b3a57..e720e55fc19e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -16,12 +17,17 @@ + + + + + @@ -42,16 +48,22 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f51ec116c5d..4670ee2a8505 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 247888ccd4eaf2128b14d2c3c94d33839058ecec + bc76ee097e5ba4e00fa9d50d4a6c8282f2424ce4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 247888ccd4eaf2128b14d2c3c94d33839058ecec + bc76ee097e5ba4e00fa9d50d4a6c8282f2424ce4 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 7a75fd34f53bc300206bd8cfc636527934dd17af - + https://github.com/dotnet/fsharp - 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 + 80858f017d7121a4d3f6c1228cc05b063dfe8082 - + https://github.com/dotnet/fsharp - 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 + 80858f017d7121a4d3f6c1228cc05b063dfe8082 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - dd078d4e43fca042188bafc4548e6fe2abb62250 + 41ae77386c335929113f61d6f51f2663d2780443 diff --git a/eng/Versions.props b/eng/Versions.props index 6a9436af17be..9ff4990d8867 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-rtm.22375.3 - 6.0.400-rtm.22375.3 + 6.0.401-servicing.22402.24 + 6.0.401-servicing.22402.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1dc565363fa462def5c116960de9ab0bbc11dfe1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Aug 2022 00:17:33 +0000 Subject: [PATCH 0656/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220802.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22402.31 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.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 4670ee2a8505..03d20038be6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc76ee097e5ba4e00fa9d50d4a6c8282f2424ce4 + f2fdf16017b4b7e0f961c7a90c0f4a2f69172e91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc76ee097e5ba4e00fa9d50d4a6c8282f2424ce4 + f2fdf16017b4b7e0f961c7a90c0f4a2f69172e91 diff --git a/eng/Versions.props b/eng/Versions.props index 9ff4990d8867..ba2c870aeb13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22402.24 - 6.0.401-servicing.22402.24 + 6.0.401-servicing.22402.31 + 6.0.401-servicing.22402.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a90a7195fae98b6d5f7cf2ef2ccc4332d384063d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Aug 2022 09:08:08 +0000 Subject: [PATCH 0657/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220803.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22403.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.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 03d20038be6e..de2c5a283d1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2fdf16017b4b7e0f961c7a90c0f4a2f69172e91 + a71f9396bd874d39866ab1fcc02b3e03b0f4365e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2fdf16017b4b7e0f961c7a90c0f4a2f69172e91 + a71f9396bd874d39866ab1fcc02b3e03b0f4365e diff --git a/eng/Versions.props b/eng/Versions.props index ba2c870aeb13..583586caa2e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22402.31 - 6.0.401-servicing.22402.31 + 6.0.401-servicing.22403.3 + 6.0.401-servicing.22403.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c0d8768abc559cf97fa8ccde99476cdd8df8bf2c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Aug 2022 22:48:21 +0000 Subject: [PATCH 0658/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220803.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22403.20 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.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 de2c5a283d1e..56c61a4fce33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a71f9396bd874d39866ab1fcc02b3e03b0f4365e + bfaf027dee691ea79cfc71b942dcc8f2224ca6dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a71f9396bd874d39866ab1fcc02b3e03b0f4365e + bfaf027dee691ea79cfc71b942dcc8f2224ca6dc diff --git a/eng/Versions.props b/eng/Versions.props index 583586caa2e6..544c6fa4db24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22403.3 - 6.0.401-servicing.22403.3 + 6.0.401-servicing.22403.20 + 6.0.401-servicing.22403.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 807fbf16c41c9ef49885d667d88283904c801008 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Aug 2022 15:01:09 +0000 Subject: [PATCH 0659/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220804.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22404.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 247688704627..a33391b13744 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 - d6c1dea56aaea28161154648cd6c485fabbc722c + 0576bdea12cf0864845d21ff5d5671b0763ba628 From 3e8243f20c411f51bcefa2f6c4d15497a4f8ba37 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 4 Aug 2022 19:12:34 +0000 Subject: [PATCH 0660/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220804.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22404.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.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 56c61a4fce33..d8809434f83b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bfaf027dee691ea79cfc71b942dcc8f2224ca6dc + d3cac29f251213d85e7f1a228bac3bd5d6376862 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bfaf027dee691ea79cfc71b942dcc8f2224ca6dc + d3cac29f251213d85e7f1a228bac3bd5d6376862 diff --git a/eng/Versions.props b/eng/Versions.props index 544c6fa4db24..c732959ab911 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22403.20 - 6.0.401-servicing.22403.20 + 6.0.401-servicing.22404.9 + 6.0.401-servicing.22404.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4514a2a0325357903db83c028ce7cf131806306a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Aug 2022 14:28:27 +0000 Subject: [PATCH 0661/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220805.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22405.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 a33391b13744..dacfe52ce9d6 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 - 0576bdea12cf0864845d21ff5d5671b0763ba628 + 3e4a01565292638b4e9841bd4a93f00155ccdebe From 005dd2364d9b517b9993b80c54c47510404fc14c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 5 Aug 2022 12:04:17 -0700 Subject: [PATCH 0662/1244] Stop app host downloads for 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 6fd052fb0c57..e8948ec0be60 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -305,6 +305,7 @@ Copyright (c) .NET Foundation. All rights reserved. AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**" AppHostPackVersion="$(_NETCoreAppPackageVersion)" AppHostRuntimeIdentifiers="@(NetCoreAppHostRids, '%3B')" + ExcludedRuntimeIdentifiers="android" /> Date: Fri, 5 Aug 2022 20:19:28 +0000 Subject: [PATCH 0663/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220805.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22405.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.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 d8809434f83b..dc0ef9e62c0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3cac29f251213d85e7f1a228bac3bd5d6376862 + e5f68761ed9e7d0698aa4fa7d870ab7db0612025 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3cac29f251213d85e7f1a228bac3bd5d6376862 + e5f68761ed9e7d0698aa4fa7d870ab7db0612025 diff --git a/eng/Versions.props b/eng/Versions.props index c732959ab911..90a30725eaed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22404.9 - 6.0.401-servicing.22404.9 + 6.0.401-servicing.22405.9 + 6.0.401-servicing.22405.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b40e5505b342e3548f3af1e3c57cdbfdfc7a9468 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 8 Aug 2022 03:02:14 +0000 Subject: [PATCH 0664/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220807.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22407.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.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 dc0ef9e62c0b..dae04267b239 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5f68761ed9e7d0698aa4fa7d870ab7db0612025 + 4c0bf3084642f527f80fdd2631bf8d395ca36b42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5f68761ed9e7d0698aa4fa7d870ab7db0612025 + 4c0bf3084642f527f80fdd2631bf8d395ca36b42 diff --git a/eng/Versions.props b/eng/Versions.props index 90a30725eaed..485514f089d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22405.9 - 6.0.401-servicing.22405.9 + 6.0.401-servicing.22407.5 + 6.0.401-servicing.22407.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e2a0da3d8fffc7e362189d665a93275982eac476 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 8 Aug 2022 14:21:30 -0700 Subject: [PATCH 0665/1244] Add the full nuget version into the .version file --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 60a6c6c5bec5..ecd5381d9660 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -469,7 +469,7 @@ From 4e8eb1efc27d2592b58dbeabc6cd9f32923735d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 9 Aug 2022 17:37:40 +0000 Subject: [PATCH 0666/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220809.10 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22409.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dae04267b239..159ff2451abc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c0bf3084642f527f80fdd2631bf8d395ca36b42 + 555e57592038c7243d11c0c44334cc1ce4af5af1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c0bf3084642f527f80fdd2631bf8d395ca36b42 + 555e57592038c7243d11c0c44334cc1ce4af5af1 @@ -130,7 +130,7 @@ 80858f017d7121a4d3f6c1228cc05b063dfe8082 - + https://github.com/microsoft/vstest c7ba2ca721808f830482ace6be06ae93077e0e7b diff --git a/eng/Versions.props b/eng/Versions.props index 485514f089d1..507da660aeb3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22407.5 - 6.0.401-servicing.22407.5 + 6.0.401-servicing.22409.10 + 6.0.401-servicing.22409.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-release-20220708-01 + 17.3.0 From d2d8560f0e6bbdcb793d10937e444813949948ad Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Aug 2022 12:22:46 -0700 Subject: [PATCH 0667/1244] [6.0.4xx] Update template versions from dotnet/aspnetcore (#14245) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 736bf9635978..526cda48f89d 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 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 0668/1244] [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 537a5f54a7f5..5bfde2c08504 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 c5d3d51a99bb1b31c9f8cb7f710ec252d18564db Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Aug 2022 00:01:10 +0000 Subject: [PATCH 0669/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220809.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22409.25 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 22 ++-------------------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index e720e55fc19e..6c42273dc5cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -16,20 +17,10 @@ - - - - - - - - - - @@ -49,22 +40,13 @@ + - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 159ff2451abc..67863b671064 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 555e57592038c7243d11c0c44334cc1ce4af5af1 + 30fdd35bcf10c662e637e72f44b01e51d8e0ee01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 555e57592038c7243d11c0c44334cc1ce4af5af1 + 30fdd35bcf10c662e637e72f44b01e51d8e0ee01 diff --git a/eng/Versions.props b/eng/Versions.props index 507da660aeb3..d1828923e5b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22409.10 - 6.0.401-servicing.22409.10 + 6.0.401-servicing.22409.25 + 6.0.401-servicing.22409.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7525ef84ba90ad6e8de6114eac9477a96238b195 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Aug 2022 07:18:28 +0000 Subject: [PATCH 0670/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220809.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22409.41 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.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 67863b671064..6c46504bbcd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 30fdd35bcf10c662e637e72f44b01e51d8e0ee01 + 525e8c102f8712e91b8aa60d0dfdda836083537b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 30fdd35bcf10c662e637e72f44b01e51d8e0ee01 + 525e8c102f8712e91b8aa60d0dfdda836083537b @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 41ae77386c335929113f61d6f51f2663d2780443 + 3afc3513e29bb157c2437ab3564fe0a622fe2ccc diff --git a/eng/Versions.props b/eng/Versions.props index d1828923e5b6..887f439384ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22409.25 - 6.0.401-servicing.22409.25 + 6.0.401-servicing.22409.41 + 6.0.401-servicing.22409.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d2a4b82011f1f271a09251b616136a89414c1915 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Aug 2022 22:21:51 +0000 Subject: [PATCH 0671/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220810.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22410.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.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 6c46504bbcd6..f84b1aaa522e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 525e8c102f8712e91b8aa60d0dfdda836083537b + 23034d3a8a858fae9697a1b655c4c6c5071a9940 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 525e8c102f8712e91b8aa60d0dfdda836083537b + 23034d3a8a858fae9697a1b655c4c6c5071a9940 diff --git a/eng/Versions.props b/eng/Versions.props index 887f439384ae..bb9a68f579dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22409.41 - 6.0.401-servicing.22409.41 + 6.0.401-servicing.22410.13 + 6.0.401-servicing.22410.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 155edd719b95d9402b5598a68305efc8447d965d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Aug 2022 04:20:25 +0000 Subject: [PATCH 0672/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220810.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22410.21 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22410.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 f84b1aaa522e..e9005b958571 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 23034d3a8a858fae9697a1b655c4c6c5071a9940 + 2fa12af19521498400119cb8ba0b6c3f5455c53c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 23034d3a8a858fae9697a1b655c4c6c5071a9940 + 2fa12af19521498400119cb8ba0b6c3f5455c53c @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 7a75fd34f53bc300206bd8cfc636527934dd17af - + https://github.com/dotnet/fsharp - 80858f017d7121a4d3f6c1228cc05b063dfe8082 + d5218142e9d56ab25bb5d0034a77484be4dd7c17 - + https://github.com/dotnet/fsharp - 80858f017d7121a4d3f6c1228cc05b063dfe8082 + d5218142e9d56ab25bb5d0034a77484be4dd7c17 diff --git a/eng/Versions.props b/eng/Versions.props index bb9a68f579dd..cb8d89544845 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22410.13 - 6.0.401-servicing.22410.13 + 6.0.401-servicing.22410.21 + 6.0.401-servicing.22410.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8d2ff774735b7219b77c4aae6f9a592e3aef6491 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Aug 2022 08:00:42 +0000 Subject: [PATCH 0673/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220810.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22410.25 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22410.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 e9005b958571..7faf154fb19b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fa12af19521498400119cb8ba0b6c3f5455c53c + 70739da657f41ba15886961e86940f163b512be8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fa12af19521498400119cb8ba0b6c3f5455c53c + 70739da657f41ba15886961e86940f163b512be8 diff --git a/eng/Versions.props b/eng/Versions.props index cb8d89544845..08efbd8be0e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22410.21 - 6.0.401-servicing.22410.21 + 6.0.401-servicing.22410.25 + 6.0.401-servicing.22410.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9c6b2f5764949041912aa7ee1e1bd6a536c05746 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 12 Aug 2022 02:57:48 +0000 Subject: [PATCH 0674/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220811.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22411.17 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22410.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6c42273dc5cd..c605aadf24e3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -39,9 +36,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7faf154fb19b..98d73769fbc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70739da657f41ba15886961e86940f163b512be8 + 4fbf4f02cb39f77b5cd73723483fc4f8bd2ee102 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70739da657f41ba15886961e86940f163b512be8 + 4fbf4f02cb39f77b5cd73723483fc4f8bd2ee102 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 3afc3513e29bb157c2437ab3564fe0a622fe2ccc + 7749c2fd98d96e7d69850877111d6a41efabb714 diff --git a/eng/Versions.props b/eng/Versions.props index 08efbd8be0e0..428c22d5234a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22410.25 - 6.0.401-servicing.22410.25 + 6.0.401-servicing.22411.17 + 6.0.401-servicing.22411.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 920bfed5173645104c2e63e3b2b2c403bc017794 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Aug 2022 14:48:07 +0000 Subject: [PATCH 0675/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220812.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22405.1 -> To Version 6.0.0-servicing.22412.1 --- NuGet.config | 8 -------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index b7ec3e5c7700..1f98426d4bde 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -15,13 +14,10 @@ - - - @@ -40,15 +36,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba9d82562502..96d2edc8db91 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 - 3e4a01565292638b4e9841bd4a93f00155ccdebe + 9bac947956fd7af0340208d6bd1bf4ddeb915bdc From e4441170c6a47baff4a7b0e6645f854fdf7f7420 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Aug 2022 17:07:41 +0000 Subject: [PATCH 0676/1244] Update dependencies from https://github.com/dotnet/arcade build 20220811.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22314.7 -> To Version 6.0.0-beta.22411.3 --- NuGet.config | 8 - eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/generate-sbom-prep.ps1 | 2 + eng/common/generate-sbom-prep.sh | 12 ++ eng/common/init-tools-native.ps1 | 144 ++++++++++++------ eng/common/internal/NuGet.config | 7 + eng/common/internal/Tools.csproj | 3 + eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- eng/common/templates/jobs/jobs.yml | 2 +- .../templates/post-build/post-build.yml | 8 +- eng/common/tools.ps1 | 4 + global.json | 4 +- 14 files changed, 142 insertions(+), 70 deletions(-) create mode 100644 eng/common/internal/NuGet.config diff --git a/NuGet.config b/NuGet.config index b7ec3e5c7700..1f98426d4bde 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -15,13 +14,10 @@ - - - @@ -40,15 +36,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba9d82562502..5d29c3c65cc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 778552f02f31d50ec1c3c18a872cc482d04aec75 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 778552f02f31d50ec1c3c18a872cc482d04aec75 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 778552f02f31d50ec1c3c18a872cc482d04aec75 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c4d5e34ff100..c40bd7eb4066 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22314.7 + 6.0.0-beta.22411.3 diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index a733a8885824..3e5c1c74a1c5 100644 --- a/eng/common/generate-sbom-prep.ps1 +++ b/eng/common/generate-sbom-prep.ps1 @@ -2,6 +2,8 @@ Param( [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed ) +. $PSScriptRoot\pipeline-logging-functions.ps1 + Write-Host "Creating dir $ManifestDirPath" # create directory for sbom manifest to be placed if (!(Test-Path -path $ManifestDirPath)) diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index f6c77453142a..d5c76dc827b4 100644 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -2,6 +2,18 @@ source="${BASH_SOURCE[0]}" +# resolve $SOURCE until the file is no longer a symlink +while [[ -h $source ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" +. $scriptroot/pipeline-logging-functions.sh + manifest_dir=$1 if [ ! -d "$manifest_dir" ] ; then diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index db830c00a6f8..7428ef88084f 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -31,6 +31,10 @@ Wait time between retry attempts in seconds .PARAMETER GlobalJsonFile File path to global.json file +.PARAMETER PathPromotion +Optional switch to enable either promote native tools specified in the global.json to the path (in Azure Pipelines) +or break the build if a native tool is not found on the path (on a local dev machine) + .NOTES #> [CmdletBinding(PositionalBinding=$false)] @@ -41,7 +45,8 @@ Param ( [switch] $Force = $False, [int] $DownloadRetries = 5, [int] $RetryWaitTimeInSeconds = 30, - [string] $GlobalJsonFile + [string] $GlobalJsonFile, + [switch] $PathPromotion ) if (!$GlobalJsonFile) { @@ -77,53 +82,100 @@ try { ConvertFrom-Json | Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue if ($NativeTools) { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - $LocalInstallerArguments = @{ ToolName = "$ToolName" } - $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } - $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } - $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } - $LocalInstallerArguments += @{ Version = "$ToolVersion" } - - if ($Verbose) { - $LocalInstallerArguments += @{ Verbose = $True } - } - if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { - if($Force) { - $LocalInstallerArguments += @{ Force = $True } - } - } - if ($Clean) { - $LocalInstallerArguments += @{ Clean = $True } - } - - Write-Verbose "Installing $ToolName version $ToolVersion" - Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" - & $InstallerPath @LocalInstallerArguments - if ($LASTEXITCODE -Ne "0") { - $errMsg = "$ToolName installation failed" - if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { - $showNativeToolsWarning = $true - if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { - $showNativeToolsWarning = $false + if ($PathPromotion -eq $True) { + if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + $InstalledTools = @{} + + if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { + if ($ToolVersion -eq "latest") { + $ToolVersion = "" + } + $ArcadeToolsDirectory = "C:\arcade-tools" + if (-not (Test-Path $ArcadeToolsDirectory)) { + Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." + exit 1 + } + $ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0] + if ([string]::IsNullOrWhiteSpace($ToolDirectory)) { + Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." + exit 1 } - if ($showNativeToolsWarning) { - Write-Warning $errMsg + $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" + if (-not (Test-Path -Path "$BinPathFile")) { + Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." + exit 1 } - $toolInstallationFailure = $true - } else { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host $errMsg - exit 1 + $BinPath = Get-Content "$BinPathFile" + $ToolPath = Convert-Path -Path $BinPath + Write-Host "Adding $ToolName to the path ($ToolPath)..." + Write-Host "##vso[task.prependpath]$ToolPath" + $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } + } } + return $InstalledTools + } else { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + + if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." + } + } + exit 0 + } + } else { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + $LocalInstallerArguments = @{ ToolName = "$ToolName" } + $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } + $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } + $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } + $LocalInstallerArguments += @{ Version = "$ToolVersion" } + + if ($Verbose) { + $LocalInstallerArguments += @{ Verbose = $True } + } + if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { + if($Force) { + $LocalInstallerArguments += @{ Force = $True } + } + } + if ($Clean) { + $LocalInstallerArguments += @{ Clean = $True } + } + + Write-Verbose "Installing $ToolName version $ToolVersion" + Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" + & $InstallerPath @LocalInstallerArguments + if ($LASTEXITCODE -Ne "0") { + $errMsg = "$ToolName installation failed" + if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { + $showNativeToolsWarning = $true + if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { + $showNativeToolsWarning = $false + } + if ($showNativeToolsWarning) { + Write-Warning $errMsg + } + $toolInstallationFailure = $true + } else { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host $errMsg + exit 1 + } + } + } + + if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host 'Native tools bootstrap failed' + exit 1 } - } - - if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host 'Native tools bootstrap failed' - exit 1 } } else { @@ -139,7 +191,7 @@ try { Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)" return $InstallBin } - else { + elseif (-not ($PathPromotion)) { Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed' exit 1 } @@ -149,4 +201,4 @@ catch { Write-Host $_.ScriptStackTrace Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message $_ ExitWithExitCode 1 -} +} \ No newline at end of file diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config new file mode 100644 index 000000000000..19d3d311b166 --- /dev/null +++ b/eng/common/internal/NuGet.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index beb9c4648ea1..7f5ce6d60813 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -8,6 +8,9 @@ + + + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 24cec0424e5d..9ff6a10a682c 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -54,7 +54,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self clean: true diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 9d1e3042d8a6..991ae05f5dbe 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -41,7 +41,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 variables: - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 554e71cfc436..48918df740b9 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -90,7 +90,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 24e92a275a4f..270607126811 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -101,7 +101,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -138,7 +138,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: @@ -198,7 +198,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: @@ -255,7 +255,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index f1e1cb53953b..81d7b0355e38 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -635,6 +635,10 @@ function InitializeNativeTools() { InstallDirectory = "$ToolsDir" } } + if ($env:NativeToolsOnMachine) { + Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..." + $nativeArgs += @{ PathPromotion = $true } + } & "$PSScriptRoot/init-tools-native.ps1" @nativeArgs } } diff --git a/global.json b/global.json index 80e9668ffbf9..bb5632c68512 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.22314.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22314.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22411.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22411.3" } } From b6c55a0822a2d36f30af59f919facda0c26ae014 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Aug 2022 17:56:01 +0000 Subject: [PATCH 0677/1244] [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages --- NuGet.config | 8 -------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 139e6bcf17ea..9a84139e5913 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -39,15 +35,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f97e57ec5ce..6e3f696e7ef8 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 - 08e4967761f81c4c40b6872a0e639b4f588b4f00 + 9bac947956fd7af0340208d6bd1bf4ddeb915bdc From fb29ac89d88e84695eeba04433b14528033b6547 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Aug 2022 17:57:30 +0000 Subject: [PATCH 0678/1244] [internal/release/6.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/generate-sbom-prep.ps1 | 2 + eng/common/generate-sbom-prep.sh | 12 ++ eng/common/init-tools-native.ps1 | 144 ++++++++++++------ eng/common/internal/NuGet.config | 7 + eng/common/internal/Tools.csproj | 3 + eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- eng/common/templates/jobs/jobs.yml | 2 +- .../templates/post-build/post-build.yml | 8 +- eng/common/tools.ps1 | 4 + global.json | 4 +- 13 files changed, 142 insertions(+), 62 deletions(-) create mode 100644 eng/common/internal/NuGet.config diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e3f696e7ef8..70095daeafd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 778552f02f31d50ec1c3c18a872cc482d04aec75 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 778552f02f31d50ec1c3c18a872cc482d04aec75 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 778552f02f31d50ec1c3c18a872cc482d04aec75 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index a1558013b1be..9be1566798b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22314.7 + 6.0.0-beta.22411.3 diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index a733a8885824..3e5c1c74a1c5 100644 --- a/eng/common/generate-sbom-prep.ps1 +++ b/eng/common/generate-sbom-prep.ps1 @@ -2,6 +2,8 @@ Param( [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed ) +. $PSScriptRoot\pipeline-logging-functions.ps1 + Write-Host "Creating dir $ManifestDirPath" # create directory for sbom manifest to be placed if (!(Test-Path -path $ManifestDirPath)) diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index f6c77453142a..d5c76dc827b4 100644 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -2,6 +2,18 @@ source="${BASH_SOURCE[0]}" +# resolve $SOURCE until the file is no longer a symlink +while [[ -h $source ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" +. $scriptroot/pipeline-logging-functions.sh + manifest_dir=$1 if [ ! -d "$manifest_dir" ] ; then diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index db830c00a6f8..7428ef88084f 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -31,6 +31,10 @@ Wait time between retry attempts in seconds .PARAMETER GlobalJsonFile File path to global.json file +.PARAMETER PathPromotion +Optional switch to enable either promote native tools specified in the global.json to the path (in Azure Pipelines) +or break the build if a native tool is not found on the path (on a local dev machine) + .NOTES #> [CmdletBinding(PositionalBinding=$false)] @@ -41,7 +45,8 @@ Param ( [switch] $Force = $False, [int] $DownloadRetries = 5, [int] $RetryWaitTimeInSeconds = 30, - [string] $GlobalJsonFile + [string] $GlobalJsonFile, + [switch] $PathPromotion ) if (!$GlobalJsonFile) { @@ -77,53 +82,100 @@ try { ConvertFrom-Json | Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue if ($NativeTools) { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - $LocalInstallerArguments = @{ ToolName = "$ToolName" } - $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } - $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } - $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } - $LocalInstallerArguments += @{ Version = "$ToolVersion" } - - if ($Verbose) { - $LocalInstallerArguments += @{ Verbose = $True } - } - if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { - if($Force) { - $LocalInstallerArguments += @{ Force = $True } - } - } - if ($Clean) { - $LocalInstallerArguments += @{ Clean = $True } - } - - Write-Verbose "Installing $ToolName version $ToolVersion" - Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" - & $InstallerPath @LocalInstallerArguments - if ($LASTEXITCODE -Ne "0") { - $errMsg = "$ToolName installation failed" - if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { - $showNativeToolsWarning = $true - if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { - $showNativeToolsWarning = $false + if ($PathPromotion -eq $True) { + if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + $InstalledTools = @{} + + if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { + if ($ToolVersion -eq "latest") { + $ToolVersion = "" + } + $ArcadeToolsDirectory = "C:\arcade-tools" + if (-not (Test-Path $ArcadeToolsDirectory)) { + Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." + exit 1 + } + $ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0] + if ([string]::IsNullOrWhiteSpace($ToolDirectory)) { + Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." + exit 1 } - if ($showNativeToolsWarning) { - Write-Warning $errMsg + $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" + if (-not (Test-Path -Path "$BinPathFile")) { + Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." + exit 1 } - $toolInstallationFailure = $true - } else { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host $errMsg - exit 1 + $BinPath = Get-Content "$BinPathFile" + $ToolPath = Convert-Path -Path $BinPath + Write-Host "Adding $ToolName to the path ($ToolPath)..." + Write-Host "##vso[task.prependpath]$ToolPath" + $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } + } } + return $InstalledTools + } else { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + + if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." + } + } + exit 0 + } + } else { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + $LocalInstallerArguments = @{ ToolName = "$ToolName" } + $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } + $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } + $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } + $LocalInstallerArguments += @{ Version = "$ToolVersion" } + + if ($Verbose) { + $LocalInstallerArguments += @{ Verbose = $True } + } + if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { + if($Force) { + $LocalInstallerArguments += @{ Force = $True } + } + } + if ($Clean) { + $LocalInstallerArguments += @{ Clean = $True } + } + + Write-Verbose "Installing $ToolName version $ToolVersion" + Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" + & $InstallerPath @LocalInstallerArguments + if ($LASTEXITCODE -Ne "0") { + $errMsg = "$ToolName installation failed" + if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { + $showNativeToolsWarning = $true + if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { + $showNativeToolsWarning = $false + } + if ($showNativeToolsWarning) { + Write-Warning $errMsg + } + $toolInstallationFailure = $true + } else { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host $errMsg + exit 1 + } + } + } + + if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host 'Native tools bootstrap failed' + exit 1 } - } - - if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host 'Native tools bootstrap failed' - exit 1 } } else { @@ -139,7 +191,7 @@ try { Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)" return $InstallBin } - else { + elseif (-not ($PathPromotion)) { Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed' exit 1 } @@ -149,4 +201,4 @@ catch { Write-Host $_.ScriptStackTrace Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message $_ ExitWithExitCode 1 -} +} \ No newline at end of file diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config new file mode 100644 index 000000000000..19d3d311b166 --- /dev/null +++ b/eng/common/internal/NuGet.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index beb9c4648ea1..7f5ce6d60813 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -8,6 +8,9 @@ + + + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 24cec0424e5d..9ff6a10a682c 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -54,7 +54,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self clean: true diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 9d1e3042d8a6..991ae05f5dbe 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -41,7 +41,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 variables: - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 554e71cfc436..48918df740b9 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -90,7 +90,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 24e92a275a4f..270607126811 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -101,7 +101,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -138,7 +138,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: @@ -198,7 +198,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: @@ -255,7 +255,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index f1e1cb53953b..81d7b0355e38 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -635,6 +635,10 @@ function InitializeNativeTools() { InstallDirectory = "$ToolsDir" } } + if ($env:NativeToolsOnMachine) { + Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..." + $nativeArgs += @{ PathPromotion = $true } + } & "$PSScriptRoot/init-tools-native.ps1" @nativeArgs } } diff --git a/global.json b/global.json index 80e9668ffbf9..bb5632c68512 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.22314.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22314.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22411.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22411.3" } } From dbea761dd97c4f4d231ac8b65f58ae3a1283ad1b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 12 Aug 2022 20:36:24 +0000 Subject: [PATCH 0679/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220812.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22412.14 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22410.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 98d73769fbc6..df8e547da3ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4fbf4f02cb39f77b5cd73723483fc4f8bd2ee102 + 5795d1a9c113121917238ca01069cffcbf0d92c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4fbf4f02cb39f77b5cd73723483fc4f8bd2ee102 + 5795d1a9c113121917238ca01069cffcbf0d92c5 diff --git a/eng/Versions.props b/eng/Versions.props index 428c22d5234a..86db81d6d2c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22411.17 - 6.0.401-servicing.22411.17 + 6.0.401-servicing.22412.14 + 6.0.401-servicing.22412.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 82c049ca1dac1cce94e67ca7c13f5d7d0bb14807 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Aug 2022 23:00:41 +0000 Subject: [PATCH 0680/1244] [internal/release/6.0.3xx] Update dependencies from dotnet/arcade --- 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 70095daeafd8..ceda1d58ed69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 778552f02f31d50ec1c3c18a872cc482d04aec75 + 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/arcade - 778552f02f31d50ec1c3c18a872cc482d04aec75 + 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/arcade - 778552f02f31d50ec1c3c18a872cc482d04aec75 + 41323ecb0b2312980381bfdbb75afd2dae2b266b https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9be1566798b6..18787450d8b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22411.3 + 6.0.0-beta.22412.2 diff --git a/global.json b/global.json index bb5632c68512..0aaa96317da9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.106", + "dotnet": "6.0.108", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22411.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22411.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22412.2" } } From 21b25c7f29760c251d828cc4e95c6a3cecb159c5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Aug 2022 23:05:20 +0000 Subject: [PATCH 0681/1244] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/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 ceda1d58ed69..5699779c43db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d251862fe81655a95aea81683f44ef49f84d3cd7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c42e5ebf0d71359c76fa8465aacd1e2e6e9c7bac + d12e2602ef0c533e47d9d4b21be1e3a64eab9cef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c42e5ebf0d71359c76fa8465aacd1e2e6e9c7bac + d12e2602ef0c533e47d9d4b21be1e3a64eab9cef diff --git a/eng/Versions.props b/eng/Versions.props index 18787450d8b7..d0b920669bb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.303-servicing.22368.20 - 6.0.303-servicing.22368.20 + 6.0.304-servicing.22410.14 + 6.0.304-servicing.22410.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 64d3eb8f661b3faa7fc0dc87a3e50948268d12f3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 13 Aug 2022 00:05:04 +0000 Subject: [PATCH 0682/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220812.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.14 -> To Version 6.0.401-servicing.22412.29 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-3.22411.3 -> To Version 4.3.0-3.22412.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 70a55d2d173c..a852eff8aec7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5795d1a9c113121917238ca01069cffcbf0d92c5 + c9c78ee49c10d7b27bcfa2d1cab364ad133abe98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5795d1a9c113121917238ca01069cffcbf0d92c5 + c9c78ee49c10d7b27bcfa2d1cab364ad133abe98 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 7749c2fd98d96e7d69850877111d6a41efabb714 + c97184bafab9a34d61e85f1c1ef34f25283ce9ba diff --git a/eng/Versions.props b/eng/Versions.props index 44a4185a56d7..117f0babccf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22412.14 - 6.0.401-servicing.22412.14 + 6.0.401-servicing.22412.29 + 6.0.401-servicing.22412.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ba6ba00723487763210b5fc04bbc3196fadaec60 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 13 Aug 2022 06:36:42 +0000 Subject: [PATCH 0683/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220812.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.29 -> To Version 6.0.401-servicing.22412.41 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.8 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index c605aadf24e3..f5ff9f72ae70 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,7 @@ + @@ -41,6 +42,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a852eff8aec7..1080d6d4a533 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9c78ee49c10d7b27bcfa2d1cab364ad133abe98 + c9eb70d0ab5809d89ac68c53f8050ff562a1e539 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9c78ee49c10d7b27bcfa2d1cab364ad133abe98 + c9eb70d0ab5809d89ac68c53f8050ff562a1e539 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms bcdb000de284571bf5267aa3d052dee7918c1e6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7a75fd34f53bc300206bd8cfc636527934dd17af + a0940a4217049e37408907ce806b02c46d6fbaea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 117f0babccf7..f21cb7dfa845 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.8-servicing.22368.7 + 6.0.9-servicing.22412.11 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22412.29 - 6.0.401-servicing.22412.29 + 6.0.401-servicing.22412.41 + 6.0.401-servicing.22412.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.8-servicing.22368.4 - 6.0.8-servicing.22368.4 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22412.14 + 6.0.9-servicing.22412.14 + 6.0.9 + 6.0.9 From 484753e13fb626b9914d2a9ce2da0503a5461e27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Aug 2022 14:24:47 +0000 Subject: [PATCH 0684/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220813.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22405.1 -> To Version 6.0.0-servicing.22413.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 96d2edc8db91..2ef2ea46aa60 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 - 9bac947956fd7af0340208d6bd1bf4ddeb915bdc + 7f458a0923e1984875989573ddbf44457ca97e72 From 68459c79bc79a2bcc0a9e79c3aa11ee85900b919 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 13 Aug 2022 14:24:50 +0000 Subject: [PATCH 0685/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220813.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22412.1 -> To Version 6.0.0-servicing.22413.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 5699779c43db..5fddbc058c78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/source-build-reference-packages - 9bac947956fd7af0340208d6bd1bf4ddeb915bdc + 7f458a0923e1984875989573ddbf44457ca97e72 From e1e2b736749ec615917be13be5587793fef6f1be Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 13 Aug 2022 17:55:10 +0000 Subject: [PATCH 0686/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220813.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.29 -> To Version 6.0.401-servicing.22413.4 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.8 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index f5ff9f72ae70..cdb2f751be84 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,6 +14,8 @@ + + @@ -39,6 +41,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1080d6d4a533..b16c0eabb4ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9eb70d0ab5809d89ac68c53f8050ff562a1e539 + 24f26fa27467ff5b596504fb0489f7656d7fe1c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9eb70d0ab5809d89ac68c53f8050ff562a1e539 + 24f26fa27467ff5b596504fb0489f7656d7fe1c2 diff --git a/eng/Versions.props b/eng/Versions.props index f21cb7dfa845..48b122cde34e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22412.41 - 6.0.401-servicing.22412.41 + 6.0.401-servicing.22413.4 + 6.0.401-servicing.22413.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.8-servicing.22363.6 - 6.0.8-servicing.22363.6 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22412.2 + 6.0.9-servicing.22412.2 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9 2.1.0 From dc8acba32c7706b8545fd32a0766fb32c5509397 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 07:16:41 +0000 Subject: [PATCH 0687/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220814.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.29 -> To Version 6.0.401-servicing.22414.5 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.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.9 (parent: Microsoft.NET.Sdk --- 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 cdb2f751be84..00ac53fccea9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b16c0eabb4ac..2d74fe388a02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 + 30b3bb5110a42021492c8026f2dd6505636ef935 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 + 30b3bb5110a42021492c8026f2dd6505636ef935 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24f26fa27467ff5b596504fb0489f7656d7fe1c2 + 0ebf82ce0798a931f65c4c21296d4b632e55fc91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24f26fa27467ff5b596504fb0489f7656d7fe1c2 + 0ebf82ce0798a931f65c4c21296d4b632e55fc91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcdb000de284571bf5267aa3d052dee7918c1e6e + 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a0940a4217049e37408907ce806b02c46d6fbaea + 40c4c0c7ea7ef93bf9876838aa895402464a69ea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 48b122cde34e..7e88ab0dc47e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.8-servicing.22368.4 + 6.0.9-servicing.22412.3 - 6.0.9-servicing.22412.11 + 6.0.9-servicing.22412.12 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22413.4 - 6.0.401-servicing.22413.4 + 6.0.401-servicing.22414.5 + 6.0.401-servicing.22414.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.9-servicing.22412.14 - 6.0.9-servicing.22412.14 + 6.0.9-servicing.22413.1 + 6.0.9-servicing.22413.1 6.0.9 6.0.9 From 82a4e957b6aac436ad901735e50ea6a590866a3a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 07:18:43 +0000 Subject: [PATCH 0688/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220814.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22410.14 -> To Version 6.0.304-servicing.22414.7 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.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 68 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a84139e5913..58d531df9cc7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -35,11 +39,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5699779c43db..320ffa2a5339 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d251862fe81655a95aea81683f44ef49f84d3cd7 + cbd50f2422f987572071e04b2e26706671529b9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d251862fe81655a95aea81683f44ef49f84d3cd7 + cbd50f2422f987572071e04b2e26706671529b9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d251862fe81655a95aea81683f44ef49f84d3cd7 + cbd50f2422f987572071e04b2e26706671529b9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d12e2602ef0c533e47d9d4b21be1e3a64eab9cef + af2e3b813112dd163712697982a21e6587f0cd80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d12e2602ef0c533e47d9d4b21be1e3a64eab9cef + af2e3b813112dd163712697982a21e6587f0cd80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcdb000de284571bf5267aa3d052dee7918c1e6e + 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7a75fd34f53bc300206bd8cfc636527934dd17af + 40c4c0c7ea7ef93bf9876838aa895402464a69ea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d0b920669bb4..80303103e709 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.8-servicing.22368.4 + 6.0.9-servicing.22412.3 - 6.0.8-servicing.22368.7 + 6.0.9-servicing.22412.12 - 6.0.303 + 6.0.304 @@ -44,20 +44,20 @@ - 6.0.8 - 6.0.8 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 + 6.0.9 + 6.0.9 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 0.2.0 - 6.0.304-servicing.22410.14 - 6.0.304-servicing.22410.14 + 6.0.304-servicing.22414.7 + 6.0.304-servicing.22414.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.8-servicing.22363.6 - 6.0.8-servicing.22363.6 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22413.8 + 6.0.9-servicing.22413.8 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9 2.1.0 - 6.0.8-servicing.22368.4 - 6.0.8-servicing.22368.4 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22413.1 + 6.0.9-servicing.22413.1 + 6.0.9 + 6.0.9 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.303 + 6.0.304 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 389b9280b5ae4d484fc373a5b78af8d5d1a93944 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 08:17:17 +0000 Subject: [PATCH 0689/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220815.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.29 -> To Version 6.0.401-servicing.22415.2 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.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.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 2d74fe388a02..11475fab85c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ebf82ce0798a931f65c4c21296d4b632e55fc91 + 46e77834a7b847579c6f50b132ac2570deaf0616 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ebf82ce0798a931f65c4c21296d4b632e55fc91 + 46e77834a7b847579c6f50b132ac2570deaf0616 diff --git a/eng/Versions.props b/eng/Versions.props index 7e88ab0dc47e..60b938564a02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22414.5 - 6.0.401-servicing.22414.5 + 6.0.401-servicing.22415.2 + 6.0.401-servicing.22415.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0000f7b51543eda9cd6fbfd5fa01e68a1208376e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 18:42:53 +0000 Subject: [PATCH 0690/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220815.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.29 -> To Version 6.0.401-servicing.22415.5 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.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.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 00ac53fccea9..c618bb6e4ed3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,8 +14,7 @@ - - + @@ -41,8 +40,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11475fab85c4..21376019a8c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46e77834a7b847579c6f50b132ac2570deaf0616 + 3543bd0d4f52d89a1981373c20663feef5922736 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46e77834a7b847579c6f50b132ac2570deaf0616 + 3543bd0d4f52d89a1981373c20663feef5922736 diff --git a/eng/Versions.props b/eng/Versions.props index 60b938564a02..9f169dc9ca06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22415.2 - 6.0.401-servicing.22415.2 + 6.0.401-servicing.22415.5 + 6.0.401-servicing.22415.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22412.2 - 6.0.9-servicing.22412.2 + 6.0.9-servicing.22413.8 + 6.0.9-servicing.22413.8 6.0.9 6.0.9 6.0.9 From 3aeea109503ae50b5f217994ec90737f3ccad6f6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 19:46:39 +0000 Subject: [PATCH 0691/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220815.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.29 -> To Version 6.0.401-servicing.22415.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.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.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++++ eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index c618bb6e4ed3..5e7a6aab0e13 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -17,6 +18,7 @@ + @@ -38,10 +40,12 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21376019a8c3..b1a8ae6bc5ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bb5ba57f877b922b418138a969b82b3c1b4e40ad + a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bb5ba57f877b922b418138a969b82b3c1b4e40ad + a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bb5ba57f877b922b418138a969b82b3c1b4e40ad + a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3543bd0d4f52d89a1981373c20663feef5922736 + 0588b782eb99e01f9dff6058a25d86bf397af47c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3543bd0d4f52d89a1981373c20663feef5922736 + 0588b782eb99e01f9dff6058a25d86bf397af47c diff --git a/eng/Versions.props b/eng/Versions.props index 9f169dc9ca06..31f28527a887 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400 + 6.0.401 @@ -44,20 +44,20 @@ - 6.0.8 - 6.0.8 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 + 6.0.9 + 6.0.9 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 0.2.0 - 6.0.401-servicing.22415.5 - 6.0.401-servicing.22415.5 + 6.0.401-servicing.22415.9 + 6.0.401-servicing.22415.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400 + 6.0.401 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From ab13fb50e90766d83f7d8c0e1ab6a38cb30e7d41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 13:27:13 -0700 Subject: [PATCH 0692/1244] Update dependencies from https://github.com/dotnet/arcade build 20220812.2 (#14326) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22412.2 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 0edd2916ae8b..32f7a7f03d67 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 778552f02f31d50ec1c3c18a872cc482d04aec75 + 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/arcade - 778552f02f31d50ec1c3c18a872cc482d04aec75 + 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/arcade - 778552f02f31d50ec1c3c18a872cc482d04aec75 + 41323ecb0b2312980381bfdbb75afd2dae2b266b https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c40bd7eb4066..7f50b8c44d92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22411.3 + 6.0.0-beta.22412.2 diff --git a/global.json b/global.json index bb5632c68512..0aaa96317da9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.106", + "dotnet": "6.0.108", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22411.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22411.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22412.2" } } From c0c8ef424ce48d5ce63577c32c57c5f69b075679 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 20:57:49 +0000 Subject: [PATCH 0693/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220815.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22415.9 -> To Version 6.0.401-servicing.22415.16 Dependency coherency updates Microsoft.Build From Version 17.3.0 -> To Version 17.3.1 (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 5e7a6aab0e13..a242b20b7a3c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 943f534b7036..e1044f42060e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0588b782eb99e01f9dff6058a25d86bf397af47c + ec7f5f3ba4877fd5e4c6d6c26beeb1c72164c467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0588b782eb99e01f9dff6058a25d86bf397af47c + ec7f5f3ba4877fd5e4c6d6c26beeb1c72164c467 @@ -146,9 +146,9 @@ c97184bafab9a34d61e85f1c1ef34f25283ce9ba - + https://github.com/dotnet/msbuild - f67e3d35edb936d1b2d4a00f74be446f5c4ba495 + 2badb37d109910fbd3155cf8743224b7a27494d8 diff --git a/eng/Versions.props b/eng/Versions.props index d988bcb75f7b..841da1ec1963 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22415.9 - 6.0.401-servicing.22415.9 + 6.0.401-servicing.22415.16 + 6.0.401-servicing.22415.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f5c2aabb1aeae44b7d45e6b757f4fbe06fc9b467 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 22:16:28 +0000 Subject: [PATCH 0694/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220815.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22415.16 -> To Version 6.0.401-servicing.22415.19 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- 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 a242b20b7a3c..2bc1ffe759c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1044f42060e..8f1de58f5894 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + b6525b6e5a7c03977c5a32714c69bc140faa7e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + b6525b6e5a7c03977c5a32714c69bc140faa7e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + b6525b6e5a7c03977c5a32714c69bc140faa7e8e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + b6525b6e5a7c03977c5a32714c69bc140faa7e8e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec7f5f3ba4877fd5e4c6d6c26beeb1c72164c467 + c08f831341a15bc9b4d5c33f95e86d8617e3538c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec7f5f3ba4877fd5e4c6d6c26beeb1c72164c467 + c08f831341a15bc9b4d5c33f95e86d8617e3538c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb + 70ab481a2ed42f7766251c73066d47148e902d5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 40c4c0c7ea7ef93bf9876838aa895402464a69ea + 25d1762cda6d0b2b8e29ea08a3bed65e29e8ae04 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 841da1ec1963..e53c0faedb3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22412.3 + 6.0.9-servicing.22412.5 - 6.0.9-servicing.22412.12 + 6.0.9-servicing.22415.2 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22415.16 - 6.0.401-servicing.22415.16 + 6.0.401-servicing.22415.19 + 6.0.401-servicing.22415.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.9-servicing.22413.1 - 6.0.9-servicing.22413.1 + 6.0.9-servicing.22415.4 + 6.0.9-servicing.22415.4 6.0.9 6.0.9 From 0844cbac035fb2854f9df42493f33f56e6a8e134 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 23:13:59 +0000 Subject: [PATCH 0695/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220815.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22415.16 -> To Version 6.0.401-servicing.22415.26 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.9 -> To Version 6.0.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 8f1de58f5894..b5d180866126 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c08f831341a15bc9b4d5c33f95e86d8617e3538c + 9f57ed592a54ea5d8e1b942e84e3accb60eea4e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c08f831341a15bc9b4d5c33f95e86d8617e3538c + 9f57ed592a54ea5d8e1b942e84e3accb60eea4e4 diff --git a/eng/Versions.props b/eng/Versions.props index e53c0faedb3d..754d5e4095af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22415.19 - 6.0.401-servicing.22415.19 + 6.0.401-servicing.22415.26 + 6.0.401-servicing.22415.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a79f67ace3fe49a3dd2433b8daab7a8e5a33c3d9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Aug 2022 11:11:29 +0000 Subject: [PATCH 0696/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22415.26 -> To Version 6.0.401-servicing.22416.6 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-3.22412.4 -> To Version 4.3.0-3.22415.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 b5d180866126..1ad152cccddf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f57ed592a54ea5d8e1b942e84e3accb60eea4e4 + 548c5a3219ee76f082ffc717dfc63546151816b9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f57ed592a54ea5d8e1b942e84e3accb60eea4e4 + 548c5a3219ee76f082ffc717dfc63546151816b9 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - c97184bafab9a34d61e85f1c1ef34f25283ce9ba + 8301d4840fa1a3e822c2cb17fdf7056fa6b41583 diff --git a/eng/Versions.props b/eng/Versions.props index 754d5e4095af..1b05b692e852 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22415.26 - 6.0.401-servicing.22415.26 + 6.0.401-servicing.22416.6 + 6.0.401-servicing.22416.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9518fe3af0e566458623af1308b7da81ac01e5a1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Aug 2022 21:04:56 +0000 Subject: [PATCH 0697/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.6 -> To Version 6.0.401-servicing.22416.14 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.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- 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 2bc1ffe759c7..68a00048fa49 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ad152cccddf..8de59dca7282 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 548c5a3219ee76f082ffc717dfc63546151816b9 + ffcd4da78edf263c16308e54e8c91dffd29f1d24 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 548c5a3219ee76f082ffc717dfc63546151816b9 + ffcd4da78edf263c16308e54e8c91dffd29f1d24 diff --git a/eng/Versions.props b/eng/Versions.props index 1b05b692e852..2a1ba09f09ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 + 6.0.9-servicing.22416.1 + 6.0.9-servicing.22416.1 + 6.0.9-servicing.22416.1 + 6.0.9-servicing.22416.1 0.2.0 - 6.0.401-servicing.22416.6 - 6.0.401-servicing.22416.6 + 6.0.401-servicing.22416.14 + 6.0.401-servicing.22416.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f4d4bc37aab342b18f3a36f7cab7bee5827a402 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Aug 2022 22:14:30 +0000 Subject: [PATCH 0698/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.6 -> To Version 6.0.401-servicing.22416.15 Dependency coherency updates 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 From Version 6.0.9-servicing.22413.8 -> To Version 6.0.9-servicing.22415.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 68a00048fa49..1532c5e31128 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,10 +15,10 @@ - + - + @@ -43,9 +43,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8de59dca7282..c8882bbc5595 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop b6525b6e5a7c03977c5a32714c69bc140faa7e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a01c5a400b9d2802de06d85444835ec280534d82 + 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a01c5a400b9d2802de06d85444835ec280534d82 + 6998c930209fc5adcce334f2cd5931fb7a4d649f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a01c5a400b9d2802de06d85444835ec280534d82 + 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ffcd4da78edf263c16308e54e8c91dffd29f1d24 + 0c6fee16ca0d101edbf5b354b484973f676fdbc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ffcd4da78edf263c16308e54e8c91dffd29f1d24 + 0c6fee16ca0d101edbf5b354b484973f676fdbc7 diff --git a/eng/Versions.props b/eng/Versions.props index 2a1ba09f09ec..5c0c3c328594 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22416.14 - 6.0.401-servicing.22416.14 + 6.0.401-servicing.22416.15 + 6.0.401-servicing.22416.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22413.8 - 6.0.9-servicing.22413.8 + 6.0.9-servicing.22415.12 + 6.0.9-servicing.22415.12 6.0.9 6.0.9 6.0.9 From 99842d4cc100adde0892d68e3b1424b955a33f62 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Aug 2022 23:14:18 +0000 Subject: [PATCH 0699/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.15 -> To Version 6.0.401-servicing.22416.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 c8882bbc5595..6c7303fdc26c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c6fee16ca0d101edbf5b354b484973f676fdbc7 + f524f07a4f755bbe9b50cad934e6036503c46195 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c6fee16ca0d101edbf5b354b484973f676fdbc7 + f524f07a4f755bbe9b50cad934e6036503c46195 diff --git a/eng/Versions.props b/eng/Versions.props index 5c0c3c328594..7c6936239660 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22416.15 - 6.0.401-servicing.22416.15 + 6.0.401-servicing.22416.22 + 6.0.401-servicing.22416.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c6b29ab0fbd2a081b88c7e462c66e1dc59fc50c4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 00:11:52 +0000 Subject: [PATCH 0700/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22414.7 -> To Version 6.0.304-servicing.22416.29 --- 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 333fa587e66f..4cac88e4e1a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating cbd50f2422f987572071e04b2e26706671529b9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - af2e3b813112dd163712697982a21e6587f0cd80 + ebd953524b6b59eb59d6e0e64858e4559ddefef8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - af2e3b813112dd163712697982a21e6587f0cd80 + ebd953524b6b59eb59d6e0e64858e4559ddefef8 diff --git a/eng/Versions.props b/eng/Versions.props index 80303103e709..7dd2b498f6c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22414.7 - 6.0.304-servicing.22414.7 + 6.0.304-servicing.22416.29 + 6.0.304-servicing.22416.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c5e1ec90dde3263bed1c7d43439e8f423e19696c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 00:17:54 +0000 Subject: [PATCH 0701/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.15 -> To Version 6.0.401-servicing.22416.30 --- 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 6c7303fdc26c..da9823be33d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f524f07a4f755bbe9b50cad934e6036503c46195 + 66dec49b894a7c90bff07379c5ffcc1078efe100 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f524f07a4f755bbe9b50cad934e6036503c46195 + 66dec49b894a7c90bff07379c5ffcc1078efe100 diff --git a/eng/Versions.props b/eng/Versions.props index 7c6936239660..a648d7a5f847 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22416.22 - 6.0.401-servicing.22416.22 + 6.0.401-servicing.22416.30 + 6.0.401-servicing.22416.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5be219aaa77cce427e4204ed7d2f4b1f3de504d9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 17:37:49 +0000 Subject: [PATCH 0702/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22417.11 Dependency coherency updates 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 From Version 6.0.9-servicing.22415.12 -> To Version 6.0.9-servicing.22416.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1532c5e31128..ce7604cf1790 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da9823be33d5..3b7a80f9333c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop b6525b6e5a7c03977c5a32714c69bc140faa7e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 66dec49b894a7c90bff07379c5ffcc1078efe100 + c65c0fe91bbb4833bbebc0bd07a6d9a85033233b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 66dec49b894a7c90bff07379c5ffcc1078efe100 + c65c0fe91bbb4833bbebc0bd07a6d9a85033233b diff --git a/eng/Versions.props b/eng/Versions.props index a648d7a5f847..b8fb7c373620 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22416.30 - 6.0.401-servicing.22416.30 + 6.0.401-servicing.22417.11 + 6.0.401-servicing.22417.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22415.12 - 6.0.9-servicing.22415.12 + 6.0.9-servicing.22416.9 + 6.0.9-servicing.22416.9 6.0.9 6.0.9 6.0.9 From 1a7ffaaa4c5c585abf9768eff3cf3d4dd15ba995 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 19:14:40 +0000 Subject: [PATCH 0703/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22417.13 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- 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 ce7604cf1790..9ae6e6b22718 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b7a80f9333c..f324774be2da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b6525b6e5a7c03977c5a32714c69bc140faa7e8e + edefa501d7d9bd9208eb15de3d028e689a427dce - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b6525b6e5a7c03977c5a32714c69bc140faa7e8e + edefa501d7d9bd9208eb15de3d028e689a427dce - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b6525b6e5a7c03977c5a32714c69bc140faa7e8e + edefa501d7d9bd9208eb15de3d028e689a427dce https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b6525b6e5a7c03977c5a32714c69bc140faa7e8e + edefa501d7d9bd9208eb15de3d028e689a427dce https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c65c0fe91bbb4833bbebc0bd07a6d9a85033233b + c41f2c550636c63e3232e84ebb2a4db71202be98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c65c0fe91bbb4833bbebc0bd07a6d9a85033233b + c41f2c550636c63e3232e84ebb2a4db71202be98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 70ab481a2ed42f7766251c73066d47148e902d5e + 491c3f44dc132435722e1b1efe55da8b11be1b28 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 25d1762cda6d0b2b8e29ea08a3bed65e29e8ae04 + 6a23a1d9f93fe4b6de8683ceebd699f68c841e2a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b8fb7c373620..c3e6b88f131a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22412.5 + 6.0.9-servicing.22416.1 - 6.0.9-servicing.22415.2 + 6.0.9-servicing.22416.8 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22417.11 - 6.0.401-servicing.22417.11 + 6.0.401-servicing.22417.13 + 6.0.401-servicing.22417.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.9-servicing.22415.4 - 6.0.9-servicing.22415.4 + 6.0.9-servicing.22416.10 + 6.0.9-servicing.22416.10 6.0.9 6.0.9 From 22f69f63493a4390fcc560c04d3c857b117fd64e Mon Sep 17 00:00:00 2001 From: Joshua Larkin <70237359+j0shuams@users.noreply.github.com> Date: Tue, 16 Aug 2022 14:51:28 -0400 Subject: [PATCH 0704/1244] Update ManualVersions.props for upcoming Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ .../targets/GenerateBundledVersions.targets | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index efb09817fd55..7707ace1a46d 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.26 - 10.0.18362.26 - 10.0.19041.26 - 10.0.20348.26 - 10.0.22000.26 - 10.0.22621.26 + 10.0.17763.27 + 10.0.18362.27 + 10.0.19041.27 + 10.0.20348.27 + 10.0.22000.27 + 10.0.22621.27 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 840a2133bd49..342aa41ec9d6 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -674,11 +674,18 @@ Copyright (c) .NET Foundation. All rights reserved. - - - - - + + + + + + + + + + + + From 6e464725db07de96af01c5a0cea77a5ccf818fbe Mon Sep 17 00:00:00 2001 From: Joshua Larkin <70237359+j0shuams@users.noreply.github.com> Date: Tue, 16 Aug 2022 14:51:28 -0400 Subject: [PATCH 0705/1244] Update ManualVersions.props for upcoming Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ .../targets/GenerateBundledVersions.targets | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index efb09817fd55..7707ace1a46d 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.26 - 10.0.18362.26 - 10.0.19041.26 - 10.0.20348.26 - 10.0.22000.26 - 10.0.22621.26 + 10.0.17763.27 + 10.0.18362.27 + 10.0.19041.27 + 10.0.20348.27 + 10.0.22000.27 + 10.0.22621.27 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index e8948ec0be60..45d27f020208 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -675,11 +675,18 @@ Copyright (c) .NET Foundation. All rights reserved. - - - - - + + + + + + + + + + + + From 5360f4cf1a4ad3b9db95ab4b51d3de42a8815541 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 22:02:52 +0000 Subject: [PATCH 0706/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22417.27 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- 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 9ae6e6b22718..10bd367f6c3a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f324774be2da..dd9deff77d4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c41f2c550636c63e3232e84ebb2a4db71202be98 + 687a73809e097009f580bb7c2ffada11330cd366 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c41f2c550636c63e3232e84ebb2a4db71202be98 + 687a73809e097009f580bb7c2ffada11330cd366 diff --git a/eng/Versions.props b/eng/Versions.props index c3e6b88f131a..e7a0a82c4e82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22416.1 - 6.0.9-servicing.22416.1 - 6.0.9-servicing.22416.1 - 6.0.9-servicing.22416.1 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 0.2.0 - 6.0.401-servicing.22417.13 - 6.0.401-servicing.22417.13 + 6.0.401-servicing.22417.27 + 6.0.401-servicing.22417.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7bd702fbe52607dac3a9bea1b52624e2eb0cdf63 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 23:03:05 +0000 Subject: [PATCH 0707/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.32 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22417.32 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.9 -> To Version 6.0.9 (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 10bd367f6c3a..354037b95286 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd9deff77d4a..bb79a13fdc31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6998c930209fc5adcce334f2cd5931fb7a4d649f + bcbd2e9b360a268f6dccc561da736e08032d58c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6998c930209fc5adcce334f2cd5931fb7a4d649f + bcbd2e9b360a268f6dccc561da736e08032d58c7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6998c930209fc5adcce334f2cd5931fb7a4d649f + bcbd2e9b360a268f6dccc561da736e08032d58c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 687a73809e097009f580bb7c2ffada11330cd366 + 38dae725d01eb7c447b164c28225d80918cf26ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 687a73809e097009f580bb7c2ffada11330cd366 + 38dae725d01eb7c447b164c28225d80918cf26ae diff --git a/eng/Versions.props b/eng/Versions.props index e7a0a82c4e82..3553845cdc78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22417.27 - 6.0.401-servicing.22417.27 + 6.0.401-servicing.22417.32 + 6.0.401-servicing.22417.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1649241f1aa1a87b1be1be11c5081313444609cf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Aug 2022 01:18:07 +0000 Subject: [PATCH 0708/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22416.29 -> To Version 6.0.304-servicing.22417.40 --- 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 4cac88e4e1a2..7d47da84f9f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating cbd50f2422f987572071e04b2e26706671529b9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebd953524b6b59eb59d6e0e64858e4559ddefef8 + 578a3c18d071b8bddde630e34279370ec12a83f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebd953524b6b59eb59d6e0e64858e4559ddefef8 + 578a3c18d071b8bddde630e34279370ec12a83f6 diff --git a/eng/Versions.props b/eng/Versions.props index 7dd2b498f6c5..d5d9ad28c2d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22416.29 - 6.0.304-servicing.22416.29 + 6.0.304-servicing.22417.40 + 6.0.304-servicing.22417.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f7a8d9110c20480735e0f55c964063dd1e241836 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Aug 2022 05:11:07 +0000 Subject: [PATCH 0709/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.44 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22416.29 -> To Version 6.0.304-servicing.22417.44 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.9 -> To Version 6.0.9 (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 58d531df9cc7..0e3004acae76 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 7d47da84f9f6..164f693350f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ca2f1756cdf3a0f6224a0ce94614be877f765318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ca2f1756cdf3a0f6224a0ce94614be877f765318 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + d656a592f211bf88a47ed154ff6f22c65f35e468 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + d656a592f211bf88a47ed154ff6f22c65f35e468 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cbd50f2422f987572071e04b2e26706671529b9d + fcd819eba0ede8e4954e8c9e6307406f8afc4363 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cbd50f2422f987572071e04b2e26706671529b9d + fcd819eba0ede8e4954e8c9e6307406f8afc4363 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cbd50f2422f987572071e04b2e26706671529b9d + fcd819eba0ede8e4954e8c9e6307406f8afc4363 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 578a3c18d071b8bddde630e34279370ec12a83f6 + 889e54d556b6cfafdf16155e7cbf056d2feeb58f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 578a3c18d071b8bddde630e34279370ec12a83f6 + 889e54d556b6cfafdf16155e7cbf056d2feeb58f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb + 5d275019237fbf9f4bf5d867f779c616ec264718 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 40c4c0c7ea7ef93bf9876838aa895402464a69ea + c5b159a97f5af3c690d6515f35241c04c16b2b80 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d5d9ad28c2d9..27a548c0610d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22412.3 + 6.0.9-servicing.22417.1 - 6.0.9-servicing.22412.12 + 6.0.9-servicing.22417.4 @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 0.2.0 - 6.0.304-servicing.22417.40 - 6.0.304-servicing.22417.40 + 6.0.304-servicing.22417.44 + 6.0.304-servicing.22417.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22413.8 - 6.0.9-servicing.22413.8 + 6.0.9-servicing.22416.9 + 6.0.9-servicing.22416.9 6.0.9 6.0.9 6.0.9 @@ -78,8 +78,8 @@ - 6.0.9-servicing.22413.1 - 6.0.9-servicing.22413.1 + 6.0.9-servicing.22417.4 + 6.0.9-servicing.22417.4 6.0.9 6.0.9 From 9d3f9c9bfa1bce717712aaa5dd2e7cc557daf7db Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Aug 2022 05:36:39 +0000 Subject: [PATCH 0710/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.45 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22417.45 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.9 -> To Version 6.0.9 (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 354037b95286..4a687636319d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb79a13fdc31..0d2bbf7fa1c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bcbd2e9b360a268f6dccc561da736e08032d58c7 + 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bcbd2e9b360a268f6dccc561da736e08032d58c7 + 346710a5b64152b6c28e9f7a44cf2ff9162916aa https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bcbd2e9b360a268f6dccc561da736e08032d58c7 + 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38dae725d01eb7c447b164c28225d80918cf26ae + 83df2bf05d92e9e80162d74d6058ea361eea9672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38dae725d01eb7c447b164c28225d80918cf26ae + 83df2bf05d92e9e80162d74d6058ea361eea9672 diff --git a/eng/Versions.props b/eng/Versions.props index 3553845cdc78..b2671867da65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22417.32 - 6.0.401-servicing.22417.32 + 6.0.401-servicing.22417.45 + 6.0.401-servicing.22417.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48d0a3928516768c2ed8affa79c23269a4aa53f6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Aug 2022 06:39:36 +0000 Subject: [PATCH 0711/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.48 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22417.48 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.9 -> To Version 6.0.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 0d2bbf7fa1c8..abce23389c4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 83df2bf05d92e9e80162d74d6058ea361eea9672 + c88d7d9a996738295b12c2cd09f1384926b2dbe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 83df2bf05d92e9e80162d74d6058ea361eea9672 + c88d7d9a996738295b12c2cd09f1384926b2dbe2 diff --git a/eng/Versions.props b/eng/Versions.props index b2671867da65..b91400b46851 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22417.45 - 6.0.401-servicing.22417.45 + 6.0.401-servicing.22417.48 + 6.0.401-servicing.22417.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26e07307a94324564f1932e1376a642d1b70a15b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Aug 2022 09:43:20 +0000 Subject: [PATCH 0712/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220819.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22419.5 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.9 -> To Version 6.0.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 abce23389c4d..1a92896aef54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c88d7d9a996738295b12c2cd09f1384926b2dbe2 + 41ba136a5aed02df450a9ccea2918c809cf84a7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c88d7d9a996738295b12c2cd09f1384926b2dbe2 + 41ba136a5aed02df450a9ccea2918c809cf84a7c diff --git a/eng/Versions.props b/eng/Versions.props index b91400b46851..fc7df88dc836 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22417.48 - 6.0.401-servicing.22417.48 + 6.0.401-servicing.22419.5 + 6.0.401-servicing.22419.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7f52fb2dad1e22d6a0a1232020ce0a91558972fb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Aug 2022 10:52:01 +0000 Subject: [PATCH 0713/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220819.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22417.44 -> To Version 6.0.304-servicing.22419.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 164f693350f9..c406e7655363 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating fcd819eba0ede8e4954e8c9e6307406f8afc4363 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 889e54d556b6cfafdf16155e7cbf056d2feeb58f + 673ba84e4d1e6556ad86432de236f9ba0e74f4f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 889e54d556b6cfafdf16155e7cbf056d2feeb58f + 673ba84e4d1e6556ad86432de236f9ba0e74f4f7 diff --git a/eng/Versions.props b/eng/Versions.props index 27a548c0610d..242c77801c0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22417.44 - 6.0.304-servicing.22417.44 + 6.0.304-servicing.22419.8 + 6.0.304-servicing.22419.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8c233f6049734c2f4ec47d97cdc13c8bf830fcba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 14:37:25 +0000 Subject: [PATCH 0714/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220819.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22413.1 -> To Version 6.0.0-servicing.22419.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 32f7a7f03d67..0ec93ebe3e9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/source-build-reference-packages - 7f458a0923e1984875989573ddbf44457ca97e72 + e2fa1c80dd6776d8b1585f778f703812e3180cbe From 52bfb672d55371b69fd296939d6e52dff1cb73e4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Aug 2022 14:37:44 +0000 Subject: [PATCH 0715/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220819.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22413.1 -> To Version 6.0.0-servicing.22419.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 164f693350f9..69ee7f799025 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/source-build-reference-packages - 7f458a0923e1984875989573ddbf44457ca97e72 + e2fa1c80dd6776d8b1585f778f703812e3180cbe From 6ede5f9946f5ab201477f5535487deba56e6e4b8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 17 Aug 2022 00:28:54 +0000 Subject: [PATCH 0716/1244] Updated TestsToSkipPortableLinux.xml to add a similar test that failed for a similar reason. Likely related to ulimit --- test/SdkTests/TestsToSkipPortableLinux.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/SdkTests/TestsToSkipPortableLinux.xml b/test/SdkTests/TestsToSkipPortableLinux.xml index d0ea16a8d30a..f9fe2c166119 100644 --- a/test/SdkTests/TestsToSkipPortableLinux.xml +++ b/test/SdkTests/TestsToSkipPortableLinux.xml @@ -3,5 +3,9 @@ + + From be22bc7844e7369b680836891f53ed08525c0b2c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 17 Aug 2022 00:28:54 +0000 Subject: [PATCH 0717/1244] Updated TestsToSkipPortableLinux.xml to add a similar test that failed for a similar reason. Likely related to ulimit --- test/SdkTests/TestsToSkipPortableLinux.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/SdkTests/TestsToSkipPortableLinux.xml b/test/SdkTests/TestsToSkipPortableLinux.xml index d0ea16a8d30a..f9fe2c166119 100644 --- a/test/SdkTests/TestsToSkipPortableLinux.xml +++ b/test/SdkTests/TestsToSkipPortableLinux.xml @@ -3,5 +3,9 @@ + + From f01ad81fdd4ffc3ce410ba2f00e510c430001653 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Aug 2022 19:41:50 +0000 Subject: [PATCH 0718/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220819.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.5 -> To Version 6.0.401-servicing.22419.14 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.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- 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 4a687636319d..d6af126eaabb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f649eb3ee46e..9226b8ca23cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + d7028999dec2febc64a5dd51af7f778a2fa2ba82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + d7028999dec2febc64a5dd51af7f778a2fa2ba82 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + d7028999dec2febc64a5dd51af7f778a2fa2ba82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + d7028999dec2febc64a5dd51af7f778a2fa2ba82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + d7028999dec2febc64a5dd51af7f778a2fa2ba82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + d7028999dec2febc64a5dd51af7f778a2fa2ba82 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41ba136a5aed02df450a9ccea2918c809cf84a7c + 52425efdfaa32850a49dca447424a148f51b9090 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41ba136a5aed02df450a9ccea2918c809cf84a7c + 52425efdfaa32850a49dca447424a148f51b9090 diff --git a/eng/Versions.props b/eng/Versions.props index fc7df88dc836..463cfbfbc03e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 + 6.0.9-servicing.22418.24 + 6.0.9-servicing.22418.24 + 6.0.9-servicing.22418.24 + 6.0.9-servicing.22418.24 0.2.0 - 6.0.401-servicing.22419.5 - 6.0.401-servicing.22419.5 + 6.0.401-servicing.22419.14 + 6.0.401-servicing.22419.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 44bbcef141ef427487b1c9cedfbd966ebb61cab8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 19:59:34 +0000 Subject: [PATCH 0719/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220819.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22419.1 -> To Version 6.0.0-servicing.22419.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 0ec93ebe3e9e..ac9751877e8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/source-build-reference-packages - e2fa1c80dd6776d8b1585f778f703812e3180cbe + fdbbfadcaa5804038ad0a3f67c33f489cbeda65c From 3863ed379595705ef9435cf2cc3aed9540b2fa4b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Aug 2022 19:59:37 +0000 Subject: [PATCH 0720/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220819.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22419.1 -> To Version 6.0.0-servicing.22419.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 560f677e303b..5d69647ceed2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/source-build-reference-packages - e2fa1c80dd6776d8b1585f778f703812e3180cbe + fdbbfadcaa5804038ad0a3f67c33f489cbeda65c From 304bf1e408b97d4672f9c47c6afdeaa201a188aa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Aug 2022 20:44:32 +0000 Subject: [PATCH 0721/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220819.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.5 -> To Version 6.0.401-servicing.22419.20 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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 From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- 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 d6af126eaabb..4125dd15b536 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9226b8ca23cc..1cc5e0194bda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edefa501d7d9bd9208eb15de3d028e689a427dce + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edefa501d7d9bd9208eb15de3d028e689a427dce + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edefa501d7d9bd9208eb15de3d028e689a427dce + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edefa501d7d9bd9208eb15de3d028e689a427dce + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 52425efdfaa32850a49dca447424a148f51b9090 + e827623fcb0612646c9effae6da0f0951d75334f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 52425efdfaa32850a49dca447424a148f51b9090 + e827623fcb0612646c9effae6da0f0951d75334f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 491c3f44dc132435722e1b1efe55da8b11be1b28 + 5d275019237fbf9f4bf5d867f779c616ec264718 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6a23a1d9f93fe4b6de8683ceebd699f68c841e2a + c5b159a97f5af3c690d6515f35241c04c16b2b80 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 463cfbfbc03e..bff5a89bf1e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22416.1 + 6.0.9-servicing.22417.1 - 6.0.9-servicing.22416.8 + 6.0.9-servicing.22417.4 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22419.14 - 6.0.401-servicing.22419.14 + 6.0.401-servicing.22419.20 + 6.0.401-servicing.22419.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.9-servicing.22416.10 - 6.0.9-servicing.22416.10 + 6.0.9-servicing.22417.4 + 6.0.9-servicing.22417.4 6.0.9 6.0.9 From 0b307dfabd77cd7e2af29ce35e1655081ae5dbdf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 20 Aug 2022 06:53:55 +0000 Subject: [PATCH 0722/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220819.38 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.20 -> To Version 6.0.401-servicing.22419.38 Dependency coherency updates 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 From Version 6.0.9-servicing.22416.9 -> To Version 6.0.9-servicing.22419.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4125dd15b536..1930fe818342 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cc5e0194bda..1090d776a643 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e827623fcb0612646c9effae6da0f0951d75334f + 5cc1488af94975607dc606204289c98ad541822b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e827623fcb0612646c9effae6da0f0951d75334f + 5cc1488af94975607dc606204289c98ad541822b diff --git a/eng/Versions.props b/eng/Versions.props index bff5a89bf1e1..4c8991084d93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22419.20 - 6.0.401-servicing.22419.20 + 6.0.401-servicing.22419.38 + 6.0.401-servicing.22419.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22416.9 - 6.0.9-servicing.22416.9 + 6.0.9-servicing.22419.5 + 6.0.9-servicing.22419.5 6.0.9 6.0.9 6.0.9 From a246dcf711b441a7f30c59475cb69f9bc607d304 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 20 Aug 2022 07:49:26 +0000 Subject: [PATCH 0723/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220819.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.20 -> To Version 6.0.401-servicing.22419.41 Dependency coherency updates 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 From Version 6.0.9-servicing.22416.9 -> To Version 6.0.9-servicing.22419.5 (parent: Microsoft.NET.Sdk --- 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 1930fe818342..b079642f23b2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1090d776a643..97e50fe1f94f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d7028999dec2febc64a5dd51af7f778a2fa2ba82 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d7028999dec2febc64a5dd51af7f778a2fa2ba82 + 3fe12b935c03138f76364dc877a7e069e254b5b2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d7028999dec2febc64a5dd51af7f778a2fa2ba82 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d7028999dec2febc64a5dd51af7f778a2fa2ba82 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d7028999dec2febc64a5dd51af7f778a2fa2ba82 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d7028999dec2febc64a5dd51af7f778a2fa2ba82 + 3fe12b935c03138f76364dc877a7e069e254b5b2 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5cc1488af94975607dc606204289c98ad541822b + 17c8d8e868c025f01fe3557f5bc75f24ca45bfbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5cc1488af94975607dc606204289c98ad541822b + 17c8d8e868c025f01fe3557f5bc75f24ca45bfbb diff --git a/eng/Versions.props b/eng/Versions.props index 4c8991084d93..ef2091198ff9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22418.24 - 6.0.9-servicing.22418.24 - 6.0.9-servicing.22418.24 - 6.0.9-servicing.22418.24 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 0.2.0 - 6.0.401-servicing.22419.38 - 6.0.401-servicing.22419.38 + 6.0.401-servicing.22419.41 + 6.0.401-servicing.22419.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 63dd000cddc73328b8a1cee6a58b18f2d44e4edf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 21 Aug 2022 06:49:06 +0000 Subject: [PATCH 0724/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220820.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.41 -> To Version 6.0.401-servicing.22420.11 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.401 -> To Version 6.0.401 (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 b079642f23b2..4a5b3e74dcce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97e50fe1f94f..8d07aa36896a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 346710a5b64152b6c28e9f7a44cf2ff9162916aa + 62e67411619cc3cf284e993ce2c2da3e16c69ff0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 346710a5b64152b6c28e9f7a44cf2ff9162916aa + 62e67411619cc3cf284e993ce2c2da3e16c69ff0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 346710a5b64152b6c28e9f7a44cf2ff9162916aa + 62e67411619cc3cf284e993ce2c2da3e16c69ff0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17c8d8e868c025f01fe3557f5bc75f24ca45bfbb + 0bfffee8f673daab0d11a0202e97ddc5d542ec39 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17c8d8e868c025f01fe3557f5bc75f24ca45bfbb + 0bfffee8f673daab0d11a0202e97ddc5d542ec39 diff --git a/eng/Versions.props b/eng/Versions.props index ef2091198ff9..3364af8162f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22419.41 - 6.0.401-servicing.22419.41 + 6.0.401-servicing.22420.11 + 6.0.401-servicing.22420.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b9dc4295d06967a416de81278018603b63c09bf3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 21 Aug 2022 07:48:17 +0000 Subject: [PATCH 0725/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220820.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.41 -> To Version 6.0.401-servicing.22420.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- 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 4a5b3e74dcce..141417d34676 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d07aa36896a..7c572a940b20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 62e67411619cc3cf284e993ce2c2da3e16c69ff0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bfffee8f673daab0d11a0202e97ddc5d542ec39 + ed5baa44710ee9337df44cfd8044e5513dba77ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bfffee8f673daab0d11a0202e97ddc5d542ec39 + ed5baa44710ee9337df44cfd8044e5513dba77ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5d275019237fbf9f4bf5d867f779c616ec264718 + ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c5b159a97f5af3c690d6515f35241c04c16b2b80 + a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3364af8162f4..6ff3ec4abd65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22417.1 + 6.0.9-servicing.22419.10 - 6.0.9-servicing.22417.4 + 6.0.9-servicing.22420.4 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22420.11 - 6.0.401-servicing.22420.11 + 6.0.401-servicing.22420.14 + 6.0.401-servicing.22420.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.9-servicing.22417.4 - 6.0.9-servicing.22417.4 + 6.0.9-servicing.22420.3 + 6.0.9-servicing.22420.3 6.0.9 6.0.9 From e6e304d74f9c1ff52b888081238c0798e8408060 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 21 Aug 2022 16:03:49 +0000 Subject: [PATCH 0726/1244] Merged PR 25178: [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.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.9-servicing.22417.4 to 6.0.9-servicing.22420.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.9-servicing.22417.4 to 6.0.9-servicing.22420.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22416.9 to 6.0.9-servicing.22419.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.9-servicing.22416.9 to 6.0.9-servicing.22419.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.9-servicing.22417.6 to 6.0.9-servicing.22419.26 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22417.6 to 6.0.9-servicing.22419.26 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.9-servicing.22417.6 to 6.0.9-servicing.22419.26 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.9-servicing.22417.6 to 6.0.9-servicing.22419.26 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.304 to 6.0.304 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.304-servicing.22417.12 to 6.0.304-servicing.22420.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.304 to 6.0.304 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22417.1 to 6.0.9-servicing.22419.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from ... --- 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 0e3004acae76..f54130e9c58e 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 5d69647ceed2..0a1fff9945a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fcd819eba0ede8e4954e8c9e6307406f8afc4363 + 1931b9eba8277c76b60fbde1f9d5d759b9d5b0ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fcd819eba0ede8e4954e8c9e6307406f8afc4363 + 1931b9eba8277c76b60fbde1f9d5d759b9d5b0ad https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fcd819eba0ede8e4954e8c9e6307406f8afc4363 + 1931b9eba8277c76b60fbde1f9d5d759b9d5b0ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 673ba84e4d1e6556ad86432de236f9ba0e74f4f7 + bc6e6263c944d60b04685c6cc6389fd51a1773bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 673ba84e4d1e6556ad86432de236f9ba0e74f4f7 + bc6e6263c944d60b04685c6cc6389fd51a1773bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5d275019237fbf9f4bf5d867f779c616ec264718 + ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c5b159a97f5af3c690d6515f35241c04c16b2b80 + a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 242c77801c0b..edb0cba176fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22417.1 + 6.0.9-servicing.22419.10 - 6.0.9-servicing.22417.4 + 6.0.9-servicing.22420.4 @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 0.2.0 - 6.0.304-servicing.22419.8 - 6.0.304-servicing.22419.8 + 6.0.304-servicing.22420.10 + 6.0.304-servicing.22420.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22416.9 - 6.0.9-servicing.22416.9 + 6.0.9-servicing.22419.5 + 6.0.9-servicing.22419.5 6.0.9 6.0.9 6.0.9 @@ -78,8 +78,8 @@ - 6.0.9-servicing.22417.4 - 6.0.9-servicing.22417.4 + 6.0.9-servicing.22420.3 + 6.0.9-servicing.22420.3 6.0.9 6.0.9 From 1474578b5d34ea044b2ce536375203bbfa00c0aa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 21 Aug 2022 17:06:53 +0000 Subject: [PATCH 0727/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220821.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.41 -> To Version 6.0.401-servicing.22421.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.9 -> To Version 6.0.9 (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 141417d34676..1cd04a9278b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c572a940b20..d5c2ce963537 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 62e67411619cc3cf284e993ce2c2da3e16c69ff0 + 4ac7f473472dd810f75a183a760c16990c78fe34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 62e67411619cc3cf284e993ce2c2da3e16c69ff0 + 4ac7f473472dd810f75a183a760c16990c78fe34 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 62e67411619cc3cf284e993ce2c2da3e16c69ff0 + 4ac7f473472dd810f75a183a760c16990c78fe34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed5baa44710ee9337df44cfd8044e5513dba77ef + 18485c488a5469beb10ad61263885275f2d3b170 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed5baa44710ee9337df44cfd8044e5513dba77ef + 18485c488a5469beb10ad61263885275f2d3b170 diff --git a/eng/Versions.props b/eng/Versions.props index 6ff3ec4abd65..3423f92402e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22420.14 - 6.0.401-servicing.22420.14 + 6.0.401-servicing.22421.5 + 6.0.401-servicing.22421.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d7151f758e12f3e7b8f4b9fe2b27e45decfc773b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 22 Aug 2022 02:41:08 +0000 Subject: [PATCH 0728/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220821.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22420.10 -> To Version 6.0.304-servicing.22421.4 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.304 -> To Version 6.0.304 (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 f54130e9c58e..12bf3543cb17 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 0a1fff9945a8..34b38836f4b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1931b9eba8277c76b60fbde1f9d5d759b9d5b0ad + 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1931b9eba8277c76b60fbde1f9d5d759b9d5b0ad + 0b3a1bf29b9888fb2ae25df25be9f5231606c66f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1931b9eba8277c76b60fbde1f9d5d759b9d5b0ad + 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc6e6263c944d60b04685c6cc6389fd51a1773bb + 092f7d6f55df8dd0e5e88058aeb7f831679112d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc6e6263c944d60b04685c6cc6389fd51a1773bb + 092f7d6f55df8dd0e5e88058aeb7f831679112d3 diff --git a/eng/Versions.props b/eng/Versions.props index edb0cba176fd..33a74cb2a8a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22420.10 - 6.0.304-servicing.22420.10 + 6.0.304-servicing.22421.4 + 6.0.304-servicing.22421.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 69459735fbc1c6397d95c554c6af59e334f9541a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 31 Aug 2022 13:09:27 +0000 Subject: [PATCH 0729/1244] [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 12bf3543cb17..6a32b7c9461c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -18,9 +19,11 @@ + + @@ -39,14 +42,17 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34b38836f4b6..86b8156c0aa0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/source-build-reference-packages - fdbbfadcaa5804038ad0a3f67c33f489cbeda65c + e45e6e20c7c079c96f4dc8c35d6346ab9b2d745f From ddfb6a9e0568fa834eb3eef746e821aa1c2aaf53 Mon Sep 17 00:00:00 2001 From: Alex Perovich Date: Wed, 31 Aug 2022 17:17:51 -0700 Subject: [PATCH 0730/1244] 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 4a2f5d8bff75..4077508861d9 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 5cd5325d7b4e..88f6f75a622d 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 4f993567ff70..8efb389d3249 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 2cf4ad6288ce..e5e4f7e9a052 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 95d55b351e51ce8465cf094db0c8d132e80a8140 Mon Sep 17 00:00:00 2001 From: Alex Perovich Date: Wed, 31 Aug 2022 17:18:01 -0700 Subject: [PATCH 0731/1244] 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 c2af3ac8d2cb..c43b604571d8 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 5cd5325d7b4e..88f6f75a622d 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 4f993567ff70..8efb389d3249 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 2cf4ad6288ce..e5e4f7e9a052 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 956a61ea043939ddc703a562d63df492f1fcfee4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 1 Sep 2022 18:00:10 +0000 Subject: [PATCH 0732/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220901.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.304-servicing.22451.9 --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6a32b7c9461c..ad2f8ae6cffb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -19,10 +20,12 @@ + + @@ -43,16 +46,19 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86b8156c0aa0..54b864de2bec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 092f7d6f55df8dd0e5e88058aeb7f831679112d3 + 9cff9ad9aa309210b0f98d50793b0d77d60db2a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 092f7d6f55df8dd0e5e88058aeb7f831679112d3 + 9cff9ad9aa309210b0f98d50793b0d77d60db2a9 diff --git a/eng/Versions.props b/eng/Versions.props index 33a74cb2a8a2..e0008f96d1ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22421.4 - 6.0.304-servicing.22421.4 + 6.0.304-servicing.22451.9 + 6.0.304-servicing.22451.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 97aa46b7d2cf2d52ced9cbb3644e643e27e3576d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Sep 2022 10:31:38 -0700 Subject: [PATCH 0733/1244] 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 a1558013b1be..319168073b03 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 b1ee7db7b0397deed473ddd25ab42855daae086a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Sep 2022 10:31:43 -0700 Subject: [PATCH 0734/1244] Update branding to 6.0.402 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7f50b8c44d92..345614c44e73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 24a4bb58f05c131655604a5af3f146102df2a6f8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 6 Sep 2022 21:34:39 +0000 Subject: [PATCH 0735/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220906.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22456.40 --- 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 54b864de2bec..3b89085e44fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9cff9ad9aa309210b0f98d50793b0d77d60db2a9 + d226374650a977614902a2ddea8e589deb32e44b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9cff9ad9aa309210b0f98d50793b0d77d60db2a9 + d226374650a977614902a2ddea8e589deb32e44b diff --git a/eng/Versions.props b/eng/Versions.props index e0008f96d1ff..ad12381ecd16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22451.9 - 6.0.304-servicing.22451.9 + 6.0.305-servicing.22456.40 + 6.0.305-servicing.22456.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d10c9b78712fcf73b71a40f5056a4ccdc2d91a61 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Sep 2022 08:49:12 +0000 Subject: [PATCH 0736/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220907.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22457.5 --- 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 3b89085e44fd..ed786cda7b87 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d226374650a977614902a2ddea8e589deb32e44b + 7f19abf7f493242f40ab396b90062021906fa006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d226374650a977614902a2ddea8e589deb32e44b + 7f19abf7f493242f40ab396b90062021906fa006 diff --git a/eng/Versions.props b/eng/Versions.props index ad12381ecd16..5151a7cf6195 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22456.40 - 6.0.305-servicing.22456.40 + 6.0.305-servicing.22457.5 + 6.0.305-servicing.22457.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7a7236272ebb20a6e7216078ac076319e5726c18 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 8 Sep 2022 22:07:13 +0000 Subject: [PATCH 0737/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220908.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22458.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 ed786cda7b87..b7c9003dd2e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f19abf7f493242f40ab396b90062021906fa006 + 1c570494e29a40805eb76981495879001a9f888a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f19abf7f493242f40ab396b90062021906fa006 + 1c570494e29a40805eb76981495879001a9f888a diff --git a/eng/Versions.props b/eng/Versions.props index 5151a7cf6195..2ead6c535bef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22457.5 - 6.0.305-servicing.22457.5 + 6.0.305-servicing.22458.13 + 6.0.305-servicing.22458.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4ba209a45acc8e407d607a4a0a066df5c1584b6b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 13 Sep 2022 00:20:00 +0000 Subject: [PATCH 0738/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220912.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22462.31 --- 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 b7c9003dd2e2..1a66bf53d685 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c570494e29a40805eb76981495879001a9f888a + 4f67b114acf888f646ad8c9f58e0c14069d8daf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c570494e29a40805eb76981495879001a9f888a + 4f67b114acf888f646ad8c9f58e0c14069d8daf3 diff --git a/eng/Versions.props b/eng/Versions.props index 2ead6c535bef..aca8dc7f60a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22458.13 - 6.0.305-servicing.22458.13 + 6.0.305-servicing.22462.31 + 6.0.305-servicing.22462.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From be85081b6f4b8be50c991a650b9453597ff690eb Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 11 Aug 2022 16:41:17 -0700 Subject: [PATCH 0739/1244] use mktemp to correctly use temp files --- src/redist/targets/packaging/deb/postinst | 3 +-- src/redist/targets/packaging/osx/clisdk/scripts/postinstall | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/packaging/deb/postinst b/src/redist/targets/packaging/deb/postinst index 142daff4e115..ff22bcbc15f4 100644 --- a/src/redist/targets/packaging/deb/postinst +++ b/src/redist/targets/packaging/deb/postinst @@ -22,6 +22,5 @@ first_run() { /usr/share/dotnet/dotnet exec /usr/share/dotnet/sdk/%SDK_VERSION%/dotnet.dll internal-reportinstallsuccess "debianpackage" > /dev/null 2>&1 || true } -INSTALL_TEMP_HOME=/tmp/dotnet-installer -[ -d $INSTALL_TEMP_HOME ] || mkdir $INSTALL_TEMP_HOME +INSTALL_TEMP_HOME=$(mktemp -d) # mktemp should set 700 perm automatically HOME=$INSTALL_TEMP_HOME first_run diff --git a/src/redist/targets/packaging/osx/clisdk/scripts/postinstall b/src/redist/targets/packaging/osx/clisdk/scripts/postinstall index 28339be99437..86710223debc 100644 --- a/src/redist/targets/packaging/osx/clisdk/scripts/postinstall +++ b/src/redist/targets/packaging/osx/clisdk/scripts/postinstall @@ -12,7 +12,7 @@ first_run() { $INSTALL_DESTINATION/dotnet exec $INSTALL_DESTINATION/sdk/%SDK_VERSION%/dotnet.dll internal-reportinstallsuccess "$1" > /dev/null 2>&1 || true } -[ -d $INSTALL_TEMP_HOME ] || mkdir $INSTALL_TEMP_HOME +INSTALL_TEMP_HOME=$(mktemp -d) # mktemp should set 700 perm automatically HOME=$INSTALL_TEMP_HOME first_run exit 0 From 05ac09da1c2c439a594e9e8903619691b698efbd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 13 Sep 2022 23:54:36 +0000 Subject: [PATCH 0740/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220913.34 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.34 --- NuGet.config | 2 -- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad2f8ae6cffb..ec93b2fb5591 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,6 @@ - @@ -50,7 +49,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a66bf53d685..2a6ef293f51f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f67b114acf888f646ad8c9f58e0c14069d8daf3 + 0e4434b5bf3a705168fa40e9c5246e9382e5c623 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f67b114acf888f646ad8c9f58e0c14069d8daf3 + 0e4434b5bf3a705168fa40e9c5246e9382e5c623 diff --git a/eng/Versions.props b/eng/Versions.props index aca8dc7f60a2..e27cf69e7828 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22462.31 - 6.0.305-servicing.22462.31 + 6.0.305-servicing.22463.34 + 6.0.305-servicing.22463.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b45ac4a743f7ff12a1a11e75e6dcb73c1926542f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 00:56:34 +0000 Subject: [PATCH 0741/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220913.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.41 --- 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 2a6ef293f51f..6b62df2cb07b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e4434b5bf3a705168fa40e9c5246e9382e5c623 + 93fa53773217a253adce7ea28a794ba7920a5919 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e4434b5bf3a705168fa40e9c5246e9382e5c623 + 93fa53773217a253adce7ea28a794ba7920a5919 diff --git a/eng/Versions.props b/eng/Versions.props index e27cf69e7828..444ee8c72081 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22463.34 - 6.0.305-servicing.22463.34 + 6.0.305-servicing.22463.41 + 6.0.305-servicing.22463.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 952fd4a43af24fff86fdced90561871c95459ac1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 16:08:36 +0000 Subject: [PATCH 0742/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220914.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22464.21 Dependency coherency updates NuGet.Build.Tasks From Version 6.2.1-rc.7 -> To Version 6.2.2-rc.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ------------ eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index ec93b2fb5591..71373bd88f28 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,14 +18,8 @@ - - - - - - @@ -50,14 +44,8 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b62df2cb07b..b1f270b6ce4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93fa53773217a253adce7ea28a794ba7920a5919 + 2336f3adc98fface4160b2265684b302bf642fbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93fa53773217a253adce7ea28a794ba7920a5919 + 2336f3adc98fface4160b2265684b302bf642fbd @@ -151,9 +151,9 @@ 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b - - https://github.com/nuget/nuget.client - 4be14ee6b6587a02f05337505bd840fbcbe898f6 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 027ca8b8ef4b4dc94995f87b9c441d2bcf742c1d diff --git a/eng/Versions.props b/eng/Versions.props index 444ee8c72081..a59824852e2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22463.41 - 6.0.305-servicing.22463.41 + 6.0.305-servicing.22464.21 + 6.0.305-servicing.22464.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ed6ae3ed1e290e2ed6f8041dcea507b2545af939 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 14 Sep 2022 10:00:10 -0700 Subject: [PATCH 0743/1244] [6.0.4] Update template versions from dotnet/aspnetcore (#14487) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ae2b861d3721..275a86d09458 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 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 0744/1244] [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 319168073b03..642cee329691 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 From 62d0b8c97fcb18d33b37442131c8daf49a94961d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 19:03:04 +0000 Subject: [PATCH 0745/1244] Update dependencies from https://github.com/dotnet/arcade build 20220913.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/source-build.yml | 4 ++-- eng/common/templates/jobs/jobs.yml | 2 +- eng/common/templates/post-build/post-build.yml | 8 ++++---- global.json | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1f270b6ce4d..1155b51b1e06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b5bc60221ecd..29f8395ed093 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22412.2 + 6.0.0-beta.22463.7 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 9ff6a10a682c..aaeb83b4dcbd 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -53,7 +53,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 88f6f75a622d..b6137f44ada1 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,10 +46,10 @@ jobs: # source-build builds run in Docker, including the default managed platform. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 48918df740b9..9c4becbc8592 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -89,7 +89,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 270607126811..fc022ca9b266 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -100,7 +100,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -137,7 +137,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -197,7 +197,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -254,7 +254,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml diff --git a/global.json b/global.json index 0aaa96317da9..9d1e2d901e8f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.108", + "dotnet": "6.0.109", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22412.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22463.7" } } From 5364e129c0437529cda530286ce1619c28d53a30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Sep 2022 14:36:17 -0700 Subject: [PATCH 0746/1244] Update dependencies from https://github.com/dotnet/arcade build 20220913.7 (#14499) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 11 ++++------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- eng/common/templates/job/source-build.yml | 4 ++-- eng/common/templates/jobs/jobs.yml | 2 +- eng/common/templates/post-build/post-build.yml | 8 ++++---- global.json | 6 +++--- 9 files changed, 23 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1cd04a9278b4..71373bd88f28 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,18 @@ + + - - - - @@ -40,15 +38,14 @@ + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7e2e834bd21..2b8705345ef9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 275a86d09458..eb64e689ff85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22412.2 + 6.0.0-beta.22463.7 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 9ff6a10a682c..aaeb83b4dcbd 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -53,7 +53,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 991ae05f5dbe..5b1b77d1c74a 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -40,7 +40,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 variables: diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 88f6f75a622d..b6137f44ada1 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,10 +46,10 @@ jobs: # source-build builds run in Docker, including the default managed platform. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 48918df740b9..9c4becbc8592 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -89,7 +89,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 270607126811..fc022ca9b266 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -100,7 +100,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -137,7 +137,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -197,7 +197,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -254,7 +254,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml diff --git a/global.json b/global.json index 0aaa96317da9..9d1e2d901e8f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.108", + "dotnet": "6.0.109", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22412.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22463.7" } } From ba3be673e17014b831f7f059c6f872fc5e9b62a8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 15:57:48 +0000 Subject: [PATCH 0747/1244] Merged PR 25512: [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**: 20220914.1 - **Date Produced**: September 14, 2022 8:48:10 PM UTC - **Commit**: 59e601c150793f6a32cd39e598ba6fe94edfe21d - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22426.1 to 6.0.0-servicing.22464.1][5] [5]: https://github.com/dotnet/source-build-reference-packages/compare/e45e6e2...59e601c [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 2aebca1c2416..d0db176cc0a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/source-build-reference-packages - e45e6e20c7c079c96f4dc8c35d6346ab9b2d745f + 59e601c150793f6a32cd39e598ba6fe94edfe21d From 235e79474031bc4e9bfa3a52ff6d4eefbe552e73 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 15:58:42 +0000 Subject: [PATCH 0748/1244] Merged PR 25952: [internal/release/6.0.4xx] 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.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.FSharp.Compiler**: from 12.0.4-beta.22410.1 to 12.0.4-beta.22469.1 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 6.0.6-beta.22410.1 to 6.0.6-beta.22469.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Test.Sdk**: from 17.3.0 to 17.3.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.3.0-3.22415.1 to 4.3.0-3.22465.2 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.3.1 to 17.3.2 (parent: Microsoft.NET.Sdk) - **NuGet.Build.Tasks**: from 6.3.0-rc.128 to 6.3.1-rc.1 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20220919.15 - **Date Produced**: September 19, 2022 7:26:07 PM UTC - **Commit**: c3e567c3e17db9915a5b301c3e982bebc26c8459 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.401-servicing.22421.5 to 6.0.402-servicing.22469.15][1] - **Microsoft.NET.Sdk**: [from 6.0.401-servicing.22421.5 to 6.0.402-servicing.22469.15][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][2] - **Microsoft.WindowsDesk... --- NuGet.config | 14 ++++++----- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------ 3 files changed, 44 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 71373bd88f28..6acd09ccfcca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,19 @@ - - - + + + @@ -37,15 +37,17 @@ + + + + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b8705345ef9..e986abf93773 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,36 +103,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4ac7f473472dd810f75a183a760c16990c78fe34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18485c488a5469beb10ad61263885275f2d3b170 + cf925f705c9a47e0d45bdb7f97445bfaf8dedbd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18485c488a5469beb10ad61263885275f2d3b170 + cf925f705c9a47e0d45bdb7f97445bfaf8dedbd8 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c + ee8dec2e3ed2d73d8f7b7bea5662c2222d1fd182 - + https://github.com/dotnet/fsharp - d5218142e9d56ab25bb5d0034a77484be4dd7c17 + 4438112ed8e103d9af4fb0fd8d593a4e7f6777d2 - + https://github.com/dotnet/fsharp - d5218142e9d56ab25bb5d0034a77484be4dd7c17 + 4438112ed8e103d9af4fb0fd8d593a4e7f6777d2 - + https://github.com/microsoft/vstest - c7ba2ca721808f830482ace6be06ae93077e0e7b + 83d2f8162d29a66a8ff323c4bba93c8250013511 @@ -141,19 +141,19 @@ linker - + https://github.com/dotnet/roslyn - 8301d4840fa1a3e822c2cb17fdf7056fa6b41583 + 7d8de40e2bfe5bd2546ca49177166741af4c8e07 - - https://github.com/dotnet/msbuild - 2badb37d109910fbd3155cf8743224b7a27494d8 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 561848881bab01749e6d8b03be2869a18ca944f7 - - https://github.com/nuget/nuget.client - 222ff7a5329be15520034b76fa1a84098d2ae9fd + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 01bc4df1ef99c9c213f892ec8b25e46b23c7cfb1 diff --git a/eng/Versions.props b/eng/Versions.props index eb64e689ff85..53dfce5c24d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.9-servicing.22420.4 + 6.0.10-servicing.22456.13 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22421.5 - 6.0.401-servicing.22421.5 + 6.0.402-servicing.22469.37 + 6.0.402-servicing.22469.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.9-servicing.22420.3 - 6.0.9-servicing.22420.3 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22464.9 + 6.0.10-servicing.22464.9 + 6.0.10 + 6.0.10 @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0 + 17.3.1 From ef06dab37f96319e1b09a6828945b6efea8f843b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 18:04:39 +0000 Subject: [PATCH 0749/1244] Merged PR 25953: [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.Build**: from 17.2.0 to 17.2.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**: 20220919.16 - **Date Produced**: September 19, 2022 7:26:24 PM UTC - **Commit**: edd49c1bacac9342e15445a777722858e7f5fddf - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22464.21 to 6.0.305-servicing.22469.16][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22464.21 to 6.0.305-servicing.22469.16][1] - **Microsoft.Build**: [from 17.2.0 to 17.2.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2336f3a&targetVersion=GCedd49c1&_a=files [2]: https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted/branches?baseVersion=GC41abc56&targetVersion=GC038f9ba&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 71373bd88f28..36197c18ee21 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,12 @@ - - - + + @@ -37,10 +36,11 @@ + + + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0db176cc0a8..5128fedf64ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2336f3adc98fface4160b2265684b302bf642fbd + edd49c1bacac9342e15445a777722858e7f5fddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2336f3adc98fface4160b2265684b302bf642fbd + edd49c1bacac9342e15445a777722858e7f5fddf @@ -146,9 +146,9 @@ 432d17a83aa5623e4581756f4d642997048056bd - - https://github.com/dotnet/msbuild - 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 038f9bae9b34d1cca653360a46c5ce1eba4c2ac8 diff --git a/eng/Versions.props b/eng/Versions.props index 29f8395ed093..58f127efe4e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22464.21 - 6.0.305-servicing.22464.21 + 6.0.305-servicing.22469.16 + 6.0.305-servicing.22469.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a3037401514f1f6652671a33dae3b3f5bbcc7df1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 19:22:31 +0000 Subject: [PATCH 0750/1244] Merged PR 26000: [internal/release/6.0.4xx] 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.401 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.401-rtm.22420.12 to 6.0.402-rtm.22469.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.401 to 6.0.402 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20220920.13 - **Date Produced**: September 20, 2022 3:54:18 PM UTC - **Commit**: 104cf6c83a671272ac7ab8b7d8792025de764576 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.402-servicing.22469.37 to 6.0.402-servicing.22470.13][1] - **Microsoft.NET.Sdk**: [from 6.0.402-servicing.22469.37 to 6.0.402-servicing.22470.13][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.401 to 6.0.402][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.401-rtm.22420.12 to 6.0.402-rtm.22469.18][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.401 to 6.0.402][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCcf925f7&targetVersion=GC104cf6c&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC4ac7f47&targetVersion=GC4bd73a1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 6acd09ccfcca..ae933ee91ce6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,6 +17,7 @@ + @@ -45,6 +46,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e986abf93773..89c1a493d98d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ac7f473472dd810f75a183a760c16990c78fe34 + 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ac7f473472dd810f75a183a760c16990c78fe34 + 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ac7f473472dd810f75a183a760c16990c78fe34 + 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf925f705c9a47e0d45bdb7f97445bfaf8dedbd8 + 104cf6c83a671272ac7ab8b7d8792025de764576 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf925f705c9a47e0d45bdb7f97445bfaf8dedbd8 + 104cf6c83a671272ac7ab8b7d8792025de764576 diff --git a/eng/Versions.props b/eng/Versions.props index 53dfce5c24d9..da4fa4576b65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.401 + 6.0.402 @@ -56,8 +56,8 @@ - 6.0.402-servicing.22469.37 - 6.0.402-servicing.22469.37 + 6.0.402-servicing.22470.13 + 6.0.402-servicing.22470.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.401 + 6.0.402 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 1e97ca8042e6c35aa6a4365e8ee92eaadc846d4d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 22:44:00 +0000 Subject: [PATCH 0751/1244] Merged PR 26033: [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.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.304 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.304-servicing.22420.10 to 6.0.305-servicing.22470.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.304 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win... --- NuGet.config | 8 ++++ eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 79 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36197c18ee21..e0141f88ebf6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -15,10 +16,13 @@ + + + @@ -41,11 +45,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5128fedf64ab..c9216ca47baf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b3a1bf29b9888fb2ae25df25be9f5231606c66f + a596312f285b849740c070b3b9f0825dc0ba84cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b3a1bf29b9888fb2ae25df25be9f5231606c66f + a596312f285b849740c070b3b9f0825dc0ba84cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b3a1bf29b9888fb2ae25df25be9f5231606c66f + a596312f285b849740c070b3b9f0825dc0ba84cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edd49c1bacac9342e15445a777722858e7f5fddf + fea45187a3648a964eb48f1c3cbbac1f59ae8a85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edd49c1bacac9342e15445a777722858e7f5fddf + fea45187a3648a964eb48f1c3cbbac1f59ae8a85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c + 24d64ba63551a0f0457d62b834d043292d090815 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c + bbe6a9e6d0da0f80a57f80914177691fd1f1b97e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 58f127efe4e9..4c2e4948fabf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.9-servicing.22419.10 + 6.0.10-servicing.22470.3 - 6.0.9-servicing.22420.4 + 6.0.10-servicing.22470.7 - 6.0.304 + 6.0.305 @@ -44,44 +44,44 @@ - 6.0.9 - 6.0.9 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 + 6.0.10 + 6.0.10 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 0.2.0 - 6.0.305-servicing.22469.16 - 6.0.305-servicing.22469.16 + 6.0.305-servicing.22470.36 + 6.0.305-servicing.22470.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.5 + 6.0.6 - 6.0.9-servicing.22419.5 - 6.0.9-servicing.22419.5 - 6.0.9 - 6.0.9 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22469.10 + 6.0.10-servicing.22469.10 + 6.0.10 + 6.0.10 + 6.0.10 + 6.0.10 2.1.0 - 6.0.9-servicing.22420.3 - 6.0.9-servicing.22420.3 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22470.9 + 6.0.10-servicing.22470.9 + 6.0.10 + 6.0.10 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.304 + 6.0.305 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From c74f58b3e055436a7425711b181750b942d0ffaa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 23:18:29 +0000 Subject: [PATCH 0752/1244] Merged PR 26035: [internal/release/6.0.4xx] 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.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.402-rtm.22469.18 to 6.0.402-rtm.22470.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: ... --- NuGet.config | 12 ++++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 38 +++++++++--------- 3 files changed, 71 insertions(+), 67 deletions(-) diff --git a/NuGet.config b/NuGet.config index ae933ee91ce6..6ef2f2d6e402 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -15,12 +16,13 @@ + - + - + @@ -43,13 +45,15 @@ + + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89c1a493d98d..a4720d6aae04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac + d8feef05ebeec0092dc708b8f8d20d1c485cf475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac + d8feef05ebeec0092dc708b8f8d20d1c485cf475 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac + d8feef05ebeec0092dc708b8f8d20d1c485cf475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 104cf6c83a671272ac7ab8b7d8792025de764576 + c252faf34d6083db553f573027bc49423c6eb59d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 104cf6c83a671272ac7ab8b7d8792025de764576 + c252faf34d6083db553f573027bc49423c6eb59d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c + 24d64ba63551a0f0457d62b834d043292d090815 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ee8dec2e3ed2d73d8f7b7bea5662c2222d1fd182 + bbe6a9e6d0da0f80a57f80914177691fd1f1b97e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index da4fa4576b65..35666876f868 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22419.10 + 6.0.10-servicing.22470.3 - 6.0.10-servicing.22456.13 + 6.0.10-servicing.22470.7 @@ -44,42 +44,42 @@ - 6.0.9 - 6.0.9 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 + 6.0.10 + 6.0.10 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 0.2.0 - 6.0.402-servicing.22470.13 - 6.0.402-servicing.22470.13 + 6.0.402-servicing.22470.37 + 6.0.402-servicing.22470.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.5 + 6.0.6 - 6.0.9-servicing.22419.5 - 6.0.9-servicing.22419.5 - 6.0.9 - 6.0.9 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22469.10 + 6.0.10-servicing.22469.10 + 6.0.10 + 6.0.10 + 6.0.10 + 6.0.10 2.1.0 - 6.0.10-servicing.22464.9 - 6.0.10-servicing.22464.9 + 6.0.10-servicing.22470.9 + 6.0.10-servicing.22470.9 6.0.10 6.0.10 From a7f3165e1276bbb1b8154e1a587fd81246105545 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 01:07:35 +0000 Subject: [PATCH 0753/1244] Merged PR 26214: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.305 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.305-servicing.22470.3 to 6.0.305-servicing.22476.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.305 to 6.0.305 (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**: 20220926.23 - **Date Produced**: September 26, 2022 11:16:43 PM UTC - **Commit**: 5d8812a013856b4d818578302844a7add0f675f9 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22470.36 to 6.0.305-servicing.22476.23][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22470.36 to 6.0.305-servicing.22476.23][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.305][3] - **Microsoft.TemplateEngine.Cl... --- NuGet.config | 24 ++++++++++++++++++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 8 ++++---- 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0141f88ebf6..19736d26e8e2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,29 @@ + + + + + + - + - + + + @@ -42,17 +50,25 @@ + + + + + + - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9216ca47baf..b2d2a53f7031 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a596312f285b849740c070b3b9f0825dc0ba84cf + 13826b7b41995f89808a7b7644b41a89f81b33b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a596312f285b849740c070b3b9f0825dc0ba84cf + 13826b7b41995f89808a7b7644b41a89f81b33b6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a596312f285b849740c070b3b9f0825dc0ba84cf + 13826b7b41995f89808a7b7644b41a89f81b33b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea45187a3648a964eb48f1c3cbbac1f59ae8a85 + 5d8812a013856b4d818578302844a7add0f675f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea45187a3648a964eb48f1c3cbbac1f59ae8a85 + 5d8812a013856b4d818578302844a7add0f675f9 diff --git a/eng/Versions.props b/eng/Versions.props index 4c2e4948fabf..f3390961a47b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22470.36 - 6.0.305-servicing.22470.36 + 6.0.305-servicing.22476.23 + 6.0.305-servicing.22476.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.10-servicing.22469.10 - 6.0.10-servicing.22469.10 + 6.0.10-servicing.22476.5 + 6.0.10-servicing.22476.5 6.0.10 6.0.10 6.0.10 From 9b4f4ba2f2ef3a1427d41f490146b1a51e1da247 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 01:08:12 +0000 Subject: [PATCH 0754/1244] Merged PR 26215: [internal/release/6.0.4xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.402-rtm.22470.4 to 6.0.402-rtm.22476.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20220926.24 - **Date Produced**: September 26, 2022 11:17:08 PM UTC - **Commit**: da945c96e1700122a8b0847662dbfc4cede39cd6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.402-servicing.22470.37 to 6.0.402-servicing.22476.24][1] - **Microsoft.NET.Sdk**: [from 6.0.402-servicing.22470.37 to 6.0.402-servicing.22476.24][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.402 to 6.0.402][3] - **Microsoft.TemplateEngine.Cli**: [from 6... --- NuGet.config | 24 ++++++++++++++++++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 8 ++++---- 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6ef2f2d6e402..48041fd8b586 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,29 @@ + + + + + + - + - + + + @@ -42,17 +50,25 @@ + + + + + + - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4720d6aae04..b2a449246a51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d8feef05ebeec0092dc708b8f8d20d1c485cf475 + 759d4664e22f40aba187b41a7eae8c5e8b40787c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d8feef05ebeec0092dc708b8f8d20d1c485cf475 + 759d4664e22f40aba187b41a7eae8c5e8b40787c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d8feef05ebeec0092dc708b8f8d20d1c485cf475 + 759d4664e22f40aba187b41a7eae8c5e8b40787c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c252faf34d6083db553f573027bc49423c6eb59d + da945c96e1700122a8b0847662dbfc4cede39cd6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c252faf34d6083db553f573027bc49423c6eb59d + da945c96e1700122a8b0847662dbfc4cede39cd6 diff --git a/eng/Versions.props b/eng/Versions.props index 35666876f868..0cfb3da79c4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.402-servicing.22470.37 - 6.0.402-servicing.22470.37 + 6.0.402-servicing.22476.24 + 6.0.402-servicing.22476.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.10-servicing.22469.10 - 6.0.10-servicing.22469.10 + 6.0.10-servicing.22476.5 + 6.0.10-servicing.22476.5 6.0.10 6.0.10 6.0.10 From ee01434eb368e7c21e0d8cfdf5fc7149ddc886e3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 02:11:34 +0000 Subject: [PATCH 0755/1244] Merged PR 26230: [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.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.305 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.305-servicing.22476.13 to 6.0.305-servicing.22476.20 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.305 to 6.0.305 (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**: 20220926.32 - **Date Produced**: September 27, 2022 1:41:11 AM UTC - **Commit**: 5fd3362390628630252507a10e451f4877afe1c2 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22476.23 to 6.0.305-servicing.22476.32][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22476.23 to 6.0.305-servicing.22476.32][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.305][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.305-servicing.22476.13 to 6.0.305-servicing.2247... --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 19736d26e8e2..6ad4589ff5d0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -25,7 +23,7 @@ - + @@ -57,14 +55,12 @@ - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2d2a53f7031..313ce94922fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13826b7b41995f89808a7b7644b41a89f81b33b6 + 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13826b7b41995f89808a7b7644b41a89f81b33b6 + 4c6436d0fb4378537a091f06432b306ea8ef383e https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13826b7b41995f89808a7b7644b41a89f81b33b6 + 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d8812a013856b4d818578302844a7add0f675f9 + 5fd3362390628630252507a10e451f4877afe1c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d8812a013856b4d818578302844a7add0f675f9 + 5fd3362390628630252507a10e451f4877afe1c2 diff --git a/eng/Versions.props b/eng/Versions.props index f3390961a47b..0b89a0a15c8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 0.2.0 - 6.0.305-servicing.22476.23 - 6.0.305-servicing.22476.23 + 6.0.305-servicing.22476.32 + 6.0.305-servicing.22476.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 68624187969147694f78da1cc12444330b06fb1d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 04:17:27 +0000 Subject: [PATCH 0756/1244] Merged PR 26236: [internal/release/6.0.4xx] 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.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.402-rtm.22476.14 to 6.0.402-rtm.22476.21 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20220926.48 - **Date Produced**: September 27, 2022 3:42:06 AM UTC - **Commit**: 6a3751154ef2a5ab57d4bc3b62c5c8fa2d278ce6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuild... --- NuGet.config | 20 +++++---------- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 3 files changed, 44 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 48041fd8b586..89d231a7f56d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -25,12 +23,10 @@ - + - - - + @@ -57,19 +53,15 @@ - - - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2a449246a51..d0df9460468d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 759d4664e22f40aba187b41a7eae8c5e8b40787c + 32a619c8ec7782b8a9cd2fe6476d25197d2b4c32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 759d4664e22f40aba187b41a7eae8c5e8b40787c + 32a619c8ec7782b8a9cd2fe6476d25197d2b4c32 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 759d4664e22f40aba187b41a7eae8c5e8b40787c + 32a619c8ec7782b8a9cd2fe6476d25197d2b4c32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da945c96e1700122a8b0847662dbfc4cede39cd6 + 6a3751154ef2a5ab57d4bc3b62c5c8fa2d278ce6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da945c96e1700122a8b0847662dbfc4cede39cd6 + 6a3751154ef2a5ab57d4bc3b62c5c8fa2d278ce6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24d64ba63551a0f0457d62b834d043292d090815 + 729cc7ccdec38bb23e6216a371293bb5ce738b5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bbe6a9e6d0da0f80a57f80914177691fd1f1b97e + 3bbc77257e3d51a2e19195523eafd262da1f5459 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0cfb3da79c4c..86f9cd19c4fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.10-servicing.22470.3 + 6.0.10-servicing.22476.6 - 6.0.10-servicing.22470.7 + 6.0.10-servicing.22476.4 @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 0.2.0 - 6.0.402-servicing.22476.24 - 6.0.402-servicing.22476.24 + 6.0.402-servicing.22476.48 + 6.0.402-servicing.22476.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.10-servicing.22470.9 - 6.0.10-servicing.22470.9 + 6.0.10-servicing.22476.6 + 6.0.10-servicing.22476.6 6.0.10 6.0.10 From de9a4b2f4b9f62cdf5b4a94cb66f9125e37b2a5c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 04:17:31 +0000 Subject: [PATCH 0757/1244] Merged PR 26244: [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.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.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**: 20220926.47 - **Date Produced**: September 27, 2022 3:41:49 AM UTC - **Commit**: 0c33071e5eddb592a4b2122ec86afb2163873b6e - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22476.32 to 6.0.305-servicing.22476.47][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22476.32 to 6.0.305-servicing.22476.47][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-... --- NuGet.config | 12 ++++------- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6ad4589ff5d0..02c6d9de015d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -26,9 +26,7 @@ - - - + @@ -55,7 +53,7 @@ - + @@ -63,9 +61,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 313ce94922fa..75778c8578a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5fd3362390628630252507a10e451f4877afe1c2 + 0c33071e5eddb592a4b2122ec86afb2163873b6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5fd3362390628630252507a10e451f4877afe1c2 + 0c33071e5eddb592a4b2122ec86afb2163873b6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24d64ba63551a0f0457d62b834d043292d090815 + 729cc7ccdec38bb23e6216a371293bb5ce738b5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bbe6a9e6d0da0f80a57f80914177691fd1f1b97e + 3bbc77257e3d51a2e19195523eafd262da1f5459 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0b89a0a15c8a..822921a85dee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.10-servicing.22470.3 + 6.0.10-servicing.22476.6 - 6.0.10-servicing.22470.7 + 6.0.10-servicing.22476.4 @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 0.2.0 - 6.0.305-servicing.22476.32 - 6.0.305-servicing.22476.32 + 6.0.305-servicing.22476.47 + 6.0.305-servicing.22476.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.10-servicing.22470.9 - 6.0.10-servicing.22470.9 + 6.0.10-servicing.22476.6 + 6.0.10-servicing.22476.6 6.0.10 6.0.10 From ba1239dfc76c8bf5025f2b96bac7e756fe55138d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Oct 2022 09:37:50 -0700 Subject: [PATCH 0758/1244] Update branding to 6.0.306 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e89b3f2be610..813020d4812d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 19a9961977f6317e47c6a8c42abf1795990f13bf Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Oct 2022 09:37:55 -0700 Subject: [PATCH 0759/1244] Update branding to 6.0.403 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index eb64e689ff85..5cee88b5dba6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From ff52e5614525035e2a8e8ea525b808893f9cda5f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 5 Oct 2022 14:43:28 -0700 Subject: [PATCH 0760/1244] Revert emsdk hash --- 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 b64731aff1a3..2b8705345ef9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 3f6c45a2580cd9387b643163de8136a9691764c8 + 52e9452f82e26f9fcae791e84c082ae22f1ef66f https://github.com/dotnet/source-build From 88bc331e880f561979f76c1d0d53fc824d9bb5a5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 5 Oct 2022 14:45:05 -0700 Subject: [PATCH 0761/1244] Fix emsdk hash I noticed in the codeflow from 3xx to 4xx that the hash got messed up in the process and set to the 6.0.9 one. We don't believe the version needs to be updated but the hashes should match so reverting this. --- 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 b08566090397..ba9c724da822 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 3f6c45a2580cd9387b643163de8136a9691764c8 + 52e9452f82e26f9fcae791e84c082ae22f1ef66f https://github.com/dotnet/source-build From 0fa6d987c6761a714562df70ee80f58187ab59e7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 11 Oct 2022 01:07:10 +0000 Subject: [PATCH 0762/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221010.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.305-servicing.22476.47 -> To Version 6.0.305-servicing.22510.22 --- NuGet.config | 27 ++++++++++++++++++++++++++- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 15afcd11a4b7..2343017ecc7c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,26 +8,38 @@ + + - + + + + + + + + + + + @@ -47,21 +59,34 @@ + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75778c8578a0..266697f9869b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c33071e5eddb592a4b2122ec86afb2163873b6e + 2d089dbefb403a9d04a7c9a8e8bf3ccb49f0db49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c33071e5eddb592a4b2122ec86afb2163873b6e + 2d089dbefb403a9d04a7c9a8e8bf3ccb49f0db49 diff --git a/eng/Versions.props b/eng/Versions.props index ff2cfe60ea40..a24454769145 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22476.47 - 6.0.305-servicing.22476.47 + 6.0.305-servicing.22510.22 + 6.0.305-servicing.22510.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 534d512b432e831a296a6dffe6d194f75d524b16 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 11 Oct 2022 06:15:30 +0000 Subject: [PATCH 0763/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221010.34 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.305-servicing.22476.47 -> To Version 6.0.306-servicing.22510.34 --- 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 266697f9869b..947534d6434a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d089dbefb403a9d04a7c9a8e8bf3ccb49f0db49 + 22dc8bd691438d82fab7709a12c98f9419e800e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d089dbefb403a9d04a7c9a8e8bf3ccb49f0db49 + 22dc8bd691438d82fab7709a12c98f9419e800e3 diff --git a/eng/Versions.props b/eng/Versions.props index a24454769145..448c9b09ae78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22510.22 - 6.0.305-servicing.22510.22 + 6.0.306-servicing.22510.34 + 6.0.306-servicing.22510.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0263b7b7dacffa82e41b4e3e63cb83e371cd7f5d Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 12 Oct 2022 14:14:53 -0700 Subject: [PATCH 0764/1244] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#14726) * [release/6.0.1xx] Enable online and offline source-build tarball build in all PRs (#14711) * Enable online and offline source-build tarball build in all PRs (#14620) * Fix source-build CI to not run tarball build when tarball creation fails (#14678) * Fix source-build CI to not run tarball build when tarball creation failed * Bad fix * Revert test patch * update global.json and Versions.props for .NET SDK 6.0.110 (#14717) * [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367) * Re-write dotnet-watch smoke test * Revert async changes * Disable source-build tarball validation for non 6.0.1xx legs Co-authored-by: Michael Simons Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: Logan Bussell Co-authored-by: Jason Zhai --- .vsts-ci.yml | 9 +++++---- .../templates/job/source-build-create-tarball.yml | 15 --------------- .../job/source-build-run-tarball-build.yml | 7 +------ .../DotNetHelper.cs | 6 ++++-- .../DotNetWatchTests.cs | 5 ++--- 5 files changed, 12 insertions(+), 30 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index ab1e20400cad..86a77511eecd 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -375,10 +375,11 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball - condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true') + # For .NET 6.0, source-build only supports 6.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 8efb389d3249..cffdf6bdb92e 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 @@ -74,18 +74,3 @@ jobs: displayName: Publish BuildLogs continueOnError: true condition: succeededOrFailed() - - - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - # Check if the tarball should be built now so the result can be used in the build tarball job condition. - # 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: | - # 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 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 e5e4f7e9a052..13bcd2497c13 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 @@ -1,9 +1,6 @@ # Builds a source-build tarball parameters: - # Custom condition to apply to the job - condition: true - # Dependent jobs that must be completed before this job will run dependsOn: @@ -32,7 +29,6 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: x64 - condition: ${{ parameters.condition }} dependsOn: ${{ parameters.dependsOn }} ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: excludeSdkContentTests: true @@ -86,7 +82,6 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: arm64 - condition: ${{ parameters.condition }} dependsOn: ${{ parameters.dependsOn }} ${{ if in(variables['Build.Reason'], 'PullRequest') }}: excludeSdkContentTests: true @@ -108,7 +103,7 @@ jobs: architecture: x64 # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. - condition: and(${{ parameters.condition }}, succeededOrFailed()) + condition: succeededOrFailed() dependsOn: Build_Tarball_x64 excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} 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 ae5508aa4f72..921ab1f97e9b 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 @@ -96,7 +96,7 @@ private static void InitNugetConfig() } } - public void ExecuteCmd(string args, string? workingDirectory = null, Action? additionalProcessConfigCallback = null, int expectedExitCode = 0, int millisecondTimeout = -1) + public void ExecuteCmd(string args, string? workingDirectory = null, Action? additionalProcessConfigCallback = null, int? expectedExitCode = 0, int millisecondTimeout = -1) { (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( DotNetPath, @@ -105,7 +105,9 @@ public void ExecuteCmd(string args, string? workingDirectory = null, Action configureProcess(process, workingDirectory), millisecondTimeout: millisecondTimeout); - ExecuteHelper.ValidateExitCode(executeResult, expectedExitCode); + if (expectedExitCode != null) { + ExecuteHelper.ValidateExitCode(executeResult, (int) expectedExitCode); + } void configureProcess(Process process, string? workingDirectory) { 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 index 18331103782b..46013bbc721c 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -19,12 +19,11 @@ 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, + expectedExitCode: null, // The exit code does not reflect whether or not dotnet watch is working properly millisecondTimeout: 30000); Assert.True(outputChanged); @@ -52,7 +51,7 @@ void processConfigCallback(Process process) { outputChanged = true; OutputHelper.WriteLine("Successfully re-ran program after code change."); - ExecuteHelper.ExecuteProcessValidateExitCode("kill", $"-s TERM {process.Id}", OutputHelper); + process.Kill(true); } }); } From 0de6184891f07ded74568db355145944bdd6bd40 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 12 Oct 2022 16:43:50 -0700 Subject: [PATCH 0765/1244] Update asp.net templates (#14687) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d3505f6025cc..8acc9fbe813c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.29 + 3.1.30 3.2.1 4.8.0-rc2.19462.10 From ab2fa017423c66dd6e088dfef2d21985f91a0160 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 12 Oct 2022 16:48:00 -0700 Subject: [PATCH 0766/1244] Update asp.net templates (#14688) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5cee88b5dba6..86400b0baffd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.29 + 3.1.30 3.2.1 4.8.0-rc2.19462.10 From dbecfaddc053e1f55158ebe230959cfbf0a16a48 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 11:46:00 -0700 Subject: [PATCH 0767/1244] Update dependencies from https://github.com/dotnet/arcade build 20221012.3 (#14755) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22463.7 -> To Version 6.0.0-beta.22512.3 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 7 ------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/build.ps1 | 5 +++++ eng/common/init-tools-native.ps1 | 1 + global.json | 6 +++--- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index e00e01da1885..9a84139e5913 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,12 +7,8 @@ - - - - @@ -39,9 +35,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b8705345ef9..295136e2ad27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 86400b0baffd..204c9d28f993 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22463.7 + 6.0.0-beta.22512.3 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242f6e..33a6f2d0e248 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -67,6 +68,7 @@ function Print-Usage() { Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 7428ef88084f..6c7a851a8087 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -112,6 +112,7 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } diff --git a/global.json b/global.json index 9d1e2d901e8f..20ae9a5afc17 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.109", + "dotnet": "6.0.110", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22463.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22512.3" } } From 15885a4d76b1f140bab43f48f091e5e542f4a708 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Oct 2022 21:42:49 +0000 Subject: [PATCH 0768/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221014.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.305-servicing.22476.47 -> To Version 6.0.306-servicing.22514.20 --- NuGet.config | 23 +---------------------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2343017ecc7c..9079d2230234 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,11 @@ - - - + @@ -28,18 +26,10 @@ - - - - - - - - @@ -72,22 +62,11 @@ - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 947534d6434a..804b79052a8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 22dc8bd691438d82fab7709a12c98f9419e800e3 + ee4981160809501f0efb0ec7721b2a2938492c79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 22dc8bd691438d82fab7709a12c98f9419e800e3 + ee4981160809501f0efb0ec7721b2a2938492c79 diff --git a/eng/Versions.props b/eng/Versions.props index 448c9b09ae78..c22f12ea5a2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.306-servicing.22510.34 - 6.0.306-servicing.22510.34 + 6.0.306-servicing.22514.20 + 6.0.306-servicing.22514.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5a264cedf479b993ff919b41eeb7eb34a79a9242 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 16 Oct 2022 07:45:44 +0000 Subject: [PATCH 0769/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221015.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.305-servicing.22476.47 -> To Version 6.0.306-servicing.22515.1 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 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 33 ++++------------ eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 3 files changed, 73 insertions(+), 90 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9079d2230234..52d4cb699e5f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,20 @@ + - - - - - - - - - - - - - + + + @@ -48,25 +39,17 @@ - - - - - - - - - - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 804b79052a8a..2518795ed533 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4c6436d0fb4378537a091f06432b306ea8ef383e + 721ed1f62b270a39a3dfcd9bc67542f84931fe70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4c6436d0fb4378537a091f06432b306ea8ef383e + 721ed1f62b270a39a3dfcd9bc67542f84931fe70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4c6436d0fb4378537a091f06432b306ea8ef383e + 721ed1f62b270a39a3dfcd9bc67542f84931fe70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ee4981160809501f0efb0ec7721b2a2938492c79 + 985b54a445c3c09e95d3f1397f26fccd32be3745 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ee4981160809501f0efb0ec7721b2a2938492c79 + 985b54a445c3c09e95d3f1397f26fccd32be3745 diff --git a/eng/Versions.props b/eng/Versions.props index c22f12ea5a2d..f51fac37bc9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.305 + 6.0.306 @@ -44,44 +44,44 @@ - 6.0.10 - 6.0.10 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 + 6.0.11 + 6.0.11 + 6.0.11-servicing.22507.1 + 6.0.11-servicing.22507.1 + 6.0.11-servicing.22507.1 + 6.0.11-servicing.22507.1 0.2.0 - 6.0.306-servicing.22514.20 - 6.0.306-servicing.22514.20 + 6.0.306-servicing.22515.1 + 6.0.306-servicing.22515.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.6 + 6.0.7 - 6.0.10-servicing.22476.5 - 6.0.10-servicing.22476.5 - 6.0.10 - 6.0.10 - 6.0.10 - 6.0.10 + 6.0.11-servicing.22514.6 + 6.0.11-servicing.22514.6 + 6.0.11 + 6.0.11 + 6.0.11 + 6.0.11 2.1.0 - 6.0.10-servicing.22476.6 - 6.0.10-servicing.22476.6 - 6.0.10 - 6.0.10 + 6.0.11-servicing.22513.9 + 6.0.11-servicing.22513.9 + 6.0.11 + 6.0.11 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.305 + 6.0.306 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From e55af734c22e1c2e2c35a162be5676e687fe2d39 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Oct 2022 17:41:04 +0000 Subject: [PATCH 0770/1244] Merged PR 26791: [internal/release/6.0.4xx] 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.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.402 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.402-rtm.22476.21 to 6.0.403-rtm.22512.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.402 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22219.3 to 6.0.200-1.22478.1 (parent: Microsoft.NET.S... --- NuGet.config | 26 ++++------- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 42 +++++++++--------- 3 files changed, 77 insertions(+), 87 deletions(-) diff --git a/NuGet.config b/NuGet.config index e29afeaab5fc..963ee559ce4d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,20 @@ + - - - - - - - + - + - + @@ -44,22 +39,17 @@ - - - - - - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 778c6893249c..2cea7ba1f3d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 32a619c8ec7782b8a9cd2fe6476d25197d2b4c32 + 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 32a619c8ec7782b8a9cd2fe6476d25197d2b4c32 + 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 32a619c8ec7782b8a9cd2fe6476d25197d2b4c32 + 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6a3751154ef2a5ab57d4bc3b62c5c8fa2d278ce6 + 3a5d216317af13a7b2a8e3fdbc4c072f2a90c31a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6a3751154ef2a5ab57d4bc3b62c5c8fa2d278ce6 + 3a5d216317af13a7b2a8e3fdbc4c072f2a90c31a @@ -135,15 +135,15 @@ 83d2f8162d29a66a8ff323c4bba93c8250013511 - + https://github.com/dotnet/linker - 28db36b95cf83c8e2ad11e67a2ad0de301b4cad6 + 50c2ec00b794ebd130402d51b960c69cfc9ee622 linker - + https://github.com/dotnet/roslyn - 7d8de40e2bfe5bd2546ca49177166741af4c8e07 + 954930214e5a116e3aa1f81cab887b294ae95739 diff --git a/eng/Versions.props b/eng/Versions.props index 266fd059cd14..f86693cfa5c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.402 + 6.0.403 @@ -44,44 +44,44 @@ - 6.0.10 - 6.0.10 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 + 6.0.11 + 6.0.11 + 6.0.11-servicing.22511.16 + 6.0.11-servicing.22511.16 + 6.0.11-servicing.22511.16 + 6.0.11-servicing.22511.16 0.2.0 - 6.0.402-servicing.22476.48 - 6.0.402-servicing.22476.48 + 6.0.403-servicing.22515.2 + 6.0.403-servicing.22515.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.6 + 6.0.7 - 6.0.10-servicing.22476.5 - 6.0.10-servicing.22476.5 - 6.0.10 - 6.0.10 - 6.0.10 - 6.0.10 + 6.0.11-servicing.22514.6 + 6.0.11-servicing.22514.6 + 6.0.11 + 6.0.11 + 6.0.11 + 6.0.11 2.1.0 - 6.0.10-servicing.22476.6 - 6.0.10-servicing.22476.6 - 6.0.10 - 6.0.10 + 6.0.11-servicing.22513.9 + 6.0.11-servicing.22513.9 + 6.0.11 + 6.0.11 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.402 + 6.0.403 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From f214b1e1f388c7fbe920ce8361e2bd4785c61c79 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Oct 2022 22:03:02 +0000 Subject: [PATCH 0771/1244] Merged PR 26801: [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.DotNet.Common.ItemTemplates**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.306-servicing.22512.10 to 6.0.306-servicing.22517.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.306 to 6.0.306 (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**: 20221017.5 - **Date Produced**: October 17, 2022 4:49:20 PM UTC - **Commit**: 1ebf05b4301e6b29d0288178c184931b2976a58d - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22515.1 to 6.0.306-servicing.22517.5][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22515.1 to 6.0.306-servicing.22517.5][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22512.10 to 6.0.306-servicing.22517.2][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.306 to 6.0.306][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC985b54a&targetVersion=GC1ebf05b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC721ed1f&targetVersion=GC9303db7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 52d4cb699e5f..8493d54d9036 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2518795ed533..7165c6a4d322 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 721ed1f62b270a39a3dfcd9bc67542f84931fe70 + 9303db79522b69698068b6926d45b4c84fa6368f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 721ed1f62b270a39a3dfcd9bc67542f84931fe70 + 9303db79522b69698068b6926d45b4c84fa6368f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 721ed1f62b270a39a3dfcd9bc67542f84931fe70 + 9303db79522b69698068b6926d45b4c84fa6368f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 985b54a445c3c09e95d3f1397f26fccd32be3745 + 1ebf05b4301e6b29d0288178c184931b2976a58d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 985b54a445c3c09e95d3f1397f26fccd32be3745 + 1ebf05b4301e6b29d0288178c184931b2976a58d diff --git a/eng/Versions.props b/eng/Versions.props index fc0c7bafc163..7d8340c3c10a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.306-servicing.22515.1 - 6.0.306-servicing.22515.1 + 6.0.306-servicing.22517.5 + 6.0.306-servicing.22517.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9c88a3391a15486f54d831720eb2d3ef1543bd88 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 00:16:44 +0000 Subject: [PATCH 0772/1244] Merged PR 26822: [internal/release/6.0.4xx] 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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221017.21 - **Date Produced**: October 17, 2022 9:51:49 PM UTC - **Commit**: d149a5642b27a9a972f72c2f3c2bb38b1a0e5783 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22515.2 to 6.0.403-servicing.22517.21][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22515.2 to 6.0.403-servicing.22517.21][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC3a5d216&targetVersion=GCd149a56&_a=files [2]: https://dev.a... --- 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 963ee559ce4d..677097d4fa9a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2cea7ba1f3d3..6391c2658d8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a5d216317af13a7b2a8e3fdbc4c072f2a90c31a + d149a5642b27a9a972f72c2f3c2bb38b1a0e5783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a5d216317af13a7b2a8e3fdbc4c072f2a90c31a + d149a5642b27a9a972f72c2f3c2bb38b1a0e5783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 729cc7ccdec38bb23e6216a371293bb5ce738b5a + b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3bbc77257e3d51a2e19195523eafd262da1f5459 + 8d60cc76ff0cd2bc37b145dcb5bff097f990844f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f86693cfa5c5..20ac6b792102 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.10-servicing.22476.6 + 6.0.11-servicing.22513.6 - 6.0.10-servicing.22476.4 + 6.0.11-servicing.22517.1 @@ -56,8 +56,8 @@ - 6.0.403-servicing.22515.2 - 6.0.403-servicing.22515.2 + 6.0.403-servicing.22517.21 + 6.0.403-servicing.22517.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22513.9 - 6.0.11-servicing.22513.9 + 6.0.11-servicing.22517.3 + 6.0.11-servicing.22517.3 6.0.11 6.0.11 From a057a1e1663989eb79465479e2753a4ca589d6d9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 00:16:57 +0000 Subject: [PATCH 0773/1244] Merged PR 26446: [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**: 20221013.1 - **Date Produced**: October 13, 2022 2:49:18 PM UTC - **Commit**: 2477d388d8663fe6a3f1c82376600dbb19bd217d - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22464.1 to 6.0.0-servicing.22513.1][4] [4]: https://github.com/dotnet/source-build-reference-packages/compare/59e601c...2477d38 [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 7165c6a4d322..c376560ea9be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/source-build-reference-packages - 59e601c150793f6a32cd39e598ba6fe94edfe21d + 2477d388d8663fe6a3f1c82376600dbb19bd217d From c66f84e95d725b649959d015b087f807f3f77909 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 04:13:25 +0000 Subject: [PATCH 0774/1244] Merged PR 26823: [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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1 (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**: 20221017.22 - **Date Produced**: October 17, 2022 9:54:53 PM UTC - **Commit**: 7a9f7daae15db5611a881fad3f94502a61f976c5 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22517.5 to 6.0.306-servicing.22517.22][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22517.5 to 6.0.306-servicing.22517.22][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1ebf05b&targetVersion=GC7a9f7da&_a=files [2]: https://dev.a... --- 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 8493d54d9036..ab8a3584475c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c376560ea9be..c00a176d7957 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9303db79522b69698068b6926d45b4c84fa6368f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ebf05b4301e6b29d0288178c184931b2976a58d + 7a9f7daae15db5611a881fad3f94502a61f976c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ebf05b4301e6b29d0288178c184931b2976a58d + 7a9f7daae15db5611a881fad3f94502a61f976c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 729cc7ccdec38bb23e6216a371293bb5ce738b5a + b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3bbc77257e3d51a2e19195523eafd262da1f5459 + 8d60cc76ff0cd2bc37b145dcb5bff097f990844f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7d8340c3c10a..00e579853bd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.10-servicing.22476.6 + 6.0.11-servicing.22513.6 - 6.0.10-servicing.22476.4 + 6.0.11-servicing.22517.1 @@ -56,8 +56,8 @@ - 6.0.306-servicing.22517.5 - 6.0.306-servicing.22517.5 + 6.0.306-servicing.22517.22 + 6.0.306-servicing.22517.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22513.9 - 6.0.11-servicing.22513.9 + 6.0.11-servicing.22517.3 + 6.0.11-servicing.22517.3 6.0.11 6.0.11 From 08d2f8d22353d07b199095b5eb8e8939cd4cd567 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 15:08:47 +0000 Subject: [PATCH 0775/1244] Merged PR 26829: [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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15 (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**: 20221017.35 - **Date Produced**: October 18, 2022 6:46:26 AM UTC - **Commit**: a1b8eada07c2e6b43e853b842f42198c7412b4bc - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22517.22 to 6.0.306-servicing.22517.35][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22517.22 to 6.0.306-servicing.22517.35][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7a9f7da&targetVersion=GCa1b8ead&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC5d56e0e&targetVersion=GCcb12e45&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 ab8a3584475c..dd67fb095b81 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 c00a176d7957..f18060e62ed5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9303db79522b69698068b6926d45b4c84fa6368f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7a9f7daae15db5611a881fad3f94502a61f976c5 + a1b8eada07c2e6b43e853b842f42198c7412b4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7a9f7daae15db5611a881fad3f94502a61f976c5 + a1b8eada07c2e6b43e853b842f42198c7412b4bc diff --git a/eng/Versions.props b/eng/Versions.props index 00e579853bd2..afb07ba00598 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22507.1 - 6.0.11-servicing.22507.1 - 6.0.11-servicing.22507.1 - 6.0.11-servicing.22507.1 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 0.2.0 - 6.0.306-servicing.22517.22 - 6.0.306-servicing.22517.22 + 6.0.306-servicing.22517.35 + 6.0.306-servicing.22517.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From adc37b6826370744eabb3e0d1d4f1846dded7f11 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 17:35:03 +0000 Subject: [PATCH 0776/1244] Merged PR 26841: [internal/release/6.0.4xx] 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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221018.2 - **Date Produced**: October 18, 2022 3:41:02 PM UTC - **Commit**: fc6df7100febe8884eef7ee0e9fa80e8b2b3c5c6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22517.21 to 6.0.403-servicing.22518.2][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22517.21 to 6.0.403-servicing.22518.2][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd149a56&targetVersion=GCfc6df71&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb786d2b&targetVersion=GCcb12e45&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 677097d4fa9a..aef14c2dea9d 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 6391c2658d8d..3bb22313c08f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d149a5642b27a9a972f72c2f3c2bb38b1a0e5783 + fc6df7100febe8884eef7ee0e9fa80e8b2b3c5c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d149a5642b27a9a972f72c2f3c2bb38b1a0e5783 + fc6df7100febe8884eef7ee0e9fa80e8b2b3c5c6 diff --git a/eng/Versions.props b/eng/Versions.props index 20ac6b792102..253d751f2ba6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22511.16 - 6.0.11-servicing.22511.16 - 6.0.11-servicing.22511.16 - 6.0.11-servicing.22511.16 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 0.2.0 - 6.0.403-servicing.22517.21 - 6.0.403-servicing.22517.21 + 6.0.403-servicing.22518.2 + 6.0.403-servicing.22518.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bdad7e39a83216eb8edff7db32c7d01a06f9233a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 14:33:38 +0000 Subject: [PATCH 0777/1244] Merged PR 26855: [internal/release/6.0.4xx] 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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.1 to 6.0.11-servicing.22517.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221018.24 - **Date Produced**: October 19, 2022 4:48:37 AM UTC - **Commit**: 9a858ac3a005e5984d1d7e51a5e67f0b2c779967 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22518.2 to 6.0.403-servicing.22518.24][5] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22518.2 to 6.0.403-servicing.22518.24][5] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][6] - **VS.Redist.Common.WindowsDesktop.S... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index aef14c2dea9d..db9a96bce1bf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,13 +14,13 @@ - + - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3bb22313c08f..d547a62abfa8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6df7100febe8884eef7ee0e9fa80e8b2b3c5c6 + 9a858ac3a005e5984d1d7e51a5e67f0b2c779967 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6df7100febe8884eef7ee0e9fa80e8b2b3c5c6 + 9a858ac3a005e5984d1d7e51a5e67f0b2c779967 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 + 1821cb5860d45773816cb2f0c904e64581c6e465 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8d60cc76ff0cd2bc37b145dcb5bff097f990844f + 4e1581efabe31037dbbae1a9c18a03f4e5ef53e3 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 253d751f2ba6..4bc0d2e7a2a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22513.6 + 6.0.11-servicing.22517.3 - 6.0.11-servicing.22517.1 + 6.0.11-servicing.22517.6 @@ -56,8 +56,8 @@ - 6.0.403-servicing.22518.2 - 6.0.403-servicing.22518.2 + 6.0.403-servicing.22518.24 + 6.0.403-servicing.22518.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.11-servicing.22514.6 - 6.0.11-servicing.22514.6 + 6.0.11-servicing.22518.9 + 6.0.11-servicing.22518.9 6.0.11 6.0.11 6.0.11 @@ -78,8 +78,8 @@ - 6.0.11-servicing.22517.3 - 6.0.11-servicing.22517.3 + 6.0.11-servicing.22518.2 + 6.0.11-servicing.22518.2 6.0.11 6.0.11 From ae3693e5f07ded0e6d616d1d88493a489c0af30a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 14:36:56 +0000 Subject: [PATCH 0778/1244] Merged PR 26856: [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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.1 to 6.0.11-servicing.22517.6 (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**: 20221018.15 - **Date Produced**: October 19, 2022 12:15:19 AM UTC - **Commit**: 6ee9b3cebbe71480945ec824535bd15ae2bb5158 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22517.35 to 6.0.306-servicing.22518.15][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22517.35 to 6.0.306-servicing.22518.15][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.1 to 6.0.11-servicing.22517.6][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa1b8ead&targetVersion=GC6ee9b3c&_a=files [2]: https://de... --- 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 dd67fb095b81..a9a0cf79c03f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f18060e62ed5..67853cbe7018 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9303db79522b69698068b6926d45b4c84fa6368f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a1b8eada07c2e6b43e853b842f42198c7412b4bc + 6ee9b3cebbe71480945ec824535bd15ae2bb5158 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a1b8eada07c2e6b43e853b842f42198c7412b4bc + 6ee9b3cebbe71480945ec824535bd15ae2bb5158 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 + 1821cb5860d45773816cb2f0c904e64581c6e465 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8d60cc76ff0cd2bc37b145dcb5bff097f990844f + 4e1581efabe31037dbbae1a9c18a03f4e5ef53e3 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index afb07ba00598..c14c018127b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22513.6 + 6.0.11-servicing.22517.3 - 6.0.11-servicing.22517.1 + 6.0.11-servicing.22517.6 @@ -56,8 +56,8 @@ - 6.0.306-servicing.22517.35 - 6.0.306-servicing.22517.35 + 6.0.306-servicing.22518.15 + 6.0.306-servicing.22518.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22517.3 - 6.0.11-servicing.22517.3 + 6.0.11-servicing.22518.2 + 6.0.11-servicing.22518.2 6.0.11 6.0.11 From 0302ac718dee1bfaad166323e2f449c6ea936de3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 16:33:17 +0000 Subject: [PATCH 0779/1244] Merged PR 26891: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (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**: 20221019.7 - **Date Produced**: October 19, 2022 3:08:13 PM UTC - **Commit**: c2fc3bf5a4f2e769c80a6b38e13aad485eb0c366 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22518.15 to 6.0.306-servicing.22519.7][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22518.15 to 6.0.306-servicing.22519.7][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2] - **Microsoft.NETCore.App.Ru... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index a9a0cf79c03f..5696d9290303 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,14 @@ - + - + @@ -41,10 +41,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67853cbe7018..803bfa558992 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9303db79522b69698068b6926d45b4c84fa6368f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ee9b3cebbe71480945ec824535bd15ae2bb5158 + c2fc3bf5a4f2e769c80a6b38e13aad485eb0c366 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ee9b3cebbe71480945ec824535bd15ae2bb5158 + c2fc3bf5a4f2e769c80a6b38e13aad485eb0c366 diff --git a/eng/Versions.props b/eng/Versions.props index c14c018127b4..af3da8a93242 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 0.2.0 - 6.0.306-servicing.22518.15 - 6.0.306-servicing.22518.15 + 6.0.306-servicing.22519.7 + 6.0.306-servicing.22519.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.11-servicing.22514.6 - 6.0.11-servicing.22514.6 + 6.0.11-servicing.22518.9 + 6.0.11-servicing.22518.9 6.0.11 6.0.11 6.0.11 From d9bc49495ab92eae6adca0a9ebff9fe01eacd44c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 16:34:26 +0000 Subject: [PATCH 0780/1244] Merged PR 26889: [internal/release/6.0.4xx] 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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.6 - **Date Produced**: October 19, 2022 3:07:02 PM UTC - **Commit**: c3805b2afca00eebe5ec3d73753070dc527329ea - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22518.24 to 6.0.403-servicing.22519.6][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22518.24 to 6.0.403-servicing.22519.6][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9a858ac&targetVersion=GCc3805b2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCcb12e45&targetVersion=GC1f92829&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 db9a96bce1bf..1e19ac368b11 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 d547a62abfa8..2348fde1533b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a858ac3a005e5984d1d7e51a5e67f0b2c779967 + c3805b2afca00eebe5ec3d73753070dc527329ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a858ac3a005e5984d1d7e51a5e67f0b2c779967 + c3805b2afca00eebe5ec3d73753070dc527329ea diff --git a/eng/Versions.props b/eng/Versions.props index 4bc0d2e7a2a0..3390c5c05eef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 0.2.0 - 6.0.403-servicing.22518.24 - 6.0.403-servicing.22518.24 + 6.0.403-servicing.22519.6 + 6.0.403-servicing.22519.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3423d26870451bed6065f1051fd5320302cbdc56 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 18:13:41 +0000 Subject: [PATCH 0781/1244] Merged PR 26896: [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.DotNet.Common.ItemTemplates**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.306-servicing.22517.2 to 6.0.306-servicing.22519.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.306 to 6.0.306 (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**: 20221019.12 - **Date Produced**: October 19, 2022 5:07:52 PM UTC - **Commit**: de4ec83625cedeb7a6eba5d54e74c72382c29bbb - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22519.7 to 6.0.306-servicing.22519.12][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22519.7 to 6.0.306-servicing.22519.12][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22517.2 to 6.0.306-servicing.22519.6][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.306 to 6.0.306][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc2fc3bf&targetVersion=GCde4ec83&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC9303db7&targetVersion=GC051afa2&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 5696d9290303..8c693238c988 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 803bfa558992..16224ded53a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9303db79522b69698068b6926d45b4c84fa6368f + 051afa20f7201629fd9bab065f81a4f185220493 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9303db79522b69698068b6926d45b4c84fa6368f + 051afa20f7201629fd9bab065f81a4f185220493 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9303db79522b69698068b6926d45b4c84fa6368f + 051afa20f7201629fd9bab065f81a4f185220493 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2fc3bf5a4f2e769c80a6b38e13aad485eb0c366 + de4ec83625cedeb7a6eba5d54e74c72382c29bbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2fc3bf5a4f2e769c80a6b38e13aad485eb0c366 + de4ec83625cedeb7a6eba5d54e74c72382c29bbb diff --git a/eng/Versions.props b/eng/Versions.props index af3da8a93242..41cb3ed86fd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.306-servicing.22519.7 - 6.0.306-servicing.22519.7 + 6.0.306-servicing.22519.12 + 6.0.306-servicing.22519.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a2b577f229e181b637ab047bc55507414fe22f3a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 18:52:55 +0000 Subject: [PATCH 0782/1244] Merged PR 26909: [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.DotNet.Common.ItemTemplates**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.306-servicing.22519.6 to 6.0.306-servicing.22519.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.306 to 6.0.306 (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**: 20221019.15 - **Date Produced**: October 19, 2022 6:12:44 PM UTC - **Commit**: e154f5f69db41b0868744c5b852507310b07483d - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22519.12 to 6.0.306-servicing.22519.15][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22519.12 to 6.0.306-servicing.22519.15][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22519.6 to 6.0.306-servicing.22519.11][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.306 to 6.0.306][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCde4ec83&targetVersion=GCe154f5f&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC051afa2&targetVersion=GC2198eb3&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 8c693238c988..82a95e34027b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16224ded53a8..fd161cbcef23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 051afa20f7201629fd9bab065f81a4f185220493 + 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 051afa20f7201629fd9bab065f81a4f185220493 + 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 051afa20f7201629fd9bab065f81a4f185220493 + 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - de4ec83625cedeb7a6eba5d54e74c72382c29bbb + e154f5f69db41b0868744c5b852507310b07483d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - de4ec83625cedeb7a6eba5d54e74c72382c29bbb + e154f5f69db41b0868744c5b852507310b07483d diff --git a/eng/Versions.props b/eng/Versions.props index 41cb3ed86fd8..b063979927e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.306-servicing.22519.12 - 6.0.306-servicing.22519.12 + 6.0.306-servicing.22519.15 + 6.0.306-servicing.22519.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c3b0ce9494e408bdf871733afebf9411c54bca68 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 19:45:17 +0000 Subject: [PATCH 0783/1244] Merged PR 26910: [internal/release/6.0.4xx] 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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.21 - **Date Produced**: October 19, 2022 6:59:31 PM UTC - **Commit**: 8a2916d0f10fe3763c3fc577e2aa53dedbef3c4d - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.6 to 6.0.403-servicing.22519.21][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.6 to 6.0.403-servicing.22519.21][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc3805b2&targetVersion=GC8a2916d&_a=files [2]: https://dev.a... --- 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 1e19ac368b11..3cc60df47f50 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2348fde1533b..c29ba5350eb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c3805b2afca00eebe5ec3d73753070dc527329ea + 8a2916d0f10fe3763c3fc577e2aa53dedbef3c4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c3805b2afca00eebe5ec3d73753070dc527329ea + 8a2916d0f10fe3763c3fc577e2aa53dedbef3c4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1821cb5860d45773816cb2f0c904e64581c6e465 + 8ed3bcf52701282d7db3a99db2e7304bd4443c99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4e1581efabe31037dbbae1a9c18a03f4e5ef53e3 + 37deaa02f76fc3b8df620e305b450b06fe2b685d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3390c5c05eef..ce14f9be9f25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22517.3 + 6.0.11-servicing.22519.5 - 6.0.11-servicing.22517.6 + 6.0.11-servicing.22519.2 @@ -56,8 +56,8 @@ - 6.0.403-servicing.22519.6 - 6.0.403-servicing.22519.6 + 6.0.403-servicing.22519.21 + 6.0.403-servicing.22519.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22518.2 - 6.0.11-servicing.22518.2 + 6.0.11-servicing.22519.3 + 6.0.11-servicing.22519.3 6.0.11 6.0.11 From f7fd978127261e78e33ed7f0f08cf9b96aefa075 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 19:58:28 +0000 Subject: [PATCH 0784/1244] Merged PR 26912: [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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2 (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**: 20221019.23 - **Date Produced**: October 19, 2022 7:20:41 PM UTC - **Commit**: b003a1877b8b73a74c6d400e2373921d20767eb8 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22519.15 to 6.0.306-servicing.22519.23][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22519.15 to 6.0.306-servicing.22519.23][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe154f5f&targetVersion=GCb003a18&_a=files [2]: https://dev... --- 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 82a95e34027b..7263ad46d3bb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd161cbcef23..fcb0450150ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e154f5f69db41b0868744c5b852507310b07483d + b003a1877b8b73a74c6d400e2373921d20767eb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e154f5f69db41b0868744c5b852507310b07483d + b003a1877b8b73a74c6d400e2373921d20767eb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1821cb5860d45773816cb2f0c904e64581c6e465 + 8ed3bcf52701282d7db3a99db2e7304bd4443c99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4e1581efabe31037dbbae1a9c18a03f4e5ef53e3 + 37deaa02f76fc3b8df620e305b450b06fe2b685d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b063979927e0..f52cf37974c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22517.3 + 6.0.11-servicing.22519.5 - 6.0.11-servicing.22517.6 + 6.0.11-servicing.22519.2 @@ -56,8 +56,8 @@ - 6.0.306-servicing.22519.15 - 6.0.306-servicing.22519.15 + 6.0.306-servicing.22519.23 + 6.0.306-servicing.22519.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22518.2 - 6.0.11-servicing.22518.2 + 6.0.11-servicing.22519.3 + 6.0.11-servicing.22519.3 6.0.11 6.0.11 From 45b0a08d8b45001124884ac63f2ffbf973a6915d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 20:36:25 +0000 Subject: [PATCH 0785/1244] Merged PR 26920: [internal/release/6.0.4xx] 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.403 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.403-rtm.22512.11 to 6.0.403-rtm.22519.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.26 - **Date Produced**: October 19, 2022 7:55:37 PM UTC - **Commit**: ed71b196867c16a91420bcd0609de82131d11ebc - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.21 to 6.0.403-servicing.22519.26][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.21 to 6.0.403-servicing.22519.26][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.403 to 6.0.403][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.403-rtm.22512.11 to 6.0.403-rtm.22519.12][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.403 to 6.0.403][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8a2916d&targetVersion=GCed71b19&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC0a0cfeb&targetVersion=GC783938a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 3cc60df47f50..d0429bdc0d6c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c29ba5350eb1..9ac2ae45c0a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0a0cfeb13a6dae400c82d14625115941636f423a + 783938a34362e15d913b908f98e093294f2de250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0a0cfeb13a6dae400c82d14625115941636f423a + 783938a34362e15d913b908f98e093294f2de250 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0a0cfeb13a6dae400c82d14625115941636f423a + 783938a34362e15d913b908f98e093294f2de250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8a2916d0f10fe3763c3fc577e2aa53dedbef3c4d + ed71b196867c16a91420bcd0609de82131d11ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8a2916d0f10fe3763c3fc577e2aa53dedbef3c4d + ed71b196867c16a91420bcd0609de82131d11ebc diff --git a/eng/Versions.props b/eng/Versions.props index ce14f9be9f25..60bb245bfe13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.403-servicing.22519.21 - 6.0.403-servicing.22519.21 + 6.0.403-servicing.22519.26 + 6.0.403-servicing.22519.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 98b85f8dd515315a00a3655c679e83050f29eeb8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 20 Oct 2022 02:12:51 +0000 Subject: [PATCH 0786/1244] Merged PR 26935: [internal/release/6.0.4xx] 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.4-beta.22469.1 to 12.0.5-beta.22513.8 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 6.0.6-beta.22469.1 to 6.0.7-beta.22513.8 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.36 - **Date Produced**: October 19, 2022 10:39:51 PM UTC - **Commit**: 7c0deced9ce8988403320693522a661cdd1c7f70 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.26 to 6.0.403-servicing.22519.36][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.26 to 6.0.403-servicing.22519.36][1] - **Microsoft.FSharp.Compiler**: [from 12.0.4-beta.22469.1 to 12.0.5-beta.22513.8][2] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 6.0.6-beta.22469.1 to 6.0.7-beta.22513.8][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCed71b19&targetVersion=GC7c0dece&_a=files [2]: https://github.com/dotnet/fsharp/compare/4438112...5d69143 [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 9ac2ae45c0a9..03385f3bff4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 783938a34362e15d913b908f98e093294f2de250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed71b196867c16a91420bcd0609de82131d11ebc + 7c0deced9ce8988403320693522a661cdd1c7f70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed71b196867c16a91420bcd0609de82131d11ebc + 7c0deced9ce8988403320693522a661cdd1c7f70 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 37deaa02f76fc3b8df620e305b450b06fe2b685d - + https://github.com/dotnet/fsharp - 4438112ed8e103d9af4fb0fd8d593a4e7f6777d2 + 5d69143fbe992d8fa33d5b83d5fdd5f4ed7bb4fc - + https://github.com/dotnet/fsharp - 4438112ed8e103d9af4fb0fd8d593a4e7f6777d2 + 5d69143fbe992d8fa33d5b83d5fdd5f4ed7bb4fc diff --git a/eng/Versions.props b/eng/Versions.props index 60bb245bfe13..b940f22e2265 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.403-servicing.22519.26 - 6.0.403-servicing.22519.26 + 6.0.403-servicing.22519.36 + 6.0.403-servicing.22519.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5b327454b9793ba3b371af1c0e6ea4444767f6d1 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 21 Oct 2022 06:16:04 -0700 Subject: [PATCH 0787/1244] [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14807) * Merged PR 25462: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220919.14 - **Date Produced**: September 19, 2022 7:24:58 PM UTC - **Commit**: 020b4fda1c3cf81307d8f13689d63bb3c09c91a8 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23] - **Microsoft.NET.Sdk**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][24] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24] - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][25] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.6][26] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.9 to 6.0.10][27] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][27] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **dotnet-dev-certs**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **dotnet-user-secrets**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.109 to 6.0.110][28] - **Microsoft.TemplateEngine.Cli**: [from 6.0.109-servicing.22420.11 to 6.0.110-servicing.22464.25][28] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.109 to 6.0.110][28] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13][29] - **Microsoft.Build**: [from 17.0.0 to 17.0.1][30] - **NuGet.Build.Tasks**: [from 6.0.2-rc.5 to 6.0.3-rc.1][31] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25] [23]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7fffe6d&targetVersion=GC020b4fd&_a=files [24]: https://dev.azure.com/dnceng/inte... * Merged PR 26041: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22463.20 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22464.25 to 6.0.110-servicing.22470.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22456... * Merged PR 26213: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220926.22 - **Date Produced**: September 26, 2022 11:14:22 PM UTC - **Commit**: 4041520e714b4334789706bde25e61ff91cf6c2b - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12][3] - **Microsoft.DotNet.Common.ProjectTemplates.6.0*... * Merged PR 26229: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22476.12 to 6.0.110-servicing.22476.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220926.31 - **Date Produced**: September 27, 2022 1:37:52 AM UTC - **Commit**: cb11e73629ffbf6eee418a40fc602ceb752794fa - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22476.12 to 6.0.110-servicing.2247... * Merged PR 26243: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220926.46 - **Date Produced**: September 27, 2022 3:39:36 AM UTC - **Commit**: a886cd6214c92f6a5d955c056014820c35591e7b - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-... * Update source-build tarball CI to utilize faster build agents (#14795) Co-authored-by: dotnet-bot Co-authored-by: DotNet Bot Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: Matt Mitchell Co-authored-by: Jason Zhai Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Michael Simons --- .../common/templates/job/source-build-run-tarball-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 13bcd2497c13..d927b3a86538 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 @@ -17,12 +17,12 @@ parameters: fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b poolInternalAmd64: - name: NetCore1ESPool-Svc-Internal + name: NetCore1ESPool-Internal-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 poolInternalArm64: name: Docker-Linux-Arm-Internal poolPublicAmd64: - name: NetCore-Svc-Public + name: NetCore-Public-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open jobs: From bed2083fee0a371ce936bfe16b997ec96c42eeff Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 02:54:08 +0000 Subject: [PATCH 0788/1244] Merged PR 26996: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (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**: 20221023.5 - **Date Produced**: October 23, 2022 10:44:50 PM UTC - **Commit**: bcf774aca16d2d8493f05a521ce03819bd195448 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22519.23 to 6.0.306-servicing.22523.5][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22519.23 to 6.0.306-servicing.22523.5][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb003a18&targetVersion=GCbcf774a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCaf5b37c&targetVersion=GC943474c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 12 ++++++++++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7263ad46d3bb..e5703141e66f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,23 @@ + + - + + + @@ -41,14 +45,18 @@ + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fcb0450150ae..a364ec461dcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b003a1877b8b73a74c6d400e2373921d20767eb8 + bcf774aca16d2d8493f05a521ce03819bd195448 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b003a1877b8b73a74c6d400e2373921d20767eb8 + bcf774aca16d2d8493f05a521ce03819bd195448 diff --git a/eng/Versions.props b/eng/Versions.props index f52cf37974c7..c95db2a4945d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.306-servicing.22519.23 - 6.0.306-servicing.22519.23 + 6.0.306-servicing.22523.5 + 6.0.306-servicing.22523.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.11-servicing.22518.9 - 6.0.11-servicing.22518.9 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 6.0.11 6.0.11 6.0.11 From 41266955bd5410669548e624df32239b52169b88 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 02:54:16 +0000 Subject: [PATCH 0789/1244] Merged PR 26997: [internal/release/6.0.4xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221023.6 - **Date Produced**: October 23, 2022 10:48:18 PM UTC - **Commit**: 8d1b1fadc14383341698ba47dd871000e3b8f8b6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.36 to 6.0.403-servicing.22523.6][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.36 to 6.0.403-servicing.22523.6][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7c0dece&targetVersion=GC8d1b1fa&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCaf5b37c&targetVersion=GC943474c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index d0429bdc0d6c..a3a5adc0f881 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,24 @@ + + - + + + + @@ -41,14 +46,19 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03385f3bff4c..a71549079b8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 783938a34362e15d913b908f98e093294f2de250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7c0deced9ce8988403320693522a661cdd1c7f70 + 8d1b1fadc14383341698ba47dd871000e3b8f8b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7c0deced9ce8988403320693522a661cdd1c7f70 + 8d1b1fadc14383341698ba47dd871000e3b8f8b6 diff --git a/eng/Versions.props b/eng/Versions.props index b940f22e2265..888dd89c7a2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.403-servicing.22519.36 - 6.0.403-servicing.22519.36 + 6.0.403-servicing.22523.6 + 6.0.403-servicing.22523.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.11-servicing.22518.9 - 6.0.11-servicing.22518.9 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 6.0.11 6.0.11 6.0.11 From 847d4331a9ea9e5c3f35ff740a68e3db29bdbbea Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 03:58:24 +0000 Subject: [PATCH 0790/1244] Merged PR 27004: [internal/release/6.0.4xx] 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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.403-rtm.22519.12 to 6.0.403-rtm.22523.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221023.16 - **Date Produced**: October 24, 2022 3:29:06 AM UTC - **Commit**: ca02a95e1ba796564bd3dfb1469f5c0ae10b9bda - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22523.6 to 6.0.403-servicing.22523.16][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22523.6 to 6.0.403-servicing.22523.16][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.403 to 6.0.403][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.403-rtm.22519.12 to 6.0.403-rtm.22523.6][3] - **Microsoft.DotNet.Commo... --- NuGet.config | 16 ++++------------ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index a3a5adc0f881..8e3e1a08b9f1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -19,9 +17,7 @@ - - - + @@ -46,16 +42,12 @@ - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a71549079b8b..b9a7df5a299e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 783938a34362e15d913b908f98e093294f2de250 + 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 783938a34362e15d913b908f98e093294f2de250 + 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 783938a34362e15d913b908f98e093294f2de250 + 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8d1b1fadc14383341698ba47dd871000e3b8f8b6 + ca02a95e1ba796564bd3dfb1469f5c0ae10b9bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8d1b1fadc14383341698ba47dd871000e3b8f8b6 + ca02a95e1ba796564bd3dfb1469f5c0ae10b9bda diff --git a/eng/Versions.props b/eng/Versions.props index 888dd89c7a2a..d02f494a8389 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 0.2.0 - 6.0.403-servicing.22523.6 - 6.0.403-servicing.22523.6 + 6.0.403-servicing.22523.16 + 6.0.403-servicing.22523.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fb958f0c784ead4d72dc645dbe4dedeb7a01385a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 03:58:27 +0000 Subject: [PATCH 0791/1244] Merged PR 27002: [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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.306-servicing.22519.11 to 6.0.306-servicing.22523.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.306 to 6.0.306 (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**: 20221023.15 - **Date Produced**: October 24, 2022 3:27:24 AM UTC - **Commit**: eeb998091f4302f58f636f1c75ee5150d5b940c1 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22523.5 to 6.0.306-servicing.22523.15][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22523.5 to 6.0.306-servicing.22523.15][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22519.11 to 6.0.306-servicing.22523.5][3] - ... --- NuGet.config | 14 ++++---------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index e5703141e66f..a302dd99f2d2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -19,8 +17,7 @@ - - + @@ -45,15 +42,12 @@ - - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a364ec461dcd..31dd91950bb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 + 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 + 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 + 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcf774aca16d2d8493f05a521ce03819bd195448 + eeb998091f4302f58f636f1c75ee5150d5b940c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcf774aca16d2d8493f05a521ce03819bd195448 + eeb998091f4302f58f636f1c75ee5150d5b940c1 diff --git a/eng/Versions.props b/eng/Versions.props index c95db2a4945d..5c887fb39f54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 0.2.0 - 6.0.306-servicing.22523.5 - 6.0.306-servicing.22523.5 + 6.0.306-servicing.22523.15 + 6.0.306-servicing.22523.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2bc18bf2920f0d6292aae0c786652e4b840de6a4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 15:32:23 +0000 Subject: [PATCH 0792/1244] Merged PR 27009: [internal/release/6.0.4xx] 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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221023.23 - **Date Produced**: October 24, 2022 4:34:27 AM UTC - **Commit**: 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22523.16 to 6.0.403-servicing.22523.23][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22523.16 to 6.0.403-servicing.22523.23][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCca02a95&targetVersion=GC6b1e4bc&_a=files [2]: https://dev... --- 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 8e3e1a08b9f1..063b396f547a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,8 +20,7 @@ - - + @@ -50,8 +49,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9a7df5a299e..999ef2404bf0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca02a95e1ba796564bd3dfb1469f5c0ae10b9bda + 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca02a95e1ba796564bd3dfb1469f5c0ae10b9bda + 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8ed3bcf52701282d7db3a99db2e7304bd4443c99 + cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 37deaa02f76fc3b8df620e305b450b06fe2b685d + 96c5254e5ca5040021caf779216b1b3641875b1e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d02f494a8389..ec9e23dcec17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22519.5 + 6.0.11-servicing.22523.4 - 6.0.11-servicing.22519.2 + 6.0.11-servicing.22523.2 @@ -56,8 +56,8 @@ - 6.0.403-servicing.22523.16 - 6.0.403-servicing.22523.16 + 6.0.403-servicing.22523.23 + 6.0.403-servicing.22523.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22519.3 - 6.0.11-servicing.22519.3 + 6.0.11-servicing.22523.3 + 6.0.11-servicing.22523.3 6.0.11 6.0.11 From 583adf944c459c46da460315ec30710c20c466de Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 15:32:49 +0000 Subject: [PATCH 0793/1244] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 a302dd99f2d2..8b5c5c827f47 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,8 +20,7 @@ - - + @@ -50,8 +49,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31dd91950bb0..35f36b8ecce9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eeb998091f4302f58f636f1c75ee5150d5b940c1 + 46b48e7a82d138728be2d24594b5ce98d6af92dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eeb998091f4302f58f636f1c75ee5150d5b940c1 + 46b48e7a82d138728be2d24594b5ce98d6af92dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8ed3bcf52701282d7db3a99db2e7304bd4443c99 + cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 37deaa02f76fc3b8df620e305b450b06fe2b685d + 96c5254e5ca5040021caf779216b1b3641875b1e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5c887fb39f54..a74cc6ce7f01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22519.5 + 6.0.11-servicing.22523.4 - 6.0.11-servicing.22519.2 + 6.0.11-servicing.22523.2 @@ -56,8 +56,8 @@ - 6.0.306-servicing.22523.15 - 6.0.306-servicing.22523.15 + 6.0.306-servicing.22523.22 + 6.0.306-servicing.22523.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22519.3 - 6.0.11-servicing.22519.3 + 6.0.11-servicing.22523.3 + 6.0.11-servicing.22523.3 6.0.11 6.0.11 From fd20a7aec63381294f027e608be848cba2bba65f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 24 Oct 2022 17:40:02 +0000 Subject: [PATCH 0794/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221024.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22513.1 -> To Version 6.0.0-servicing.22524.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 35f36b8ecce9..ab210ee70b17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/source-build-reference-packages - 2477d388d8663fe6a3f1c82376600dbb19bd217d + 1d46a08542f49e0f2fdedea6710cc5f6bbc70b96 From 1c98222124d160734055f25d134b063835713e6a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 25 Oct 2022 17:02:51 +0000 Subject: [PATCH 0795/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221025.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22513.1 -> To Version 6.0.0-servicing.22525.2 --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b5c5c827f47..6bfce60af406 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -18,9 +19,11 @@ + + @@ -41,14 +44,17 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab210ee70b17..a5716024fa81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/source-build-reference-packages - 1d46a08542f49e0f2fdedea6710cc5f6bbc70b96 + 132cb2b3b6a9fab06cc9ec3a3473366c58af4b37 From 319ac0113e7513c635434122e30aa00ba589b3d8 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Wed, 26 Oct 2022 21:24:13 -0700 Subject: [PATCH 0796/1244] Ensure finalizer only runs when no matching SDK feature bands are installed --- src/finalizer/finalizer.cpp | 17 ++++++-- .../packaging/windows/clisdk/bundle.wxs | 41 ++++++++++++------- 2 files changed, 40 insertions(+), 18 deletions(-) diff --git a/src/finalizer/finalizer.cpp b/src/finalizer/finalizer.cpp index ecb6e1fa99fa..58bf9e1bd115 100644 --- a/src/finalizer/finalizer.cpp +++ b/src/finalizer/finalizer.cpp @@ -396,7 +396,17 @@ extern "C" HRESULT DetectSdk(LPWSTR sczSdkFeatureBandVersion, LPWSTR sczArchitec LogStringLine(REPORT_STANDARD, "Scanning %ls", sczInstalledSdkVersionsKeyName); hr = RegOpen(HKEY_LOCAL_MACHINE, sczInstalledSdkVersionsKeyName, KEY_READ, &hkInstalledSdkVersionsKey); - ExitOnFailure(hr, "Failed to read installed versions key."); + + // When the last SDK is removed the registry key should no longer exist so we can just exit + if (E_FILENOTFOUND == hr) + { + LogStringLine(REPORT_STANDARD, "Registry key not found: %ls.", sczInstalledSdkVersionsKeyName); + hr = S_OK; + *pbInstalled = FALSE; + goto LExit; + } + + ExitOnFailure(hr, "Failed to open registry key: %ls.", sczInstalledSdkVersionsKeyName); for (DWORD dwSdkVersionsValueIndex = 0;; ++dwSdkVersionsValueIndex) { @@ -460,9 +470,10 @@ int wmain(int argc, wchar_t* argv[]) hr = ::DetectSdk(sczFeatureBandVersion, argv[3], &bSdkFeatureBandInstalled); ExitOnFailure(hr, "Failed to detect installed SDKs."); - if (!bSdkFeatureBandInstalled) + // If the feature band is still present, do not remove workloads. + if (bSdkFeatureBandInstalled) { - LogStringLine(REPORT_STANDARD, "SDK with feature band %ls could not be found.", sczFeatureBandVersion); + LogStringLine(REPORT_STANDARD, "Detected SDK with feature band %ls.", sczFeatureBandVersion); goto LExit; } diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index c58c6a194740..148487bdeef6 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -151,7 +151,31 @@ - + + + + + @@ -208,20 +232,7 @@ - - + From 8ffa10fe479a2fa97f2f5cae18e955928b09b3f6 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Nov 2022 14:17:44 -0700 Subject: [PATCH 0797/1244] Update branding to 6.0.307 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b9cd43f20c9d..bc7a5c3a15c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 06 + 07 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c7fe18c3f80d4379f3620f5770f6e60b85437e6c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Nov 2022 14:17:48 -0700 Subject: [PATCH 0798/1244] Update branding to 6.0.404 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 266fd059cd14..d227a0641289 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From e58b4b582e9152942bf92047a4e1bd627429f035 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 7 Nov 2022 17:16:37 -0600 Subject: [PATCH 0799/1244] Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14896) --- eng/source-build-tarball-build-official.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index a230a4d7cf99..5d396baaba46 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -4,7 +4,19 @@ resources: pipelines: - pipeline: installer-build-resource source: dotnet-installer-official-ci - trigger: true + trigger: + branches: + include: + - main + - release/* + - internal/release/* + exclude: + - release/6.0.3xx + - internal/release/6.0.3xx + - release/6.0.4xx + - internal/release/6.0.4xx + stages: + - build stages: - stage: build From 753a4009a52b422cdc0d6598c7c40b2f432bee4c Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 8 Nov 2022 06:35:11 -0800 Subject: [PATCH 0800/1244] [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14911) * Refactor source-build CI triggers and pools (#14835) (#14878) * Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14896) Co-authored-by: Michael Simons Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Jason Zhai --- eng/source-build-tarball-build-official.yml | 14 +++++++++++++- .../job/source-build-create-tarball.yml | 17 +++++++++++++---- .../job/source-build-run-tarball-build.yml | 8 +++++++- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index a230a4d7cf99..5d396baaba46 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -4,7 +4,19 @@ resources: pipelines: - pipeline: installer-build-resource source: dotnet-installer-official-ci - trigger: true + trigger: + branches: + include: + - main + - release/* + - internal/release/* + exclude: + - release/6.0.3xx + - internal/release/6.0.3xx + - release/6.0.4xx + - internal/release/6.0.4xx + stages: + - build stages: - stage: build 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 cffdf6bdb92e..ac6d7301644e 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,11 +6,20 @@ jobs: displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ else }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + variables: - name: _BuildConfig value: Release 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 d927b3a86538..45dfbf787759 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 @@ -17,6 +17,9 @@ parameters: fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: name: NetCore1ESPool-Internal-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 poolInternalArm64: @@ -76,7 +79,10 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ parameters.poolPublicAmd64 }} ${{ if eq(variables['System.TeamProject'], 'internal') }}: - ${{ parameters.poolInternalAmd64 }} + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + ${{ parameters.poolInternalAmd64PR }} + ${{ else }}: + ${{ parameters.poolInternalAmd64 }} - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml From 48cf81fcc68a992c756421937cfb876f89e44cc7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Nov 2022 23:40:32 +0000 Subject: [PATCH 0801/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221025.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22513.1 -> To Version 6.0.0-servicing.22525.2 --- NuGet.config | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6bfce60af406..f8607453ff6a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,15 +16,10 @@ - - - - - @@ -45,17 +41,13 @@ + - - - - - From b874e10f7c5436e6ce22cafc7f289d082cc7577b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 09:22:49 -0800 Subject: [PATCH 0802/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#14935) * Update dependencies from https://github.com/dotnet/arcade build 20221108.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22512.3 -> To Version 6.0.0-beta.22558.2 * Update SourceBuild.Tasks.csproj tfm Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- NuGet.config | 18 ------ eng/Version.Details.xml | 12 ++-- eng/Versions.props | 2 +- eng/common/sdl/sdl.ps1 | 38 ++++++++++++ eng/common/templates/steps/execute-sdl.yml | 60 ++++++++++++------- global.json | 6 +- .../Arcade/src/SourceBuild.Tasks.csproj | 2 +- src/SourceBuild/Arcade/tools/BuildTasks.props | 2 +- 8 files changed, 90 insertions(+), 50 deletions(-) create mode 100644 eng/common/sdl/sdl.ps1 diff --git a/NuGet.config b/NuGet.config index e29afeaab5fc..2cf5556c3e9c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,21 +11,12 @@ - - - - - - - - - @@ -44,22 +35,13 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 778c6893249c..4660a8502e83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 841e1fe0d2498a7ac6445e458ae521511ec226ca - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 841e1fe0d2498a7ac6445e458ae521511ec226ca - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 841e1fe0d2498a7ac6445e458ae521511ec226ca https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d227a0641289..16d21c80e201 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22512.3 + 6.0.0-beta.22558.2 diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 new file mode 100644 index 000000000000..648c5068d7d6 --- /dev/null +++ b/eng/common/sdl/sdl.ps1 @@ -0,0 +1,38 @@ + +function Install-Gdn { + param( + [Parameter(Mandatory=$true)] + [string]$Path, + + # If omitted, install the latest version of Guardian, otherwise install that specific version. + [string]$Version + ) + + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + $disableConfigureToolsetImport = $true + $global:LASTEXITCODE = 0 + + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + + if ($Version) { + $argumentList += "-Version $Version" + } + + Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait + + $gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path + + if (!$gdnCliPath) + { + Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian' + } + + return $gdnCliPath.FullName +} \ No newline at end of file diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 7b8ee18a28d7..9dd5709f66dc 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -8,29 +8,28 @@ parameters: 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: NuGetAuthenticate@1 + inputs: + nuGetServiceConnections: GuardianConnect - 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.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian (Overridden) + +- ${{ if eq(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian - ${{ if ne(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} @@ -40,7 +39,7 @@ steps: - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -GuardianCliLocation $(GuardianCliLocation) -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} @@ -62,7 +61,28 @@ steps: c i condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn artifact: GuardianConfiguration displayName: Publish GuardianConfiguration + condition: succeededOrFailed() + + # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration + # with the "SARIF SAST Scans Tab" Azure DevOps extension + - task: CopyFiles@2 + displayName: Copy SARIF files + inputs: + flattenFolders: true + sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ + contents: '**/*.sarif' + targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + condition: succeededOrFailed() + + # Use PublishBuildArtifacts because the SARIF extension only checks this case + # see microsoft/sarif-azuredevops-extension#4 + - task: PublishBuildArtifacts@1 + displayName: Publish SARIF files to CodeAnalysisLogs container + inputs: + pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + artifactName: CodeAnalysisLogs condition: succeededOrFailed() \ No newline at end of file diff --git a/global.json b/global.json index 20ae9a5afc17..b779ff3ff927 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.110", + "dotnet": "6.0.111", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22512.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.2" } } diff --git a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj index 735289e705a9..bd43b568b256 100644 --- a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj +++ b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj @@ -1,6 +1,6 @@ - net5.0 + net6.0 false false disable diff --git a/src/SourceBuild/Arcade/tools/BuildTasks.props b/src/SourceBuild/Arcade/tools/BuildTasks.props index 4014b87ad046..57c4a4b0a519 100644 --- a/src/SourceBuild/Arcade/tools/BuildTasks.props +++ b/src/SourceBuild/Arcade/tools/BuildTasks.props @@ -2,6 +2,6 @@ - $(RepoRoot)\artifacts\bin\SourceBuild.Tasks\$(Configuration)\net5.0\SourceBuild.Tasks.dll + $(RepoRoot)\artifacts\bin\SourceBuild.Tasks\$(Configuration)\net6.0\SourceBuild.Tasks.dll \ No newline at end of file From b48e4150de52897ad8ebdab6cb0551c17f5e474b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Nov 2022 00:05:41 +0000 Subject: [PATCH 0803/1244] Update dependencies from https://github.com/dotnet/arcade build 20221108.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.2 -> To Version 6.0.0-beta.22558.7 --- NuGet.config | 2 -- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/dotnet-install.sh | 4 ++-- global.json | 4 ++-- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index d5f4b3c3c2cd..03d3587a670c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -38,7 +37,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f6927b79338..30ec9ee0a4d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ef6da98d20e5..4bdd19be02d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22558.2 + 6.0.0-beta.22558.7 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e7d4..b09ea669f9c0 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; amd64|x86_64) @@ -61,7 +61,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/global.json b/global.json index b779ff3ff927..8facf9ad2813 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.22558.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.7" } } From cf00abac6931f5f92aa95177cb171bd0e33bab3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Nov 2022 00:06:00 +0000 Subject: [PATCH 0804/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221025.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22464.1 -> To Version 6.0.0-servicing.22525.2 --- NuGet.config | 2 -- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index d5f4b3c3c2cd..03d3587a670c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -38,7 +37,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f6927b79338..b7dec2be643e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 841e1fe0d2498a7ac6445e458ae521511ec226ca - + https://github.com/dotnet/source-build-reference-packages - 59e601c150793f6a32cd39e598ba6fe94edfe21d + 132cb2b3b6a9fab06cc9ec3a3473366c58af4b37 From a37b94428373178f66775791a8ea5ab0a9681a09 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Nov 2022 05:28:18 +0000 Subject: [PATCH 0805/1244] Update dependencies from https://github.com/dotnet/arcade build 20221108.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22463.7 -> To Version 6.0.0-beta.22558.7 --- NuGet.config | 6 ------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/build.ps1 | 5 +++++ eng/common/dotnet-install.sh | 4 ++-- eng/common/init-tools-native.ps1 | 1 + global.json | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index f8607453ff6a..2cf5556c3e9c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -40,9 +37,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5716024fa81..f2aefea3e28c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + a7773a9828c67a9b1fba3d2daee061ec90db3505 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ebdb6d1f5c5d..27d9d8d2907b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22463.7 + 6.0.0-beta.22558.7 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242f6e..33a6f2d0e248 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -67,6 +68,7 @@ function Print-Usage() { Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e7d4..b09ea669f9c0 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; amd64|x86_64) @@ -61,7 +61,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 7428ef88084f..6c7a851a8087 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -112,6 +112,7 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } diff --git a/global.json b/global.json index 9d1e2d901e8f..8facf9ad2813 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.109", + "dotnet": "6.0.111", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22463.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.7" } } From 364781dce558ed570ceaeef49e3ee44163183757 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 14 Nov 2022 10:49:47 -0800 Subject: [PATCH 0806/1244] Update asp.net templates (#14956) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ebdb6d1f5c5d..681d9c657f3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.30 + 3.1.31 3.2.1 4.8.0-rc2.19462.10 From 169bf3cc9d307fee9d16f52f5f70bc45e09bae94 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 14 Nov 2022 10:49:54 -0800 Subject: [PATCH 0807/1244] Update asp.net templates (#14957) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4bdd19be02d0..b08140799c8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.30 + 3.1.31 3.2.1 4.8.0-rc2.19462.10 From b3add4e9b98b4ab96bee412cc864ba66dd224ae7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Nov 2022 19:09:15 +0000 Subject: [PATCH 0808/1244] Update dependencies from https://github.com/dotnet/arcade build 20221110.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.7 -> To Version 6.0.0-beta.22560.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 f2aefea3e28c..cd92817aa865 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 62921932bb4d..5256df87acc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22558.7 + 6.0.0-beta.22560.1 diff --git a/global.json b/global.json index 8facf9ad2813..e7ba925c71c6 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.22558.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22560.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22560.1" } } From 36953bd013e7ac58a04004604f38eafadcc2ac6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 13:07:44 -0800 Subject: [PATCH 0809/1244] Update dependencies from https://github.com/dotnet/arcade build 20221110.1 (#14987) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.7 -> To Version 6.0.0-beta.22560.1 Co-authored-by: dotnet-maestro[bot] --- 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 252fe486e5c6..81bc7dec6035 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b08140799c8c..f70cd8d28462 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22558.7 + 6.0.0-beta.22560.1 diff --git a/global.json b/global.json index 8facf9ad2813..e7ba925c71c6 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.22558.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22560.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22560.1" } } From b11f5b701c6acfcafe8c955c26865d6268c11cc7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Nov 2022 21:33:39 +0000 Subject: [PATCH 0810/1244] Update dependencies from https://github.com/dotnet/arcade build 20221111.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.7 -> To Version 6.0.0-beta.22561.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 cd92817aa865..58a7a8f4e5d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 5256df87acc2..ad5802566249 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22560.1 + 6.0.0-beta.22561.1 diff --git a/global.json b/global.json index e7ba925c71c6..30864f9a77c6 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.22560.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22560.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22561.1" } } From f80515a1962bc98859762f601dc36b17cb9320ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 14:33:43 -0800 Subject: [PATCH 0811/1244] Update dependencies from https://github.com/dotnet/arcade build 20221111.1 (#14990) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22560.1 -> To Version 6.0.0-beta.22561.1 Co-authored-by: dotnet-maestro[bot] --- 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 81bc7dec6035..e10ce34fd376 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f70cd8d28462..a497d55197ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22560.1 + 6.0.0-beta.22561.1 diff --git a/global.json b/global.json index e7ba925c71c6..30864f9a77c6 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.22560.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22560.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22561.1" } } From e47b02315a26e457f16c293a60abcdd4f381fd84 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Nov 2022 18:16:09 +0000 Subject: [PATCH 0812/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221115.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.306-servicing.22523.22 -> To Version 6.0.307-servicing.22565.5 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 From Version 6.0.11 -> To Version 6.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 40 +++++++++---------- 3 files changed, 71 insertions(+), 63 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cf5556c3e9c..de17647440eb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,11 +41,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58a7a8f4e5d3..6fc565e6e63b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46b48e7a82d138728be2d24594b5ce98d6af92dc + ae169984a721fadfe846a046b44a83bc039c329f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46b48e7a82d138728be2d24594b5ce98d6af92dc + ae169984a721fadfe846a046b44a83bc039c329f diff --git a/eng/Versions.props b/eng/Versions.props index ad5802566249..8268cf49a3a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.306 + 6.0.307 @@ -44,20 +44,20 @@ - 6.0.11 - 6.0.11 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 + 6.0.12 + 6.0.12 + 6.0.12-servicing.22564.30 + 6.0.12-servicing.22564.30 + 6.0.12-servicing.22564.30 + 6.0.12-servicing.22564.30 0.2.0 - 6.0.306-servicing.22523.22 - 6.0.306-servicing.22523.22 + 6.0.307-servicing.22565.5 + 6.0.307-servicing.22565.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11 - 6.0.11 - 6.0.11 - 6.0.11 + 6.0.12-servicing.22561.4 + 6.0.12-servicing.22561.4 + 6.0.12 + 6.0.12 + 6.0.12 + 6.0.12 2.1.0 - 6.0.11-servicing.22523.3 - 6.0.11-servicing.22523.3 - 6.0.11 - 6.0.11 + 6.0.12-servicing.22554.3 + 6.0.12-servicing.22554.3 + 6.0.12 + 6.0.12 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.306 + 6.0.307 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 1fca57de6087be75b0999915f8797f4cedee92e6 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 15 Nov 2022 18:24:05 -0800 Subject: [PATCH 0813/1244] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 7707ace1a46d..2bf456f306d8 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.27 - 10.0.18362.27 - 10.0.19041.27 - 10.0.20348.27 - 10.0.22000.27 - 10.0.22621.27 + 10.0.17763.28 + 10.0.18362.28 + 10.0.19041.28 + 10.0.20348.28 + 10.0.22000.28 + 10.0.22621.28 From 030676c5c3f41fc251b71f4b7fce754450b8791b Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 15 Nov 2022 18:25:09 -0800 Subject: [PATCH 0814/1244] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 7707ace1a46d..2bf456f306d8 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.27 - 10.0.18362.27 - 10.0.19041.27 - 10.0.20348.27 - 10.0.22000.27 - 10.0.22621.27 + 10.0.17763.28 + 10.0.18362.28 + 10.0.19041.28 + 10.0.20348.28 + 10.0.22000.28 + 10.0.22621.28 From 958a92b77c43e25035ef2505a82358d1d9d49b28 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 17 Nov 2022 16:55:23 +0000 Subject: [PATCH 0815/1244] Merged PR 27536: [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.AspNetCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8 (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**: 20221116.5 - **Date Produced**: November 16, 2022 6:08:24 PM UTC - **Commit**: 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22565.5 to 6.0.307-servicing.22566.5][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22565.5 to 6.0.307-servicing.22566.5][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8][2] - **dotnet-dev-certs**: [from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8][2] - **dotnet-user-secrets**: [from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCae16998&targetVersion=GC14940c9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC621e64b&targetVersion=GC441cb92&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 de17647440eb..fe4877de78c6 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 6fc565e6e63b..db1e290c1db2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae169984a721fadfe846a046b44a83bc039c329f + 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae169984a721fadfe846a046b44a83bc039c329f + 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc diff --git a/eng/Versions.props b/eng/Versions.props index 8268cf49a3a4..cf52dcf31844 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22564.30 - 6.0.12-servicing.22564.30 - 6.0.12-servicing.22564.30 - 6.0.12-servicing.22564.30 + 6.0.12-servicing.22565.8 + 6.0.12-servicing.22565.8 + 6.0.12-servicing.22565.8 + 6.0.12-servicing.22565.8 0.2.0 - 6.0.307-servicing.22565.5 - 6.0.307-servicing.22565.5 + 6.0.307-servicing.22566.5 + 6.0.307-servicing.22566.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 262e147b0fdfeff7c35c4dc59162efb2aa273a31 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 18 Nov 2022 03:05:33 +0000 Subject: [PATCH 0816/1244] Merged PR 27620: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22561.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22561.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22565.8 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22565.8 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22565.8 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22565.8 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22564.26 to 6.0.307-servicing.22564.36 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (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**: 20221117.19 - **Date Produced**: November 17, 2022 10:16:18 PM UTC - **Commit**: 9111e1c94790e09cf4743a2571d8c4fa660ad37d - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22566.5 to 6.0.307-servicing.22567.19][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22566.5 to 6.0.307-servicing.22567.19][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22561.4 t... --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe4877de78c6..b05b9cb3cd13 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,12 +41,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db1e290c1db2..b9f1966d3b1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc + 9111e1c94790e09cf4743a2571d8c4fa660ad37d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc + 9111e1c94790e09cf4743a2571d8c4fa660ad37d diff --git a/eng/Versions.props b/eng/Versions.props index cf52dcf31844..fe7cb3d9a8f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22565.8 - 6.0.12-servicing.22565.8 - 6.0.12-servicing.22565.8 - 6.0.12-servicing.22565.8 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 0.2.0 - 6.0.307-servicing.22566.5 - 6.0.307-servicing.22566.5 + 6.0.307-servicing.22567.19 + 6.0.307-servicing.22567.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.12-servicing.22561.4 - 6.0.12-servicing.22561.4 + 6.0.12-servicing.22566.2 + 6.0.12-servicing.22566.2 6.0.12 6.0.12 6.0.12 From d0a2e7a4be924164f800631ffeb139af90d853b6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 18 Nov 2022 16:11:28 +0000 Subject: [PATCH 0817/1244] Merged PR 27640: [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.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22564.36 to 6.0.307-servicing.22567.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (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**: 20221117.31 - **Date Produced**: November 18, 2022 3:03:04 AM UTC - **Commit**: 68caa23a95462cda1e340e8fe4789125422fcda1 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22567.19 to 6.0.307-servicing.22567.31][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22567.19 to 6.0.307-servicing.22567.31][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22564.36 to 6.0.307-servicing.22567.7][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.307 to 6.0.307][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9111e1c&targetVersion=GC68caa23&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC7f5bdb9&targetVersion=GC42a1b9e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 b05b9cb3cd13..1dc2e5478638 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9f1966d3b1c..8694529b09f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9111e1c94790e09cf4743a2571d8c4fa660ad37d + 68caa23a95462cda1e340e8fe4789125422fcda1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9111e1c94790e09cf4743a2571d8c4fa660ad37d + 68caa23a95462cda1e340e8fe4789125422fcda1 diff --git a/eng/Versions.props b/eng/Versions.props index fe7cb3d9a8f4..1401ec5ab671 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.307-servicing.22567.19 - 6.0.307-servicing.22567.19 + 6.0.307-servicing.22567.31 + 6.0.307-servicing.22567.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f7ab730194bc086ed0696688fc9c438b8de4de54 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 18 Nov 2022 18:20:53 +0000 Subject: [PATCH 0818/1244] Merged PR 27621: [internal/release/6.0.4xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.403 to 6.0.404 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.403-rtm.22523.6 to 6.0.404-rtm.22567.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.403 to 6.0.404 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22478.1 to 6.0.200-1.22553.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.3.1-3.22505.12 to 4.3.1-3.22526.13 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221117.20 - **Date Produced**: November 17, 2022 10:16:52 PM UTC - **Commit**: c816d3f1331a8e81e166d4543d81efbca0168a19 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22523.23 to 6.0.... --- NuGet.config | 6 ++++ eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 60 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03d3587a670c..74cf836b2d5d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,17 @@ + + + @@ -37,10 +40,13 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e10ce34fd376..769fa0af3373 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b + 54b1902dd65349f55552c8af533293cd4ac4def9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b + 54b1902dd65349f55552c8af533293cd4ac4def9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b + 54b1902dd65349f55552c8af533293cd4ac4def9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385 + 128990fc9e7041579b0acafb721b6f996f62e5c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385 + 128990fc9e7041579b0acafb721b6f996f62e5c0 @@ -135,15 +135,15 @@ 83d2f8162d29a66a8ff323c4bba93c8250013511 - + https://github.com/dotnet/linker - 50c2ec00b794ebd130402d51b960c69cfc9ee622 + 4be765525a1b45d28ab69a48f92e008b70a4e56e linker - + https://github.com/dotnet/roslyn - 954930214e5a116e3aa1f81cab887b294ae95739 + 41a5af9d2c459a06c0795bf21a1c046200f375bf diff --git a/eng/Versions.props b/eng/Versions.props index a497d55197ee..67f308f8afd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.403 + 6.0.404 @@ -44,20 +44,20 @@ - 6.0.11 - 6.0.11 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 + 6.0.12 + 6.0.12 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 0.2.0 - 6.0.403-servicing.22523.23 - 6.0.403-servicing.22523.23 + 6.0.404-servicing.22568.3 + 6.0.404-servicing.22568.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11 - 6.0.11 - 6.0.11 - 6.0.11 + 6.0.12-servicing.22566.2 + 6.0.12-servicing.22566.2 + 6.0.12 + 6.0.12 + 6.0.12 + 6.0.12 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.403 + 6.0.404 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 224289d7fb63f0b1d8c24b580c1f2a661c5e5818 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 20 Nov 2022 01:42:16 +0000 Subject: [PATCH 0819/1244] Merged PR 27685: [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**: 20221119.2 - **Date Produced**: November 19, 2022 6:06:33 PM UTC - **Commit**: 088530583952a8bc3348eedca0403b7e8dc37012 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22567.31 to 6.0.307-servicing.22569.2][4] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22567.31 to 6.0.307-servicing.22569.2][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][5] - **Microsoft.NETCore.App.Ref**: [from 6.0.12 to 6.0.12][5] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][5] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][5] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.12 to 6.0.12][5] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.12 to 6.0.12][5] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][6] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][6] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][6] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][6] - **dotnet-dev-certs**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][6] - **dotnet-user-secrets**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][6] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][7] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22567.7 to 6.0.307-servicing.22568.6][7] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.307 to 6.0.307][7] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC68caa23&targetVersion=GC0885305&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC301f927&targetVersion=GC02e45a4&_a=files [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC086f577&targetVersion=GC6a747bb&_a=files [7]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC42a1b9e&targetVersion=GC16555ee&_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/DependencyDescription... --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1dc2e5478638..b2164ea3b63e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,12 +41,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8694529b09f9..3b934bddcef7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68caa23a95462cda1e340e8fe4789125422fcda1 + 088530583952a8bc3348eedca0403b7e8dc37012 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68caa23a95462cda1e340e8fe4789125422fcda1 + 088530583952a8bc3348eedca0403b7e8dc37012 diff --git a/eng/Versions.props b/eng/Versions.props index 1401ec5ab671..04f09e8d75f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 0.2.0 - 6.0.307-servicing.22567.31 - 6.0.307-servicing.22567.31 + 6.0.307-servicing.22569.2 + 6.0.307-servicing.22569.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.12-servicing.22566.2 - 6.0.12-servicing.22566.2 + 6.0.12-servicing.22568.7 + 6.0.12-servicing.22568.7 6.0.12 6.0.12 6.0.12 From 13fcc4c2804478056df7158bec00e5f4bc72258b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 20 Nov 2022 01:44:05 +0000 Subject: [PATCH 0820/1244] Merged PR 27686: [internal/release/6.0.4xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.404-rtm.22567.9 to 6.0.404-rtm.22568.8 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221119.3 - **Date Produced**: November 19, 2022 6:04:19 PM UTC - **Commit**: 8079819072dc5e548ec11142b660908d28125a67 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22568.3 to 6.0.404-servicing.22569.3][3] - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22568.3 to 6.0.404-servicing.22569.3][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22566.2 to 6.0.12-ser... --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 74cf836b2d5d..a4e0e740a2e6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -40,13 +40,13 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 769fa0af3373..41d6fd8449c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 54b1902dd65349f55552c8af533293cd4ac4def9 + 5d5361de390b0298b583e37dc91e4e7462bd9b26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 54b1902dd65349f55552c8af533293cd4ac4def9 + 5d5361de390b0298b583e37dc91e4e7462bd9b26 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 54b1902dd65349f55552c8af533293cd4ac4def9 + 5d5361de390b0298b583e37dc91e4e7462bd9b26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 128990fc9e7041579b0acafb721b6f996f62e5c0 + 8079819072dc5e548ec11142b660908d28125a67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 128990fc9e7041579b0acafb721b6f996f62e5c0 + 8079819072dc5e548ec11142b660908d28125a67 diff --git a/eng/Versions.props b/eng/Versions.props index 67f308f8afd0..8ebafe121222 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 0.2.0 - 6.0.404-servicing.22568.3 - 6.0.404-servicing.22568.3 + 6.0.404-servicing.22569.3 + 6.0.404-servicing.22569.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.12-servicing.22566.2 - 6.0.12-servicing.22566.2 + 6.0.12-servicing.22568.7 + 6.0.12-servicing.22568.7 6.0.12 6.0.12 6.0.12 From d8baae5792c628492ba86bc6c51a3cbd2036d732 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Nov 2022 01:12:05 +0000 Subject: [PATCH 0821/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221110.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22525.2 -> To Version 6.0.0-servicing.22560.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 3b934bddcef7..b737f247299b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 132cb2b3b6a9fab06cc9ec3a3473366c58af4b37 + 701788259f5eba4eb8a9d1a0ee9e4ab6fa53c296 From eb6f31a22fe389a52116933558e7fb2bfdc2bd32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 01:12:06 +0000 Subject: [PATCH 0822/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221110.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22525.2 -> To Version 6.0.0-servicing.22560.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 e10ce34fd376..785371c43377 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 132cb2b3b6a9fab06cc9ec3a3473366c58af4b37 + 701788259f5eba4eb8a9d1a0ee9e4ab6fa53c296 From 73a3117d8dda6c461c4acafdef81334b28f4fafd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 02:53:05 +0000 Subject: [PATCH 0823/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221120.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22525.2 -> To Version 6.0.0-servicing.22570.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 785371c43377..890a79137ed2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 701788259f5eba4eb8a9d1a0ee9e4ab6fa53c296 + 38385bc8b19cebe7ae7d20771646158785ee5bdc From 8179bb6bb8d5add743c0406ab04ffcf6e6f9126b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Nov 2022 02:53:05 +0000 Subject: [PATCH 0824/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221120.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22525.2 -> To Version 6.0.0-servicing.22570.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 b737f247299b..7d14babfe0b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 701788259f5eba4eb8a9d1a0ee9e4ab6fa53c296 + 38385bc8b19cebe7ae7d20771646158785ee5bdc From 8cddaa7d01d3eca8fed169759661d7dbcc06fd7d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Nov 2022 23:19:42 +0000 Subject: [PATCH 0825/1244] Merged PR 27731: [internal/release/6.0.4xx] 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.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.404-rtm.22568.8 to 6.0.404-rtm.22571.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221121.18 - **Date Produced**: November 21, 2022 10:36:58 PM UTC - **Commit**: bd3ef45d81cb82631d9349045fd5fab8c3b3a3f7 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22569.3 to 6.0.404-servicing.22571.18][1] - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22569.3 to 6.0.404-servicing.22571.18][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-dev-certs**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-user-secrets**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.404 to 6.0.404][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.404-rtm.22568.8 to 6.0.404-rtm.22571.13][3] - **Microsoft.DotNet.Com... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index a4e0e740a2e6..efd7a806c41d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -40,13 +40,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d503389e438d..28bc11c205ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5d5361de390b0298b583e37dc91e4e7462bd9b26 + 81a6b3990a59ea77eb4a13f65242dd166cf7a23b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5d5361de390b0298b583e37dc91e4e7462bd9b26 + 81a6b3990a59ea77eb4a13f65242dd166cf7a23b https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5d5361de390b0298b583e37dc91e4e7462bd9b26 + 81a6b3990a59ea77eb4a13f65242dd166cf7a23b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8079819072dc5e548ec11142b660908d28125a67 + bd3ef45d81cb82631d9349045fd5fab8c3b3a3f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8079819072dc5e548ec11142b660908d28125a67 + bd3ef45d81cb82631d9349045fd5fab8c3b3a3f7 diff --git a/eng/Versions.props b/eng/Versions.props index 8ebafe121222..ddbacd9469cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 0.2.0 - 6.0.404-servicing.22569.3 - 6.0.404-servicing.22569.3 + 6.0.404-servicing.22571.18 + 6.0.404-servicing.22571.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c9ce9473e125089aa10770b676d4a19bae4fa067 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Nov 2022 23:19:51 +0000 Subject: [PATCH 0826/1244] Merged PR 27732: [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.AspNetCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22568.6 to 6.0.307-servicing.22571.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (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**: 20221121.17 - **Date Produced**: November 21, 2022 10:36:24 PM UTC - **Commit**: 923a0bd20698ff7e1109ee8f639240bc089d1ebc - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22569.2 to 6.0.307-servicing.22571.17][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22569.2 to 6.0.307-servicing.22571.17][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-dev-certs**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-user-secrets**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22568.6 to 6.0.307-servicing.22571.12][3] ... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2164ea3b63e..24c5266f470c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -41,12 +41,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d14babfe0b5..4265684a5438 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 088530583952a8bc3348eedca0403b7e8dc37012 + 923a0bd20698ff7e1109ee8f639240bc089d1ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 088530583952a8bc3348eedca0403b7e8dc37012 + 923a0bd20698ff7e1109ee8f639240bc089d1ebc diff --git a/eng/Versions.props b/eng/Versions.props index 04f09e8d75f0..654cca3c6d79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 0.2.0 - 6.0.307-servicing.22569.2 - 6.0.307-servicing.22569.2 + 6.0.307-servicing.22571.17 + 6.0.307-servicing.22571.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84a0f82424355693ce7c334f6ab34316a9aa6061 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Nov 2022 18:21:59 +0000 Subject: [PATCH 0827/1244] Merged PR 27753: [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.7 to 6.0.7 (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**: 20221122.12 - **Date Produced**: November 22, 2022 5:39:03 PM UTC - **Commit**: 1f6220ecb4f61ace28461f611ab1caeb618d2473 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22571.17 to 6.0.307-servicing.22572.12][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22571.17 to 6.0.307-servicing.22572.12][1] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC923a0bd&targetVersion=GC1f6220e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4437f08&targetVersion=GC943474c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 4265684a5438..81d0b6937db0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4437f088ec63a72bdbc05a1792307415e45d20ad + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 923a0bd20698ff7e1109ee8f639240bc089d1ebc + 1f6220ecb4f61ace28461f611ab1caeb618d2473 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 923a0bd20698ff7e1109ee8f639240bc089d1ebc + 1f6220ecb4f61ace28461f611ab1caeb618d2473 diff --git a/eng/Versions.props b/eng/Versions.props index 654cca3c6d79..29f930960bef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.307-servicing.22571.17 - 6.0.307-servicing.22571.17 + 6.0.307-servicing.22572.12 + 6.0.307-servicing.22572.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e998bcbeae74a596d217291407cca54724edd0d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Nov 2022 23:17:59 +0000 Subject: [PATCH 0828/1244] Merged PR 27765: [internal/release/6.0.4xx] 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.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221122.23 - **Date Produced**: November 22, 2022 10:51:20 PM UTC - **Commit**: f97d3fbf9f1ac425f1cd0d74efba7fa61d799fd1 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22571.18 to 6.0.404-servicing.22572.23][1] - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22571.18 to 6.0.404-servicing.22572.23][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.12][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.12][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.12][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbd3ef45&targetVersion=GCf97d3fb&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCee26d5b&targetVersion=GCfb08461&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 2 ++ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index efd7a806c41d..a930d5173dd8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,6 +20,7 @@ + @@ -49,6 +50,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28bc11c205ce..4301fa690f76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 81a6b3990a59ea77eb4a13f65242dd166cf7a23b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bd3ef45d81cb82631d9349045fd5fab8c3b3a3f7 + f97d3fbf9f1ac425f1cd0d74efba7fa61d799fd1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bd3ef45d81cb82631d9349045fd5fab8c3b3a3f7 + f97d3fbf9f1ac425f1cd0d74efba7fa61d799fd1 diff --git a/eng/Versions.props b/eng/Versions.props index ddbacd9469cb..6b882a9afe3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.404-servicing.22571.18 - 6.0.404-servicing.22571.18 + 6.0.404-servicing.22572.23 + 6.0.404-servicing.22572.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.11-servicing.22523.3 - 6.0.11-servicing.22523.3 - 6.0.11 - 6.0.11 + 6.0.12-servicing.22554.3 + 6.0.12-servicing.22554.3 + 6.0.12 + 6.0.12 From 55b7c993a198f292f8bfecec53248902fc53ec6a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 29 Nov 2022 00:25:25 +0000 Subject: [PATCH 0829/1244] Merged PR 27853: [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.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22571.12 to 6.0.307-servicing.22575.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22523.2 to 6.0.12-servicing.22569.2 (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**: 20221128.7 - **Date Produced**: November 28, 2022 11:33:02 PM UTC - **Commit**: 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22572.12 to 6.0.307-servicing.22578.7][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22572.12 to 6.0.307-servicing.22578.7][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22571.12 to 6.0.307-servicing.22575.5][3] - **Microsoft.... --- NuGet.config | 10 ++++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 24c5266f470c..1c6f27d32d58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -17,10 +18,10 @@ - + - + @@ -41,15 +42,16 @@ + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81d0b6937db0..60d19a74a818 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f6220ecb4f61ace28461f611ab1caeb618d2473 + 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f6220ecb4f61ace28461f611ab1caeb618d2473 + 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 + bf70006b6e83a62167705431d633d1fd1ab49b34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 96c5254e5ca5040021caf779216b1b3641875b1e + 4178d795849932702f98b7f375f6341267510326 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 29f930960bef..27f4eb485ac0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22523.4 + 6.0.12-servicing.22568.10 - 6.0.11-servicing.22523.2 + 6.0.12-servicing.22569.2 @@ -56,8 +56,8 @@ - 6.0.307-servicing.22572.12 - 6.0.307-servicing.22572.12 + 6.0.307-servicing.22578.7 + 6.0.307-servicing.22578.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.12-servicing.22554.3 - 6.0.12-servicing.22554.3 + 6.0.12-servicing.22578.4 + 6.0.12-servicing.22578.4 6.0.12 6.0.12 From be4f3ec4116a6987a84aa7890f764e9c669157f5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 29 Nov 2022 00:25:33 +0000 Subject: [PATCH 0830/1244] Merged PR 27854: [internal/release/6.0.4xx] 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.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.404-rtm.22571.13 to 6.0.404-rtm.22575.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22523.2 to 6.0.12-servicing.22569.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221128.8 - **Date Produced**: November 28, 2022 11:33:35 PM UTC - **Commit**: 4b872018e4f78db68cdc8568b80999eb25b3d7c1 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22572.23 to 6.0.404-servicing.22578.8][1] - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22572.23 to 6.0.404-servicing.22578.8][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.404 to 6.0.404][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.404-rtm.22571.13 to 6.0.404-rtm.22575.6][3] - **Microsoft.DotNet.Common.ProjectTem... --- NuGet.config | 10 ++++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index a930d5173dd8..d6bbaa92409a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -17,10 +18,10 @@ - + - + @@ -41,16 +42,17 @@ + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4301fa690f76..7c41840e4485 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81a6b3990a59ea77eb4a13f65242dd166cf7a23b + 87e5f0cad0ff547b1ca59c34119890a4ad68c2db - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81a6b3990a59ea77eb4a13f65242dd166cf7a23b + 87e5f0cad0ff547b1ca59c34119890a4ad68c2db https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81a6b3990a59ea77eb4a13f65242dd166cf7a23b + 87e5f0cad0ff547b1ca59c34119890a4ad68c2db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f97d3fbf9f1ac425f1cd0d74efba7fa61d799fd1 + 4b872018e4f78db68cdc8568b80999eb25b3d7c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f97d3fbf9f1ac425f1cd0d74efba7fa61d799fd1 + 4b872018e4f78db68cdc8568b80999eb25b3d7c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 + bf70006b6e83a62167705431d633d1fd1ab49b34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 96c5254e5ca5040021caf779216b1b3641875b1e + 4178d795849932702f98b7f375f6341267510326 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6b882a9afe3f..3eb4349ebd2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22523.4 + 6.0.12-servicing.22568.10 - 6.0.11-servicing.22523.2 + 6.0.12-servicing.22569.2 @@ -56,8 +56,8 @@ - 6.0.404-servicing.22572.23 - 6.0.404-servicing.22572.23 + 6.0.404-servicing.22578.8 + 6.0.404-servicing.22578.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.12-servicing.22554.3 - 6.0.12-servicing.22554.3 + 6.0.12-servicing.22578.4 + 6.0.12-servicing.22578.4 6.0.12 6.0.12 From 5621f190dcebd708fc0503b3836a6a0e49e1cba2 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 29 Nov 2022 10:42:23 -0800 Subject: [PATCH 0831/1244] Update branding to 6.0.308 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 681d9c657f3d..e52d1d9fbabf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 07 + 08 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 41303c7fc4487ddc71af40f919874ade2444942a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 29 Nov 2022 10:42:27 -0800 Subject: [PATCH 0832/1244] Update branding to 6.0.405 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a497d55197ee..0c81327dea1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 1674f77f14afcdb6488996baf6ca47ddcfe31f4e Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 30 Nov 2022 06:57:17 -0800 Subject: [PATCH 0833/1244] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15058) * [release/6.0.1xx] Add CI for security-partners-dotnet (#14963) * Add CI for dotnet-security-partners * Remove nuget configs from all repo submodules * Address code review * Move security-partners ci to tarball/eng dir * Copy out installer NuGet config before build * Fix relative path for installer template * Update src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml Co-authored-by: Michael Simons * Revert "Remove nuget configs from all repo submodules" This reverts commit 87b8a2c523eb03a5d3eee1dcde3e01c15bddc3d2. Co-authored-by: Michael Simons * Update branding to 6.0.113 Co-authored-by: Logan Bussell Co-authored-by: Michael Simons Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: Matt Mitchell --- .../job/source-build-build-tarball.yml | 70 +++++++++++-------- .../pipelines/security-partners-dotnet.yml | 18 +++++ 2 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index ff035940f584..b7318d2626a8 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -43,7 +43,15 @@ jobs: - name: additionalBuildArgs value: --with-sdk /tarball/.dotnet - name: tarballDir - value: $(Build.StagingDirectory)/tarball + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory) + ${{ else }}: + value: $(Build.StagingDirectory)/tarball + - name: installerSrcDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory)/src/installer + ${{ else }}: + value: $(Build.SourcesDirectory) workspace: clean: all @@ -51,19 +59,28 @@ 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) + - ${{ if ne(parameters.installerBuildResourceId, '') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-source*.tar.gz' + displayName: Download Source Tarball + + - script: | + set -x - - download: ${{ parameters.installerBuildResourceId }} - artifact: BlobArtifacts - patterns: '**/dotnet-sdk-source*.tar.gz' - displayName: Download Source Tarball + resourceIdPathSegment= + if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then + resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' + fi + + mkdir -p "$(tarballDir)" + tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" + eval rm -f "$tarballFilePath" + displayName: Extract Tarball + + - script: cp $(installerSrcDir)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + displayName: Copy Test NuGet Config - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - download: ${{ parameters.installerBuildResourceId }} @@ -84,20 +101,6 @@ jobs: Contents: '*.tar.gz' TargetFolder: $(tarballDir)/packages/archive/ - - script: | - set -x - - resourceIdPathSegment= - if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then - resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' - fi - - mkdir -p "$(tarballDir)" - tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" - eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" - eval rm -f "$tarballFilePath" - displayName: Extract Tarball - - script: | set -x @@ -135,13 +138,18 @@ jobs: docker run --rm -v $(tarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) displayName: Build Tarball + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerSrcDir)/eng/common/SetupNugetSources.sh + arguments: $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: | set -x - # Use installer repo's NuGet.config during online testing to utilize internal feeds - rm -f $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config - cp $(Build.SourcesDirectory)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config - dockerVolumeArgs="-v $(tarballDir):/tarball" dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" poisonArg='' diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml new file mode 100644 index 000000000000..f96c9fb37d49 --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -0,0 +1,18 @@ +trigger: none + +jobs: +- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml + parameters: + architecture: x64 + excludeSdkContentTests: true + matrix: + Ubuntu1804-Offline: + _BootstrapPrep: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false + name: Build_Tarball_x64 + pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 From 97dc64711fdd4ce09bdeb36b78b6bfd4c557d92b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 16:33:53 +0000 Subject: [PATCH 0834/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221130.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22570.2 -> To Version 6.0.0-servicing.22580.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 890a79137ed2..c41c7c02feee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 38385bc8b19cebe7ae7d20771646158785ee5bdc + a93f0b1b98f48057457f9532aa3d76f1565b5182 From 98712840e7b02488fab96d850bce683b55b27575 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 10:33:48 +0000 Subject: [PATCH 0835/1244] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 24 ++++++++++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1c6f27d32d58..af69e5bbfc0d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,10 @@ + + + + @@ -16,12 +20,20 @@ + + + + + + + + @@ -43,14 +55,26 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60d19a74a818..c6e3fc6bb44b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e + 91215e5f412ebab17a454bed0ad2b3ca9163a4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e + 91215e5f412ebab17a454bed0ad2b3ca9163a4c1 diff --git a/eng/Versions.props b/eng/Versions.props index 42673d128947..b409f7267def 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.307-servicing.22578.7 - 6.0.307-servicing.22578.7 + 6.0.308-servicing.22580.32 + 6.0.308-servicing.22580.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e4e584bbad97007aa734608309d5441031b4537 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 13:31:18 +0000 Subject: [PATCH 0836/1244] [internal/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 c6e3fc6bb44b..ed683d37b4d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 38385bc8b19cebe7ae7d20771646158785ee5bdc + a93f0b1b98f48057457f9532aa3d76f1565b5182 From 985447f2fe9f05c66b071db06b9af726ea83032f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 19:48:16 +0000 Subject: [PATCH 0837/1244] Merged PR 28024: [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.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.308 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22575.5 to 6.0.308-servicing.22580.45 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.308 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.12-servicing.22568.10 to 6.0.13-servicing.22579.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft... --- NuGet.config | 42 ++++--------------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 102 deletions(-) diff --git a/NuGet.config b/NuGet.config index af69e5bbfc0d..3b1b4d2fba9f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,33 +7,20 @@ - - - - - - + - - + - - - - - + - - - - + @@ -54,28 +41,15 @@ - - - - - - + - - + - - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed683d37b4d1..389032ddbe02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91215e5f412ebab17a454bed0ad2b3ca9163a4c1 + e6ee3f43c7057c7edcae8c80960408f5c8dc5df1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91215e5f412ebab17a454bed0ad2b3ca9163a4c1 + e6ee3f43c7057c7edcae8c80960408f5c8dc5df1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf70006b6e83a62167705431d633d1fd1ab49b34 + bd7407606f49c7bb9ee784c5a5a9c19127c0f081 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4178d795849932702f98b7f375f6341267510326 + 9601ea7b0314d236be4e8dd482e0cc9222e95156 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b409f7267def..b1256acd9057 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.12-servicing.22568.10 + 6.0.13-servicing.22579.11 - 6.0.12-servicing.22569.2 + 6.0.13-servicing.22580.2 - 6.0.307 + 6.0.308 @@ -44,20 +44,20 @@ - 6.0.12 - 6.0.12 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 + 6.0.13 + 6.0.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 0.2.0 - 6.0.308-servicing.22580.32 - 6.0.308-servicing.22580.32 + 6.0.308-servicing.22601.16 + 6.0.308-servicing.22601.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.12-servicing.22568.7 - 6.0.12-servicing.22568.7 - 6.0.12 - 6.0.12 - 6.0.12 - 6.0.12 + 6.0.13-servicing.22580.9 + 6.0.13-servicing.22580.9 + 6.0.13 + 6.0.13 + 6.0.13 + 6.0.13 2.1.0 - 6.0.12-servicing.22578.4 - 6.0.12-servicing.22578.4 - 6.0.12 - 6.0.12 + 6.0.13-servicing.22601.1 + 6.0.13-servicing.22601.1 + 6.0.13 + 6.0.13 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.307 + 6.0.308 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7d8d71a2e95219ecd69ce3fbe6a271832cffd16f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 19:48:44 +0000 Subject: [PATCH 0838/1244] Merged PR 27923: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221201.10 - **Date Produced**: December 1, 2022 5:48:23 PM UTC - **Commit**: c1c65f7d7e470da27409a6b087d17aed0b64beeb - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22578.8 to 6.0.405-servicing.22601.10][4] - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22578.8 to 6.0.405-servicing.22601.10][4] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4b87201&targetVersion=GCc1c65f7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 24 ++++++++++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index d6bbaa92409a..1b291cc3a663 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,10 @@ + + + + @@ -16,12 +20,20 @@ + + + + + + + + @@ -43,15 +55,27 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a88492713a40..17e2ecf4c025 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 87e5f0cad0ff547b1ca59c34119890a4ad68c2db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b872018e4f78db68cdc8568b80999eb25b3d7c1 + c1c65f7d7e470da27409a6b087d17aed0b64beeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b872018e4f78db68cdc8568b80999eb25b3d7c1 + c1c65f7d7e470da27409a6b087d17aed0b64beeb diff --git a/eng/Versions.props b/eng/Versions.props index 54597e2b1cc1..3ecb62d3c7dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.404-servicing.22578.8 - 6.0.404-servicing.22578.8 + 6.0.405-servicing.22601.10 + 6.0.405-servicing.22601.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c61979521a4c6136fac9fa4d60f227c7971c6042 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 2 Dec 2022 01:41:45 +0000 Subject: [PATCH 0839/1244] Merged PR 28083: [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.13 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.13-servicing.22580.2 to 6.0.13-servicing.22601.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-8d99-407e-c145-08d9d60066b9 - **Build**: 20221201.36 - **Date Produced**: December 2, 2022 12:32:31 AM UTC - **Commit**: 873cc1a88b27554f9f12d378b91861fc4b82ee56 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.308-servicing.22601.16 to 6.0.308-servicing.22601.36][1] - **Microsoft.NET.Sdk**: [from 6.0.308-servicing.22601.16 to 6.0.308-servicing.22601.36][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.13 to 6.0.13][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.13 to 6.0.13][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.13 to 6.0.13][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.13-servicing.22580.2 to 6.0.13-servicing.22601.5][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe6ee3f4&targetVersion=GC873cc1a&_a=files [2]: https://... --- 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 3b1b4d2fba9f..f93da753d37d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 389032ddbe02..67f3f2b426f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4855a55ebcfe897e6cc339c62edc653e27258e8c + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4855a55ebcfe897e6cc339c62edc653e27258e8c + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4855a55ebcfe897e6cc339c62edc653e27258e8c + 397c48f9f7a86672e097f53155c255bc89068e8a https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4855a55ebcfe897e6cc339c62edc653e27258e8c + 397c48f9f7a86672e097f53155c255bc89068e8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e6ee3f43c7057c7edcae8c80960408f5c8dc5df1 + 873cc1a88b27554f9f12d378b91861fc4b82ee56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e6ee3f43c7057c7edcae8c80960408f5c8dc5df1 + 873cc1a88b27554f9f12d378b91861fc4b82ee56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd7407606f49c7bb9ee784c5a5a9c19127c0f081 + 5a262a681e41941ea7ef42f49c0ed3b27a05c259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9601ea7b0314d236be4e8dd482e0cc9222e95156 + 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b1256acd9057..9cf40a422dea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.13-servicing.22579.11 + 6.0.13-servicing.22601.1 - 6.0.13-servicing.22580.2 + 6.0.13-servicing.22601.5 @@ -56,8 +56,8 @@ - 6.0.308-servicing.22601.16 - 6.0.308-servicing.22601.16 + 6.0.308-servicing.22601.36 + 6.0.308-servicing.22601.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.13-servicing.22601.1 - 6.0.13-servicing.22601.1 + 6.0.13-servicing.22601.6 + 6.0.13-servicing.22601.6 6.0.13 6.0.13 From 27ab36058b70b2e05063911df631fbf17f954a35 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 2 Dec 2022 15:20:32 +0000 Subject: [PATCH 0840/1244] Merged PR 28069: [internal/release/6.0.4xx] 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.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.404 to 6.0.405 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.404-rtm.22575.6 to 6.0.405-rtm.22580.43 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.404 to 6.0.405 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.12-servicing.22568.10 to 6.0.13-servicing.22601.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.P... --- NuGet.config | 42 ++++--------------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 102 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b291cc3a663..b1d3e88ecac3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,33 +7,20 @@ - - - - - - + - - + - - - - - + - - - - + @@ -54,29 +41,16 @@ - - - - - - + - - + - - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17e2ecf4c025..4c57d7b37fd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 87e5f0cad0ff547b1ca59c34119890a4ad68c2db + bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 87e5f0cad0ff547b1ca59c34119890a4ad68c2db + bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 87e5f0cad0ff547b1ca59c34119890a4ad68c2db + bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c1c65f7d7e470da27409a6b087d17aed0b64beeb + 0a587d5a182150fbefff03d839f383cf68ff0243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c1c65f7d7e470da27409a6b087d17aed0b64beeb + 0a587d5a182150fbefff03d839f383cf68ff0243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf70006b6e83a62167705431d633d1fd1ab49b34 + 5a262a681e41941ea7ef42f49c0ed3b27a05c259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4178d795849932702f98b7f375f6341267510326 + 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3ecb62d3c7dc..6c8d84260b86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.12-servicing.22568.10 + 6.0.13-servicing.22601.1 - 6.0.12-servicing.22569.2 + 6.0.13-servicing.22601.5 - 6.0.404 + 6.0.405 @@ -44,20 +44,20 @@ - 6.0.12 - 6.0.12 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 + 6.0.13 + 6.0.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 0.2.0 - 6.0.405-servicing.22601.10 - 6.0.405-servicing.22601.10 + 6.0.405-servicing.22601.33 + 6.0.405-servicing.22601.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.12-servicing.22568.7 - 6.0.12-servicing.22568.7 - 6.0.12 - 6.0.12 - 6.0.12 - 6.0.12 + 6.0.13-servicing.22580.9 + 6.0.13-servicing.22580.9 + 6.0.13 + 6.0.13 + 6.0.13 + 6.0.13 2.1.0 - 6.0.12-servicing.22578.4 - 6.0.12-servicing.22578.4 - 6.0.12 - 6.0.12 + 6.0.13-servicing.22601.6 + 6.0.13-servicing.22601.6 + 6.0.13 + 6.0.13 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.404 + 6.0.405 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 10bec223c582cb2459376b28345ec9ceabcdc371 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Dec 2022 05:01:33 +0000 Subject: [PATCH 0841/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221206.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.308-servicing.22606.14 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.308 -> To Version 6.0.308 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index f93da753d37d..6ba7b5cd57fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -17,10 +18,11 @@ - + + @@ -41,14 +43,16 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67f3f2b426f3..6cd227c0e468 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + 384bde1623ae79bbe6308f201c869d91f9f05569 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 873cc1a88b27554f9f12d378b91861fc4b82ee56 + 5a365a72e88efb41e0d2e2dec51ae7cad6475a48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 873cc1a88b27554f9f12d378b91861fc4b82ee56 + 5a365a72e88efb41e0d2e2dec51ae7cad6475a48 diff --git a/eng/Versions.props b/eng/Versions.props index 9cf40a422dea..67599e13ad50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.308-servicing.22601.36 - 6.0.308-servicing.22601.36 + 6.0.308-servicing.22606.14 + 6.0.308-servicing.22606.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b36e17c794727f7f4c7967cb838829cd32d03665 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Jan 2023 15:11:47 -0800 Subject: [PATCH 0842/1244] Update branding to 6.0.309 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e52d1d9fbabf..92d590df371d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 08 + 09 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From b9ce8d03de751da2cedf8bda4cb0575e100b6db9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Jan 2023 15:11:52 -0800 Subject: [PATCH 0843/1244] Update branding to 6.0.406 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0c81327dea1f..25aa43a711fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From a0e84f966f9aad817201a426ea9886e2fe770dba Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jan 2023 19:27:04 +0000 Subject: [PATCH 0844/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230105.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.405-servicing.22601.33 -> To Version 6.0.406-servicing.23055.16 --- NuGet.config | 12 ++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index b1d3e88ecac3..e185e965727a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -18,9 +20,13 @@ + + + + @@ -41,15 +47,21 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c57d7b37fd9..f09cd4457c52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a587d5a182150fbefff03d839f383cf68ff0243 + 97a37eb4afb9da1701a7e5666e16b34e494b646e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a587d5a182150fbefff03d839f383cf68ff0243 + 97a37eb4afb9da1701a7e5666e16b34e494b646e diff --git a/eng/Versions.props b/eng/Versions.props index 3ad91b7987ad..bc613e8097ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.405-servicing.22601.33 - 6.0.405-servicing.22601.33 + 6.0.406-servicing.23055.16 + 6.0.406-servicing.23055.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e417a061910ae4e58fac720932411934ddd26d7e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jan 2023 19:30:16 +0000 Subject: [PATCH 0845/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230105.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.309-servicing.23055.15 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.308 -> To Version 6.0.308 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6ba7b5cd57fc..ce291f905660 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -22,6 +23,7 @@ + @@ -44,6 +46,7 @@ + @@ -53,6 +56,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cd227c0e468..61cbac664288 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a365a72e88efb41e0d2e2dec51ae7cad6475a48 + 17fe98a9b1fe583fddaf7feae353873e323ed87a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a365a72e88efb41e0d2e2dec51ae7cad6475a48 + 17fe98a9b1fe583fddaf7feae353873e323ed87a diff --git a/eng/Versions.props b/eng/Versions.props index 67599e13ad50..e70e14a62a66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.308-servicing.22606.14 - 6.0.308-servicing.22606.14 + 6.0.309-servicing.23055.15 + 6.0.309-servicing.23055.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7718784e7343ac803e94a1d47b80b7eb15439b6e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 6 Jan 2023 08:37:55 +0000 Subject: [PATCH 0846/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230105.48 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.405-servicing.22601.33 -> To Version 6.0.406-servicing.23055.48 Dependency coherency updates NuGet.Build.Tasks From Version 6.3.1-rc.1 -> To Version 6.3.2-rc.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f09cd4457c52..3b72aa5195d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 97a37eb4afb9da1701a7e5666e16b34e494b646e + deaf3948e95d700244c408a38be344a38839f50d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 97a37eb4afb9da1701a7e5666e16b34e494b646e + deaf3948e95d700244c408a38be344a38839f50d @@ -151,9 +151,9 @@ 561848881bab01749e6d8b03be2869a18ca944f7 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 01bc4df1ef99c9c213f892ec8b25e46b23c7cfb1 + + https://github.com/nuget/nuget.client + a90539fd502f9425311b34451cdd2965516f5d26 diff --git a/eng/Versions.props b/eng/Versions.props index bc613e8097ab..79717e176518 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23055.16 - 6.0.406-servicing.23055.16 + 6.0.406-servicing.23055.48 + 6.0.406-servicing.23055.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f58ac28d8dad0bb1466e989f2018f763c8168073 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 6 Jan 2023 21:05:21 +0000 Subject: [PATCH 0847/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230106.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.309-servicing.23056.14 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks From Version 6.0.308 -> To Version 6.0.308 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61cbac664288..cec84650b2e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17fe98a9b1fe583fddaf7feae353873e323ed87a + a601963a61278b7689b8aaf3ad540e4bdcfcff07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17fe98a9b1fe583fddaf7feae353873e323ed87a + a601963a61278b7689b8aaf3ad540e4bdcfcff07 @@ -151,9 +151,9 @@ 038f9bae9b34d1cca653360a46c5ce1eba4c2ac8 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 027ca8b8ef4b4dc94995f87b9c441d2bcf742c1d + + https://github.com/nuget/nuget.client + 51ca5ad938c742e6ff876ea1545b0712b130f9d1 diff --git a/eng/Versions.props b/eng/Versions.props index e70e14a62a66..475daf109ac1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23055.15 - 6.0.309-servicing.23055.15 + 6.0.309-servicing.23056.14 + 6.0.309-servicing.23056.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 172d5933acd3ee6dd0b5be61b02bb882629a603d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 7 Jan 2023 00:38:21 +0000 Subject: [PATCH 0848/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230106.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.309-servicing.23056.26 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks From Version 6.0.308 -> To Version 6.0.308 (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 cec84650b2e8..b029f20e17bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a601963a61278b7689b8aaf3ad540e4bdcfcff07 + d2cf2404b26dc01c9f52b716f936536a8cc01a7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a601963a61278b7689b8aaf3ad540e4bdcfcff07 + d2cf2404b26dc01c9f52b716f936536a8cc01a7b diff --git a/eng/Versions.props b/eng/Versions.props index 475daf109ac1..50e3606c66ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23056.14 - 6.0.309-servicing.23056.14 + 6.0.309-servicing.23056.26 + 6.0.309-servicing.23056.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6e11cb5a772d0a26fc705d566c8577b17dcdaa01 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 18:52:56 +0000 Subject: [PATCH 0849/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.405-servicing.22601.33 -> To Version 6.0.406-servicing.23059.7 Dependency coherency updates NuGet.Build.Tasks From Version 6.3.1-rc.1 -> To Version 6.3.2-rc.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 3b72aa5195d0..ccd7d365fb5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - deaf3948e95d700244c408a38be344a38839f50d + b140be3633a1f826fc9b15b8bc3137a6d5aecb6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - deaf3948e95d700244c408a38be344a38839f50d + b140be3633a1f826fc9b15b8bc3137a6d5aecb6b diff --git a/eng/Versions.props b/eng/Versions.props index 79717e176518..1bf45ad72fbb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23055.48 - 6.0.406-servicing.23055.48 + 6.0.406-servicing.23059.7 + 6.0.406-servicing.23059.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8d481cdf1c94b6b11e9c9d1dc3b9ec75a2f4110b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 20:07:01 +0000 Subject: [PATCH 0850/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.309-servicing.23059.13 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks From Version 6.0.308 -> To Version 6.0.308 (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 b029f20e17bc..08fffe6da6c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2cf2404b26dc01c9f52b716f936536a8cc01a7b + 41bb21af4043f3ff38dbcb71b281c43209e25468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2cf2404b26dc01c9f52b716f936536a8cc01a7b + 41bb21af4043f3ff38dbcb71b281c43209e25468 diff --git a/eng/Versions.props b/eng/Versions.props index 50e3606c66ba..58ccee8a1836 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23056.26 - 6.0.309-servicing.23056.26 + 6.0.309-servicing.23059.13 + 6.0.309-servicing.23059.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 06cd8082c3c4b8b2adf975213fb0441062663386 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 21:56:13 +0000 Subject: [PATCH 0851/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.405-servicing.22601.33 -> To Version 6.0.406-servicing.23059.17 Dependency coherency updates NuGet.Build.Tasks From Version 6.3.1-rc.1 -> To Version 6.3.2-rc.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 ccd7d365fb5c..8d6d123ca032 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b140be3633a1f826fc9b15b8bc3137a6d5aecb6b + 46a2bcbab5cb79b9993e29116998b1ecb054ff91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b140be3633a1f826fc9b15b8bc3137a6d5aecb6b + 46a2bcbab5cb79b9993e29116998b1ecb054ff91 diff --git a/eng/Versions.props b/eng/Versions.props index 1bf45ad72fbb..324e421deeaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23059.7 - 6.0.406-servicing.23059.7 + 6.0.406-servicing.23059.17 + 6.0.406-servicing.23059.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48faeab6f17e8f13b897e5f21d3c56aea530fa54 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 02:00:03 +0000 Subject: [PATCH 0852/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23059.27 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.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++-------- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 78 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce291f905660..323d67cf1379 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,20 @@ - - - + - + - + - - - + @@ -45,19 +41,15 @@ - - - + - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08fffe6da6c8..3ca411ef001c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 384bde1623ae79bbe6308f201c869d91f9f05569 + 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 384bde1623ae79bbe6308f201c869d91f9f05569 + 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 384bde1623ae79bbe6308f201c869d91f9f05569 + 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41bb21af4043f3ff38dbcb71b281c43209e25468 + be3d8e9b00d2f16c32fc89b5316987e23642b027 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41bb21af4043f3ff38dbcb71b281c43209e25468 + be3d8e9b00d2f16c32fc89b5316987e23642b027 diff --git a/eng/Versions.props b/eng/Versions.props index a2ea1f623bfc..061bdeeeda88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.308 + 6.0.309 @@ -44,20 +44,20 @@ - 6.0.13 - 6.0.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 + 6.0.14 + 6.0.14 + 6.0.14-servicing.23056.13 + 6.0.14-servicing.23056.13 + 6.0.14-servicing.23056.13 + 6.0.14-servicing.23056.13 0.2.0 - 6.0.309-servicing.23059.13 - 6.0.309-servicing.23059.13 + 6.0.309-servicing.23059.27 + 6.0.309-servicing.23059.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.13-servicing.22580.9 - 6.0.13-servicing.22580.9 - 6.0.13 - 6.0.13 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23056.8 + 6.0.14-servicing.23056.8 + 6.0.14 + 6.0.14 + 6.0.14 + 6.0.14 2.1.0 - 6.0.13-servicing.22601.6 - 6.0.13-servicing.22601.6 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23059.3 + 6.0.14-servicing.23059.3 + 6.0.14 + 6.0.14 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.308 + 6.0.309 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From ccb1de1825704799ecdaa8eea98cd6ee2642fe34 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 10:17:54 +0000 Subject: [PATCH 0853/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23060.4 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.13 -> To Version 6.0.14 (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 3ca411ef001c..6aa39efeb95c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - be3d8e9b00d2f16c32fc89b5316987e23642b027 + 2a6be3c1062c59c8518de6f903fb624f1b643d56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - be3d8e9b00d2f16c32fc89b5316987e23642b027 + 2a6be3c1062c59c8518de6f903fb624f1b643d56 diff --git a/eng/Versions.props b/eng/Versions.props index 061bdeeeda88..59651d34d018 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23059.27 - 6.0.309-servicing.23059.27 + 6.0.309-servicing.23060.4 + 6.0.309-servicing.23060.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 60a8b19bee009491d23fe685c0fcb04c88dd2ee9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 22:50:37 +0000 Subject: [PATCH 0854/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23060.22 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.13 -> To Version 6.0.14 (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 6aa39efeb95c..bddb23236c06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a6be3c1062c59c8518de6f903fb624f1b643d56 + 53bb7252f25bf09920e5e168f099b580cc6919f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a6be3c1062c59c8518de6f903fb624f1b643d56 + 53bb7252f25bf09920e5e168f099b580cc6919f3 diff --git a/eng/Versions.props b/eng/Versions.props index 59651d34d018..4572933feaa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23060.4 - 6.0.309-servicing.23060.4 + 6.0.309-servicing.23060.22 + 6.0.309-servicing.23060.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7803a43d0fc987a7bc6d755a3f77b3ec290b1e9d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 22:55:54 +0000 Subject: [PATCH 0855/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.406-servicing.23059.17 -> To Version 6.0.406-servicing.23060.23 --- 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 8d6d123ca032..0e8ee9001815 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46a2bcbab5cb79b9993e29116998b1ecb054ff91 + bf6f90878676dfb0762492f3d96a5f0cf4d4a244 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46a2bcbab5cb79b9993e29116998b1ecb054ff91 + bf6f90878676dfb0762492f3d96a5f0cf4d4a244 diff --git a/eng/Versions.props b/eng/Versions.props index 324e421deeaa..685032514052 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23059.17 - 6.0.406-servicing.23059.17 + 6.0.406-servicing.23060.23 + 6.0.406-servicing.23060.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ba627450f80475451a3527f2e144f1b8915989db Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 10 Jan 2023 15:42:58 -0800 Subject: [PATCH 0856/1244] [6.0.3xx] Update Asp.Net templates (#15246) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b8fdf8c58611..89924f3e5d2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.31 + 3.1.32 3.2.1 4.8.0-rc2.19462.10 From 7c2e144469172bb874ccdaedfe59cbcc3b7c6d79 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 10 Jan 2023 15:43:16 -0800 Subject: [PATCH 0857/1244] [6.0.4xx] Update asp.net templates (#15244) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3ad91b7987ad..de00f2acefc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.31 + 3.1.32 3.2.1 4.8.0-rc2.19462.10 From e3198ac87875523e4391dd39df84b05b3a287f45 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jan 2023 01:41:36 +0000 Subject: [PATCH 0858/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23060.26 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.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 323d67cf1379..3faa47218e1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bddb23236c06..6576f6cde38f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e + ed74e168a5ba990af94ab7a3f53d7caa2d620115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e + ed74e168a5ba990af94ab7a3f53d7caa2d620115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e + ed74e168a5ba990af94ab7a3f53d7caa2d620115 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e + ed74e168a5ba990af94ab7a3f53d7caa2d620115 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53bb7252f25bf09920e5e168f099b580cc6919f3 + 1cf711fc9948e46181db8c649a253b8f623c6c99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53bb7252f25bf09920e5e168f099b580cc6919f3 + 1cf711fc9948e46181db8c649a253b8f623c6c99 diff --git a/eng/Versions.props b/eng/Versions.props index 4572933feaa4..9b4a4d72d9c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23060.22 - 6.0.309-servicing.23060.22 + 6.0.309-servicing.23060.26 + 6.0.309-servicing.23060.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.14-servicing.23059.3 - 6.0.14-servicing.23059.3 + 6.0.14-servicing.23060.8 + 6.0.14-servicing.23060.8 6.0.14 6.0.14 From e78bc126266b514403a56a4443264efb05f25746 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jan 2023 11:05:36 +0000 Subject: [PATCH 0859/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23061.3 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.13 -> To Version 6.0.14 (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 6576f6cde38f..b1b8937f4dab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1cf711fc9948e46181db8c649a253b8f623c6c99 + 35d6bc1e3057789e828f15ddf7b73242d93f093e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1cf711fc9948e46181db8c649a253b8f623c6c99 + 35d6bc1e3057789e828f15ddf7b73242d93f093e diff --git a/eng/Versions.props b/eng/Versions.props index 9b4a4d72d9c0..69e04fa36102 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23060.26 - 6.0.309-servicing.23060.26 + 6.0.309-servicing.23061.3 + 6.0.309-servicing.23061.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c66a9c449687287f51456924cfe4a660b6b016dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 22:22:05 +0000 Subject: [PATCH 0860/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#15261) [release/6.0.4xx] Update dependencies from dotnet/arcade --- NuGet.config | 10 ++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/cross/toolchain.cmake | 7 +++++++ eng/common/templates/steps/source-build.yml | 6 ++++++ global.json | 6 +++--- 6 files changed, 31 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index b1d3e88ecac3..8d7143758ed4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -18,9 +17,13 @@ + + + + @@ -41,15 +44,18 @@ - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c57d7b37fd9..2a54de84439e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 74b7648c106865057c78ca1e4b2ffcb5e9bce071 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 74b7648c106865057c78ca1e4b2ffcb5e9bce071 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 74b7648c106865057c78ca1e4b2ffcb5e9bce071 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index de00f2acefc9..dfc5106e92da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22561.1 + 6.0.0-beta.23060.6 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ec8971eb0195..51f30e53dd43 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,5 +1,12 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) +# reset platform variables (e.g. cmake 3.25 sets LINUX=1) +unset(LINUX) +unset(FREEBSD) +unset(ILLUMOS) +unset(ANDROID) +unset(TIZEN) + set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index abb1b2bcda42..b5b3e5aeb3b9 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -75,6 +80,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/global.json b/global.json index 30864f9a77c6..50c158ed8b3e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.111", + "dotnet": "6.0.113", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22561.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23060.6" } } From 47b329f8f9d6bdf0e30e0edead74e8c4e11c672a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jan 2023 23:20:08 +0000 Subject: [PATCH 0861/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.406-servicing.23059.17 -> To Version 6.0.406-servicing.23061.27 --- NuGet.config | 8 -------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index e185e965727a..cfdcd77c294e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,12 @@ - - - - @@ -47,12 +43,8 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e8ee9001815..f76b6837d286 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf6f90878676dfb0762492f3d96a5f0cf4d4a244 + 20354d1d140236af48ddcb4d0dbacbf6088df45d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf6f90878676dfb0762492f3d96a5f0cf4d4a244 + 20354d1d140236af48ddcb4d0dbacbf6088df45d diff --git a/eng/Versions.props b/eng/Versions.props index 685032514052..85a7e801da90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23060.23 - 6.0.406-servicing.23060.23 + 6.0.406-servicing.23061.27 + 6.0.406-servicing.23061.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 28146be68894156c9c29769615f5e2387fe77525 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jan 2023 07:04:01 +0000 Subject: [PATCH 0862/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.43 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.406-servicing.23059.17 -> To Version 6.0.406-servicing.23061.43 --- NuGet.config | 12 ------------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index cfdcd77c294e..03d3587a670c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,14 +15,8 @@ - - - - - - @@ -47,14 +41,8 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f76b6837d286..64dda4212551 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 20354d1d140236af48ddcb4d0dbacbf6088df45d + c462aca4006d7a7b19385497e7c24d1baa9e8c1a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 20354d1d140236af48ddcb4d0dbacbf6088df45d + c462aca4006d7a7b19385497e7c24d1baa9e8c1a diff --git a/eng/Versions.props b/eng/Versions.props index 85a7e801da90..95040c5249b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23061.27 - 6.0.406-servicing.23061.27 + 6.0.406-servicing.23061.43 + 6.0.406-servicing.23061.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1802f4164f9778a41439ae3cc016eb9fa772e42f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jan 2023 22:46:46 +0000 Subject: [PATCH 0863/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230117.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23061.3 -> To Version 6.0.309-servicing.23067.13 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.14 -> To Version 6.0.14 (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 3faa47218e1f..2268fdc4517f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55e4c7afdd30..7b0d78ab129b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 436cb705a436a4901325640148ab168bf8cf1cbc + 4ad0133da19f7f6fd78a9de093085c380d03d078 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 436cb705a436a4901325640148ab168bf8cf1cbc + 4ad0133da19f7f6fd78a9de093085c380d03d078 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 436cb705a436a4901325640148ab168bf8cf1cbc + 4ad0133da19f7f6fd78a9de093085c380d03d078 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 35d6bc1e3057789e828f15ddf7b73242d93f093e + 906e24ca802a74b64e2a4e3951ef2e8736a12f7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 35d6bc1e3057789e828f15ddf7b73242d93f093e + 906e24ca802a74b64e2a4e3951ef2e8736a12f7c diff --git a/eng/Versions.props b/eng/Versions.props index b995442226e6..cbac3b8db12a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23056.13 - 6.0.14-servicing.23056.13 - 6.0.14-servicing.23056.13 - 6.0.14-servicing.23056.13 + 6.0.14-servicing.23062.15 + 6.0.14-servicing.23062.15 + 6.0.14-servicing.23062.15 + 6.0.14-servicing.23062.15 0.2.0 - 6.0.309-servicing.23061.3 - 6.0.309-servicing.23061.3 + 6.0.309-servicing.23067.13 + 6.0.309-servicing.23067.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23056.8 - 6.0.14-servicing.23056.8 + 6.0.14-servicing.23063.9 + 6.0.14-servicing.23063.9 6.0.14 6.0.14 6.0.14 @@ -78,8 +78,8 @@ - 6.0.14-servicing.23060.8 - 6.0.14-servicing.23060.8 + 6.0.14-servicing.23061.5 + 6.0.14-servicing.23061.5 6.0.14 6.0.14 From 7d32485f19a2602996c9a9361bf4dcfa40825764 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Jan 2023 00:44:53 +0000 Subject: [PATCH 0864/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230117.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.406-servicing.23061.43 -> To Version 6.0.406-servicing.23067.17 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.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03d3587a670c..82462001d7ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,12 +41,16 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64dda4212551..f01481d14383 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 38c1c4bb218fdb9e1628db372d72babee098165e https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bdb29b3dc96302426de3433e38b150c90f1c8af6 + 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bdb29b3dc96302426de3433e38b150c90f1c8af6 + 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bdb29b3dc96302426de3433e38b150c90f1c8af6 + 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c462aca4006d7a7b19385497e7c24d1baa9e8c1a + 59c5cf48269b707755d338d7575a060726d1a86e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c462aca4006d7a7b19385497e7c24d1baa9e8c1a + 59c5cf48269b707755d338d7575a060726d1a86e diff --git a/eng/Versions.props b/eng/Versions.props index 73d03616dd31..0f90ce321820 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.405 + 6.0.406 @@ -44,20 +44,20 @@ - 6.0.13 - 6.0.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 + 6.0.14 + 6.0.14 + 6.0.14-servicing.23062.15 + 6.0.14-servicing.23062.15 + 6.0.14-servicing.23062.15 + 6.0.14-servicing.23062.15 0.2.0 - 6.0.406-servicing.23061.43 - 6.0.406-servicing.23061.43 + 6.0.406-servicing.23067.17 + 6.0.406-servicing.23067.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.13-servicing.22580.9 - 6.0.13-servicing.22580.9 - 6.0.13 - 6.0.13 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23063.9 + 6.0.14-servicing.23063.9 + 6.0.14 + 6.0.14 + 6.0.14 + 6.0.14 2.1.0 - 6.0.13-servicing.22601.6 - 6.0.13-servicing.22601.6 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23061.5 + 6.0.14-servicing.23061.5 + 6.0.14 + 6.0.14 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.405 + 6.0.406 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From cc6c2c91431d0fe194a4b6a83174050f97a43ef7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Jan 2023 22:00:45 +0000 Subject: [PATCH 0865/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230118.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.406-servicing.23061.43 -> To Version 6.0.406-servicing.23068.15 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.13 -> To Version 6.0.14 (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 f01481d14383..05f5e2e92bb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59c5cf48269b707755d338d7575a060726d1a86e + fa83d8f2790b2fc329628f47c61d60032391a40f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59c5cf48269b707755d338d7575a060726d1a86e + fa83d8f2790b2fc329628f47c61d60032391a40f diff --git a/eng/Versions.props b/eng/Versions.props index 0f90ce321820..2aa28c7d39fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23067.17 - 6.0.406-servicing.23067.17 + 6.0.406-servicing.23068.15 + 6.0.406-servicing.23068.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 567e0c97be08bfa22b2115ce7b0a7b3fae60bf4d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Jan 2023 03:30:38 +0000 Subject: [PATCH 0866/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230118.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23067.13 -> To Version 6.0.309-servicing.23068.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 7b0d78ab129b..ffafe85f3961 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4ad0133da19f7f6fd78a9de093085c380d03d078 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 906e24ca802a74b64e2a4e3951ef2e8736a12f7c + b6c912387a5240eed88afe3327b00c2dec5fdadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 906e24ca802a74b64e2a4e3951ef2e8736a12f7c + b6c912387a5240eed88afe3327b00c2dec5fdadd diff --git a/eng/Versions.props b/eng/Versions.props index cbac3b8db12a..4bed1e33dcc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23067.13 - 6.0.309-servicing.23067.13 + 6.0.309-servicing.23068.22 + 6.0.309-servicing.23068.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cdfc1dac10a7a3802eceb689e5d2de18a2c4f234 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Jan 2023 23:20:04 +0000 Subject: [PATCH 0867/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230119.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23067.13 -> To Version 6.0.309-servicing.23069.19 Dependency coherency updates 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 From Version 6.0.14-servicing.23063.9 -> To Version 6.0.14-servicing.23067.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2268fdc4517f..db6858fe95e3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,12 +41,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffafe85f3961..e866809c06e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ad0133da19f7f6fd78a9de093085c380d03d078 + 1c704df539727afa2cb81b1904fe11bcf21a5b9a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ad0133da19f7f6fd78a9de093085c380d03d078 + 1c704df539727afa2cb81b1904fe11bcf21a5b9a https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ad0133da19f7f6fd78a9de093085c380d03d078 + 1c704df539727afa2cb81b1904fe11bcf21a5b9a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6c912387a5240eed88afe3327b00c2dec5fdadd + b0570a30cfbc5242f8eb3d628603bb9eaa00187c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6c912387a5240eed88afe3327b00c2dec5fdadd + b0570a30cfbc5242f8eb3d628603bb9eaa00187c diff --git a/eng/Versions.props b/eng/Versions.props index 4bed1e33dcc7..a55556cb9a45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 0.2.0 - 6.0.309-servicing.23068.22 - 6.0.309-servicing.23068.22 + 6.0.309-servicing.23069.19 + 6.0.309-servicing.23069.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23063.9 - 6.0.14-servicing.23063.9 + 6.0.14-servicing.23067.7 + 6.0.14-servicing.23067.7 6.0.14 6.0.14 6.0.14 From 71832da9c7f5c30973707c19e3db9f1b9ac690ec Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Jan 2023 23:23:03 +0000 Subject: [PATCH 0868/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230119.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.406-servicing.23061.43 -> To Version 6.0.406-servicing.23069.18 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.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 82462001d7ef..f0974c63660f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,13 +41,13 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05f5e2e92bb9..c34aff905157 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a + 371ce7e98e618aca8770fbd52dfe1d027908e357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a + 371ce7e98e618aca8770fbd52dfe1d027908e357 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a + 371ce7e98e618aca8770fbd52dfe1d027908e357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fa83d8f2790b2fc329628f47c61d60032391a40f + 3f72a022e604f6c692c9764a296efe50e52316f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fa83d8f2790b2fc329628f47c61d60032391a40f + 3f72a022e604f6c692c9764a296efe50e52316f1 diff --git a/eng/Versions.props b/eng/Versions.props index 2aa28c7d39fd..0dcc8d8e6c30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 0.2.0 - 6.0.406-servicing.23068.15 - 6.0.406-servicing.23068.15 + 6.0.406-servicing.23069.18 + 6.0.406-servicing.23069.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23063.9 - 6.0.14-servicing.23063.9 + 6.0.14-servicing.23067.7 + 6.0.14-servicing.23067.7 6.0.14 6.0.14 6.0.14 From 1c87de035748de4cb1c40edde6b8184daef7aefd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 22 Jan 2023 17:41:33 +0000 Subject: [PATCH 0869/1244] Merged PR 29033: [internal/release/6.0.4xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.406 to 6.0.406 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.406-rtm.23069.2 to 6.0.406-rtm.23070.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.406 to 6.0.406 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230120.36 - **Date Produced**: January 21, 2023 6:32:52 AM UTC - **Commit**: 8142ddd5a92589859c058681f3bf58372c1f87a4 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23069.18 to 6.0.406-servicing.23070.36][3] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23069.18 to 6.0.406-servicing.23070.36][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23067.7 to 6... --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index f0974c63660f..cd62f1e28504 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,13 +41,13 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a01c17769e5..56fecfbf9cdd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 371ce7e98e618aca8770fbd52dfe1d027908e357 + 3808dc647c961aec9812a18f6454fd33f7cb4a8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 371ce7e98e618aca8770fbd52dfe1d027908e357 + 3808dc647c961aec9812a18f6454fd33f7cb4a8c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 371ce7e98e618aca8770fbd52dfe1d027908e357 + 3808dc647c961aec9812a18f6454fd33f7cb4a8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f72a022e604f6c692c9764a296efe50e52316f1 + 8142ddd5a92589859c058681f3bf58372c1f87a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f72a022e604f6c692c9764a296efe50e52316f1 + 8142ddd5a92589859c058681f3bf58372c1f87a4 diff --git a/eng/Versions.props b/eng/Versions.props index 832f0aa7bfb0..ef79c6b78646 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 0.2.0 - 6.0.406-servicing.23069.18 - 6.0.406-servicing.23069.18 + 6.0.406-servicing.23070.36 + 6.0.406-servicing.23070.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23067.7 - 6.0.14-servicing.23067.7 + 6.0.14-servicing.23070.4 + 6.0.14-servicing.23070.4 6.0.14 6.0.14 6.0.14 From 8e99d20c5eeb2e076f4d33a3160615f83199bde0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 23 Jan 2023 19:30:32 +0000 Subject: [PATCH 0870/1244] Merged PR 29049: [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.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.309 to 6.0.309 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.309-servicing.23069.3 to 6.0.309-servicing.23070.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.309 to 6.0.309 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.13-servicing.22601.1 to 6.0.14-servicing.23070.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microso... --- 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 db6858fe95e3..d0d3e025776b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e866809c06e0..b9fe53569c71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1c704df539727afa2cb81b1904fe11bcf21a5b9a + e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1c704df539727afa2cb81b1904fe11bcf21a5b9a + e455bc6fbb9d9ba5cad34f405fb2c278881f038a https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1c704df539727afa2cb81b1904fe11bcf21a5b9a + e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0570a30cfbc5242f8eb3d628603bb9eaa00187c + a444ef95fc29cb478922eac7d89adb215efb563b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0570a30cfbc5242f8eb3d628603bb9eaa00187c + a444ef95fc29cb478922eac7d89adb215efb563b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 18f3f47e1880fa6cea7648845ea73c74cf7a9857 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 + d40327ad15e6653d027e003749a3bf16fd603101 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a55556cb9a45..e0550e5446c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23070.2 - 6.0.13-servicing.22601.5 + 6.0.14-servicing.23070.2 @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 0.2.0 - 6.0.309-servicing.23069.19 - 6.0.309-servicing.23069.19 + 6.0.309-servicing.23073.3 + 6.0.309-servicing.23073.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23067.7 - 6.0.14-servicing.23067.7 + 6.0.14-servicing.23070.4 + 6.0.14-servicing.23070.4 6.0.14 6.0.14 6.0.14 @@ -78,8 +78,8 @@ - 6.0.14-servicing.23061.5 - 6.0.14-servicing.23061.5 + 6.0.14-servicing.23072.1 + 6.0.14-servicing.23072.1 6.0.14 6.0.14 From faa22bb359cb0fe8e3843b16d6f48efd76322c13 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 23 Jan 2023 19:30:38 +0000 Subject: [PATCH 0871/1244] Merged PR 29076: [internal/release/6.0.4xx] 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.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.13-servicing.22601.1 to 6.0.14-servicing.23070.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.13-servicing.22601.5 to 6.0.14-servicing.23070.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230123.4 - **Date Produced**: January 23, 2023 5:21:23 PM UTC - **Commit**: 0efeb6cfaf25a60ad8d8e6c2166e92d02bb7b0f3 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23070.36 to 6.0.406-servicing.23073.4][1] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23070.36 to 6.0.406-servicing.23073.4][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.13-servicing.22601.1 to 6.0.14-servicing.23070.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.13-servicing.22601.5 to 6.0.14-servicing.23070.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8142ddd&targetVersion=GC0efeb6c&_a=files [2]: https://dev.az... --- 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 cd62f1e28504..9b9d1a70f58d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56fecfbf9cdd..656239c93ff2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3808dc647c961aec9812a18f6454fd33f7cb4a8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8142ddd5a92589859c058681f3bf58372c1f87a4 + 0efeb6cfaf25a60ad8d8e6c2166e92d02bb7b0f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8142ddd5a92589859c058681f3bf58372c1f87a4 + 0efeb6cfaf25a60ad8d8e6c2166e92d02bb7b0f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 18f3f47e1880fa6cea7648845ea73c74cf7a9857 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 + d40327ad15e6653d027e003749a3bf16fd603101 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ef79c6b78646..144236889689 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23070.2 - 6.0.13-servicing.22601.5 + 6.0.14-servicing.23070.2 @@ -56,8 +56,8 @@ - 6.0.406-servicing.23070.36 - 6.0.406-servicing.23070.36 + 6.0.406-servicing.23073.4 + 6.0.406-servicing.23073.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.14-servicing.23061.5 - 6.0.14-servicing.23061.5 + 6.0.14-servicing.23072.1 + 6.0.14-servicing.23072.1 6.0.14 6.0.14 From 4520d0d9dd48edbe11f686439e0d773100250df4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 16:56:04 +0000 Subject: [PATCH 0872/1244] Merged PR 29134: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (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**: 20230124.7 - **Date Produced**: January 24, 2023 3:51:36 PM UTC - **Commit**: 757ae6a7afd4265ba90def3c570b46279d7f9adf - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23073.3 to 6.0.309-servicing.23074.7][1] - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23073.3 to 6.0.309-servicing.23074.7][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.14 to 6.0.14][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa444ef9&targetVersion=GC757ae6a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC51b4c94&targetVersion=GC2a90daa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index d0d3e025776b..e7631a4a623a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9fe53569c71..76f13f63829a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a444ef95fc29cb478922eac7d89adb215efb563b + 757ae6a7afd4265ba90def3c570b46279d7f9adf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a444ef95fc29cb478922eac7d89adb215efb563b + 757ae6a7afd4265ba90def3c570b46279d7f9adf diff --git a/eng/Versions.props b/eng/Versions.props index e0550e5446c7..9a47ed58beef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23073.3 - 6.0.309-servicing.23073.3 + 6.0.309-servicing.23074.7 + 6.0.309-servicing.23074.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23070.4 - 6.0.14-servicing.23070.4 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 6.0.14 6.0.14 6.0.14 From c165970f9f115127ca2a20bf700a8505c838ea34 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 16:56:07 +0000 Subject: [PATCH 0873/1244] Merged PR 29135: [internal/release/6.0.4xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230124.8 - **Date Produced**: January 24, 2023 3:53:30 PM UTC - **Commit**: 3caaeaa4e49b63fec1c1c98c6ef0807c0109cd24 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23073.4 to 6.0.406-servicing.23074.8][1] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23073.4 to 6.0.406-servicing.23074.8][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.14 to 6.0.14][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0efeb6c&targetVersion=GC3caaeaa&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC51b4c94&targetVersion=GC2a90daa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9b9d1a70f58d..19b530eb1aea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 656239c93ff2..43eb755e24d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3808dc647c961aec9812a18f6454fd33f7cb4a8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0efeb6cfaf25a60ad8d8e6c2166e92d02bb7b0f3 + 3caaeaa4e49b63fec1c1c98c6ef0807c0109cd24 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0efeb6cfaf25a60ad8d8e6c2166e92d02bb7b0f3 + 3caaeaa4e49b63fec1c1c98c6ef0807c0109cd24 diff --git a/eng/Versions.props b/eng/Versions.props index 144236889689..adc2607efefd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23073.4 - 6.0.406-servicing.23073.4 + 6.0.406-servicing.23074.8 + 6.0.406-servicing.23074.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23070.4 - 6.0.14-servicing.23070.4 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 6.0.14 6.0.14 6.0.14 From 5414ad1e943690d5e1e093a3931424d391210952 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 18:20:39 +0000 Subject: [PATCH 0874/1244] Merged PR 29157: [internal/release/6.0.4xx] 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.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230124.17 - **Date Produced**: January 24, 2023 5:53:01 PM UTC - **Commit**: 31e2469f0512604e376cf0034333c5a6a87a21b5 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23074.8 to 6.0.406-servicing.23074.17][1] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23074.8 to 6.0.406-servicing.23074.17][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **dotnet-dev-certs**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **dotnet-user-secrets**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC3caaeaa&targetVersion=GC31e2469&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCa1bfef7&targetVersion=GC54e8b61&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 19b530eb1aea..143be89607bf 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 43eb755e24d5..cfe813f06041 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3808dc647c961aec9812a18f6454fd33f7cb4a8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3caaeaa4e49b63fec1c1c98c6ef0807c0109cd24 + 31e2469f0512604e376cf0034333c5a6a87a21b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3caaeaa4e49b63fec1c1c98c6ef0807c0109cd24 + 31e2469f0512604e376cf0034333c5a6a87a21b5 diff --git a/eng/Versions.props b/eng/Versions.props index adc2607efefd..e49a941af89f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 0.2.0 - 6.0.406-servicing.23074.8 - 6.0.406-servicing.23074.8 + 6.0.406-servicing.23074.17 + 6.0.406-servicing.23074.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c44327770741be8533549f59a8d89d4940c2076a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 18:21:00 +0000 Subject: [PATCH 0875/1244] Merged PR 29158: [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.AspNetCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (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**: 20230124.16 - **Date Produced**: January 24, 2023 5:53:11 PM UTC - **Commit**: 19bf1b2c73b69a38ac637787c7833244156d2da0 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23074.7 to 6.0.309-servicing.23074.16][1] - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23074.7 to 6.0.309-servicing.23074.16][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **dotnet-dev-certs**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **dotnet-user-secrets**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC757ae6a&targetVersion=GC19bf1b2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCa1bfef7&targetVersion=GC54e8b61&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 e7631a4a623a..5a99ba751d67 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 76f13f63829a..c49b95b6b492 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 757ae6a7afd4265ba90def3c570b46279d7f9adf + 19bf1b2c73b69a38ac637787c7833244156d2da0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 757ae6a7afd4265ba90def3c570b46279d7f9adf + 19bf1b2c73b69a38ac637787c7833244156d2da0 diff --git a/eng/Versions.props b/eng/Versions.props index 9a47ed58beef..dda910d69529 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 0.2.0 - 6.0.309-servicing.23074.7 - 6.0.309-servicing.23074.7 + 6.0.309-servicing.23074.16 + 6.0.309-servicing.23074.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f3a869b15952f74a2ff130e3e88ceb5aa86dc774 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 19:38:35 +0000 Subject: [PATCH 0876/1244] Merged PR 29174: [internal/release/6.0.4xx] 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.406 to 6.0.406 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.406-rtm.23070.11 to 6.0.406-rtm.23074.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.406 to 6.0.406 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230124.20 - **Date Produced**: January 24, 2023 6:56:06 PM UTC - **Commit**: cbeee7da10420597b6994c08f6c38c0610643027 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23074.17 to 6.0.406-servicing.23074.20][1] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23074.17 to 6.0.406-servicing.23074.20][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.406 to 6.0.406][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.406-rtm.23070.11 to 6.0.406-rtm.23074.6][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.406 to 6.0.406][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC31e2469&targetVersion=GCcbeee7d&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC3808dc6&targetVersion=GC647bf84&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 143be89607bf..49dc24bee475 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfe813f06041..5169f1954ade 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3808dc647c961aec9812a18f6454fd33f7cb4a8c + 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3808dc647c961aec9812a18f6454fd33f7cb4a8c + 647bf84ba835f020ec0da08ca90f6682cd1ddc65 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3808dc647c961aec9812a18f6454fd33f7cb4a8c + 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 31e2469f0512604e376cf0034333c5a6a87a21b5 + cbeee7da10420597b6994c08f6c38c0610643027 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 31e2469f0512604e376cf0034333c5a6a87a21b5 + cbeee7da10420597b6994c08f6c38c0610643027 diff --git a/eng/Versions.props b/eng/Versions.props index e49a941af89f..6332e74ff8d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23074.17 - 6.0.406-servicing.23074.17 + 6.0.406-servicing.23074.20 + 6.0.406-servicing.23074.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 67ef69fc068a481a4d29c35106650979015d4033 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 20:30:15 +0000 Subject: [PATCH 0877/1244] Merged PR 29180: [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.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3 (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**: 20230124.27 - **Date Produced**: January 24, 2023 7:40:01 PM UTC - **Commit**: b814c7cbbf53a1fa23c050ab74d116693dbd58bc - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23074.16 to 6.0.309-servicing.23074.27][1] - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23074.16 to 6.0.309-servicing.23074.27][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC19bf1b2&targetVersion=GCb814c7c&_a=files [2]: https://dev... --- 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 5a99ba751d67..e10226cfd2d4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c49b95b6b492..8f4247d74ea2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19bf1b2c73b69a38ac637787c7833244156d2da0 + b814c7cbbf53a1fa23c050ab74d116693dbd58bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19bf1b2c73b69a38ac637787c7833244156d2da0 + b814c7cbbf53a1fa23c050ab74d116693dbd58bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 18f3f47e1880fa6cea7648845ea73c74cf7a9857 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d40327ad15e6653d027e003749a3bf16fd603101 + 9e190e3d952203836d77bb0f1c42984524e1122d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dda910d69529..7189aa8dfb60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.2 - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.3 @@ -56,8 +56,8 @@ - 6.0.309-servicing.23074.16 - 6.0.309-servicing.23074.16 + 6.0.309-servicing.23074.27 + 6.0.309-servicing.23074.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.14-servicing.23072.1 - 6.0.14-servicing.23072.1 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 6.0.14 6.0.14 From 2988897946e3c38c4c25ac28979feadc1a521a4d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 20:30:23 +0000 Subject: [PATCH 0878/1244] Merged PR 29186: [internal/release/6.0.4xx] 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.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230124.29 - **Date Produced**: January 24, 2023 7:53:15 PM UTC - **Commit**: 04133de59be3070803d025a9dd52c07ef0087551 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23074.20 to 6.0.406-servicing.23074.29][1] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23074.20 to 6.0.406-servicing.23074.29][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCcbeee7d&targetVersion=GC04133de&_a=files [2]: https://dev... --- 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 49dc24bee475..6c3e5b378cde 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5169f1954ade..2580ea82d61d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cbeee7da10420597b6994c08f6c38c0610643027 + 04133de59be3070803d025a9dd52c07ef0087551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cbeee7da10420597b6994c08f6c38c0610643027 + 04133de59be3070803d025a9dd52c07ef0087551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 18f3f47e1880fa6cea7648845ea73c74cf7a9857 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d40327ad15e6653d027e003749a3bf16fd603101 + 9e190e3d952203836d77bb0f1c42984524e1122d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6332e74ff8d7..d53ee73948db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.2 - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.3 @@ -56,8 +56,8 @@ - 6.0.406-servicing.23074.20 - 6.0.406-servicing.23074.20 + 6.0.406-servicing.23074.29 + 6.0.406-servicing.23074.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.14-servicing.23072.1 - 6.0.14-servicing.23072.1 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 6.0.14 6.0.14 From f629b020f8d8d0a4b6870be21e76ad9c68f18151 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 21:21:26 +0000 Subject: [PATCH 0879/1244] Merged PR 29189: [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.DotNet.Common.ItemTemplates**: from 6.0.309 to 6.0.309 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.309-servicing.23070.10 to 6.0.309-servicing.23074.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.309 to 6.0.309 (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**: 20230124.34 - **Date Produced**: January 24, 2023 8:41:08 PM UTC - **Commit**: 54b8f37b145c05ddfe75705c6fd03cab42f2c532 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23074.27 to 6.0.309-servicing.23074.34][1] - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23074.27 to 6.0.309-servicing.23074.34][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.309 to 6.0.309][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.309-servicing.23070.10 to 6.0.309-servicing.23074.5][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.309 to 6.0.309][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb814c7c&targetVersion=GC54b8f37&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe455bc6&targetVersion=GCffeddec&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 e10226cfd2d4..d32bdf112005 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f4247d74ea2..e92ec822ec53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e455bc6fbb9d9ba5cad34f405fb2c278881f038a + ffeddec3efcbb43f226550c3b8bfe8d11765f723 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e455bc6fbb9d9ba5cad34f405fb2c278881f038a + ffeddec3efcbb43f226550c3b8bfe8d11765f723 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e455bc6fbb9d9ba5cad34f405fb2c278881f038a + ffeddec3efcbb43f226550c3b8bfe8d11765f723 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b814c7cbbf53a1fa23c050ab74d116693dbd58bc + 54b8f37b145c05ddfe75705c6fd03cab42f2c532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b814c7cbbf53a1fa23c050ab74d116693dbd58bc + 54b8f37b145c05ddfe75705c6fd03cab42f2c532 diff --git a/eng/Versions.props b/eng/Versions.props index 7189aa8dfb60..21fe8f582952 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23074.27 - 6.0.309-servicing.23074.27 + 6.0.309-servicing.23074.34 + 6.0.309-servicing.23074.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ccc4b086fc4fbd276cd982dd403c398e6bff2aae Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Feb 2023 11:41:50 -0800 Subject: [PATCH 0880/1244] Update branding to 6.0.310 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7abfaa0028c1..5afe43e4b550 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 09 + 10 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 5c68d96fd2c4a4f3a9071b687f505832e61536f5 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Feb 2023 11:44:59 -0800 Subject: [PATCH 0881/1244] Update branding to 6.0.407 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 018ae1453f45..c4b66ec008a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 06 + 07 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From f0a9fa30d32d5a603790979ff3ac135c42792b53 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 8 Feb 2023 00:53:26 +0100 Subject: [PATCH 0882/1244] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15458) Co-authored-by: Chris Rummel Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: Marc Paine --- .../eng/pipelines/security-partners-dotnet.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index f96c9fb37d49..73dd514c5d24 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -1,5 +1,18 @@ trigger: none +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + jobs: - template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: From 8b9ae4165224430a86d6d5b316bcc95e9b704cb6 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 8 Feb 2023 23:21:49 +0100 Subject: [PATCH 0883/1244] [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15473) Co-authored-by: Sean Reeser Co-authored-by: Daniel Plaisted Co-authored-by: Chris Rummel Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: Marc Paine Co-authored-by: Jason Zhai --- .../eng/pipelines/security-partners-dotnet.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index f96c9fb37d49..73dd514c5d24 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -1,5 +1,18 @@ trigger: none +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + jobs: - template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: From 0fdf746d877ee8c9431cd7abebb2b826770e653c Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:52:06 -0800 Subject: [PATCH 0884/1244] Merging internal commits for release/6.0.3xx (#15534) Co-authored-by: DotNet-Bot Co-authored-by: dotnet-bot --- NuGet.config | 16 +++---- eng/Version.Details.xml | 98 ++++++++++++++++++++--------------------- eng/Versions.props | 44 +++++++++--------- 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/NuGet.config b/NuGet.config index f93da753d37d..d32bdf112005 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dd95ce46efd..e92ec822ec53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + ffeddec3efcbb43f226550c3b8bfe8d11765f723 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + ffeddec3efcbb43f226550c3b8bfe8d11765f723 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + ffeddec3efcbb43f226550c3b8bfe8d11765f723 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 873cc1a88b27554f9f12d378b91861fc4b82ee56 + 54b8f37b145c05ddfe75705c6fd03cab42f2c532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 873cc1a88b27554f9f12d378b91861fc4b82ee56 + 54b8f37b145c05ddfe75705c6fd03cab42f2c532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 + 9e190e3d952203836d77bb0f1c42984524e1122d https://github.com/dotnet/fsharp @@ -151,9 +151,9 @@ 038f9bae9b34d1cca653360a46c5ce1eba4c2ac8 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 027ca8b8ef4b4dc94995f87b9c441d2bcf742c1d + + https://github.com/nuget/nuget.client + 51ca5ad938c742e6ff876ea1545b0712b130f9d1 diff --git a/eng/Versions.props b/eng/Versions.props index 5afe43e4b550..2bbb436a9c78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23074.2 - 6.0.13-servicing.22601.5 + 6.0.14-servicing.23074.3 - 6.0.308 + 6.0.309 @@ -44,20 +44,20 @@ - 6.0.13 - 6.0.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 + 6.0.14 + 6.0.14 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 0.2.0 - 6.0.308-servicing.22601.36 - 6.0.308-servicing.22601.36 + 6.0.309-servicing.23074.34 + 6.0.309-servicing.23074.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.13-servicing.22580.9 - 6.0.13-servicing.22580.9 - 6.0.13 - 6.0.13 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 + 6.0.14 + 6.0.14 + 6.0.14 + 6.0.14 2.1.0 - 6.0.13-servicing.22601.6 - 6.0.13-servicing.22601.6 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14 + 6.0.14 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.308 + 6.0.309 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 3e9dc15889fc0f09ec369d99ef80f0d3a7858867 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:53:14 -0800 Subject: [PATCH 0885/1244] Merging internal commits for release/6.0.4xx (#15535) Co-authored-by: dotnet-bot Co-authored-by: DotNet-Bot Co-authored-by: Matt Mitchell --- NuGet.config | 22 ++++----- eng/Version.Details.xml | 98 ++++++++++++++++++++--------------------- eng/Versions.props | 44 +++++++++--------- 3 files changed, 79 insertions(+), 85 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8d7143758ed4..6c3e5b378cde 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,20 @@ + - + - - - + - - - + @@ -44,19 +41,16 @@ + - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a54de84439e..2580ea82d61d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bdb29b3dc96302426de3433e38b150c90f1c8af6 + 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bdb29b3dc96302426de3433e38b150c90f1c8af6 + 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bdb29b3dc96302426de3433e38b150c90f1c8af6 + 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a587d5a182150fbefff03d839f383cf68ff0243 + 04133de59be3070803d025a9dd52c07ef0087551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a587d5a182150fbefff03d839f383cf68ff0243 + 04133de59be3070803d025a9dd52c07ef0087551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 + 9e190e3d952203836d77bb0f1c42984524e1122d https://github.com/dotnet/fsharp @@ -151,9 +151,9 @@ 561848881bab01749e6d8b03be2869a18ca944f7 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 01bc4df1ef99c9c213f892ec8b25e46b23c7cfb1 + + https://github.com/nuget/nuget.client + a90539fd502f9425311b34451cdd2965516f5d26 diff --git a/eng/Versions.props b/eng/Versions.props index c4b66ec008a0..a89efaa14460 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23074.2 - 6.0.13-servicing.22601.5 + 6.0.14-servicing.23074.3 - 6.0.405 + 6.0.406 @@ -44,20 +44,20 @@ - 6.0.13 - 6.0.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 + 6.0.14 + 6.0.14 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 0.2.0 - 6.0.405-servicing.22601.33 - 6.0.405-servicing.22601.33 + 6.0.406-servicing.23074.29 + 6.0.406-servicing.23074.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.13-servicing.22580.9 - 6.0.13-servicing.22580.9 - 6.0.13 - 6.0.13 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 + 6.0.14 + 6.0.14 + 6.0.14 + 6.0.14 2.1.0 - 6.0.13-servicing.22601.6 - 6.0.13-servicing.22601.6 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14 + 6.0.14 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.405 + 6.0.406 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 45d5d425f7576ea63b678ac5bd6c4f12258a6e32 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 14 Feb 2023 17:35:45 -0800 Subject: [PATCH 0886/1244] [release/6.0.4xx] Bump missed ASP.NET template version (#15549) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a89efaa14460..c73c0823319f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -140,7 +140,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.0.1 + 3.0.3 1.5.3 1.0.2-beta3 From b1d131603a10ef34a6dda82461d35a48f96660c9 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 14 Feb 2023 17:35:48 -0800 Subject: [PATCH 0887/1244] [release/6.0.3xx] Bump missed ASP.NET template version (#15550) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2bbb436a9c78..892fd05f52a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -140,7 +140,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.0.1 + 3.0.3 1.5.3 1.0.2-beta3 From 42aca7c867b94c84c99376068c7584a1b1ecb9cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 07:53:22 -0800 Subject: [PATCH 0888/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#15562) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 14 ++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6c3e5b378cde..82043164c9fa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,17 @@ + + + + + @@ -41,15 +48,22 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2580ea82d61d..58fd16726671 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c73c0823319f..b9376b1f5ed3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23060.6 + 6.0.0-beta.23114.5 diff --git a/global.json b/global.json index 50c158ed8b3e..85690be2c51f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.113", + "dotnet": "6.0.114", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23060.6" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23114.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23114.5" } } From 49d72191dbb4054dfd4415d51befa07377108812 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 Feb 2023 17:49:56 +0000 Subject: [PATCH 0889/1244] Merged PR 29634: [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**: 20230214.5 - **Date Produced**: February 15, 2023 4:28:13 AM UTC - **Commit**: 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.23060.6 to 6.0.0-beta.23114.5][1] - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.23060.6 to 6.0.0-beta.23114.5][1] - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.23060.6 to 6.0.0-beta.23114.5][1] [1]: https://github.com/dotnet/arcade/compare/74b7648...0c93c1c [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 6.0.114 [marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934) --- NuGet.config | 14 ++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index d32bdf112005..6be40a3b4639 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,17 @@ + + + + + @@ -41,14 +48,21 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e92ec822ec53..0c4a9627c29e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 892fd05f52a5..739c9f8262a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23060.6 + 6.0.0-beta.23114.5 diff --git a/global.json b/global.json index 50c158ed8b3e..85690be2c51f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.113", + "dotnet": "6.0.114", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23060.6" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23114.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23114.5" } } From 1b96f83ae6907df8a1dc5254c4158f532287990d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 Feb 2023 21:22:18 +0000 Subject: [PATCH 0890/1244] Merged PR 29714: [internal/release/6.0.4xx] 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.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23115.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23115.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230217.4 - **Date Produced**: February 17, 2023 6:27:06 PM UTC - **Commit**: 62fcdba42952b2e66c959c1dd513de609c40d84b - **Branch**: refs/heads/internal/release/6.... --- NuGet.config | 22 ++++-------- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++++----------- 3 files changed, 63 insertions(+), 73 deletions(-) diff --git a/NuGet.config b/NuGet.config index 82043164c9fa..bfd18eeeac55 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,14 @@ - - - + - - + @@ -25,9 +22,7 @@ - - - + @@ -48,13 +43,10 @@ - - - + - - + @@ -62,9 +54,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58fd16726671..0e4a1bf4a27d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04133de59be3070803d025a9dd52c07ef0087551 + 62fcdba42952b2e66c959c1dd513de609c40d84b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04133de59be3070803d025a9dd52c07ef0087551 + 62fcdba42952b2e66c959c1dd513de609c40d84b diff --git a/eng/Versions.props b/eng/Versions.props index b9376b1f5ed3..8450953cc75d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,44 +44,44 @@ - 6.0.14 - 6.0.14 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 + 6.0.15 + 6.0.15 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 0.2.0 - 6.0.406-servicing.23074.29 - 6.0.406-servicing.23074.29 + 6.0.407-servicing.23117.4 + 6.0.407-servicing.23117.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.7 + 6.0.8 - 6.0.14-servicing.23073.9 - 6.0.14-servicing.23073.9 - 6.0.14 - 6.0.14 - 6.0.14 - 6.0.14 + 6.0.15-servicing.23115.7 + 6.0.15-servicing.23115.7 + 6.0.15 + 6.0.15 + 6.0.15 + 6.0.15 2.1.0 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 - 6.0.14 - 6.0.14 + 6.0.15-servicing.23115.10 + 6.0.15-servicing.23115.10 + 6.0.15 + 6.0.15 From f0a82614777ab0a55a514221757b775d1bfcb128 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 Feb 2023 19:15:28 +0000 Subject: [PATCH 0891/1244] Merged PR 29731: [internal/release/6.0.4xx] 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.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23074.2 to 6.0.15-servicing.23117.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23117.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230218.3 - **Date Produced**: February 18, 2023 5:55:20 PM UTC - **Commit**: 4b16338ed0bf771a31b2ecad1f7d342b94148615 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.407-servicing.23117.4 to 6.0.407-servicing.23118.3][1] - **Microsoft.NET.Sdk**: [from 6.0.407-servicing.23117.4 to 6.0.407-servicing.23118.3][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.14-servicing.23074.2 to 6.0.15-servicing.23117.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23117.5][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC62fcdba&targetVersion=GC4b16338&_a=files [2]: https://dev... --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index bfd18eeeac55..f6f29d76e79c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,12 +17,9 @@ - - - - + @@ -49,12 +46,9 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e4a1bf4a27d..ee6a74782eb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62fcdba42952b2e66c959c1dd513de609c40d84b + 4b16338ed0bf771a31b2ecad1f7d342b94148615 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62fcdba42952b2e66c959c1dd513de609c40d84b + 4b16338ed0bf771a31b2ecad1f7d342b94148615 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 + 1808f3abeb2af5809325c218ec752ab185df6678 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9e190e3d952203836d77bb0f1c42984524e1122d + c68b021c8a031d8f1bf757dc16e44c10ed8c820e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8450953cc75d..13723ff188e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.14-servicing.23074.2 + 6.0.15-servicing.23117.2 - 6.0.14-servicing.23074.3 + 6.0.15-servicing.23117.5 @@ -56,8 +56,8 @@ - 6.0.407-servicing.23117.4 - 6.0.407-servicing.23117.4 + 6.0.407-servicing.23118.3 + 6.0.407-servicing.23118.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.15-servicing.23115.10 - 6.0.15-servicing.23115.10 + 6.0.15-servicing.23117.9 + 6.0.15-servicing.23117.9 6.0.15 6.0.15 From 5e9562f58f6a79ec8958794f85883a7a846f8e41 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 Feb 2023 19:21:34 +0000 Subject: [PATCH 0892/1244] Merged PR 29732: [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.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.309 to 6.0.310 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.309-servicing.23074.5 to 6.0.310-servicing.23117.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.309 to 6.0.310 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23074.2 to 6.0.15-servicing.23117.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runti... --- NuGet.config | 30 ++++--------- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 79 insertions(+), 93 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6be40a3b4639..95e86aeb42ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,27 +7,20 @@ - - - + - - + - - - + - - - + @@ -48,22 +41,15 @@ - - - + - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c4a9627c29e..a5fcc063d608 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffeddec3efcbb43f226550c3b8bfe8d11765f723 + 8d514aa078b709344008f1c595e854b9b56609cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffeddec3efcbb43f226550c3b8bfe8d11765f723 + 8d514aa078b709344008f1c595e854b9b56609cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffeddec3efcbb43f226550c3b8bfe8d11765f723 + 8d514aa078b709344008f1c595e854b9b56609cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 54b8f37b145c05ddfe75705c6fd03cab42f2c532 + 4f6a7f639f7921fcb8a7b11ff3b2718548f1f9c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 54b8f37b145c05ddfe75705c6fd03cab42f2c532 + 4f6a7f639f7921fcb8a7b11ff3b2718548f1f9c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 + 1808f3abeb2af5809325c218ec752ab185df6678 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9e190e3d952203836d77bb0f1c42984524e1122d + c68b021c8a031d8f1bf757dc16e44c10ed8c820e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 739c9f8262a2..18e94929e340 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.14-servicing.23074.2 + 6.0.15-servicing.23117.2 - 6.0.14-servicing.23074.3 + 6.0.15-servicing.23117.5 - 6.0.309 + 6.0.310 @@ -44,44 +44,44 @@ - 6.0.14 - 6.0.14 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 + 6.0.15 + 6.0.15 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 0.2.0 - 6.0.309-servicing.23074.34 - 6.0.309-servicing.23074.34 + 6.0.310-servicing.23118.2 + 6.0.310-servicing.23118.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.7 + 6.0.8 - 6.0.14-servicing.23073.9 - 6.0.14-servicing.23073.9 - 6.0.14 - 6.0.14 - 6.0.14 - 6.0.14 + 6.0.15-servicing.23115.7 + 6.0.15-servicing.23115.7 + 6.0.15 + 6.0.15 + 6.0.15 + 6.0.15 2.1.0 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 - 6.0.14 - 6.0.14 + 6.0.15-servicing.23117.9 + 6.0.15-servicing.23117.9 + 6.0.15 + 6.0.15 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.309 + 6.0.310 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From a3ac48421f136d6d3db06b7c0d7d7ba8d0f38ffc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Feb 2023 18:38:49 +0000 Subject: [PATCH 0893/1244] Merged PR 29755: [internal/release/6.0.4xx] 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.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230220.11 - **Date Produced**: February 21, 2023 2:20:19 AM UTC - **Commit**: 91af9ad334715d23c1382f71ccee9f45a501a70e - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.407-servicing.23118.3 to 6.0.407-servicing.23120.11][1] - **Microsoft.NET.Sdk**: [from 6.0.407-servicing.23118.3 to 6.0.407-servicing.23120.11][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.15 to 6.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] - **dotnet-dev-certs**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] - **dotnet-user-secrets**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4b16338&targetVersion=GC91af9ad&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC0cf7050&targetVersion=GCb51b398&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 f6f29d76e79c..1357fac19cae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee6a74782eb8..01c76cd8a2e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b16338ed0bf771a31b2ecad1f7d342b94148615 + 91af9ad334715d23c1382f71ccee9f45a501a70e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b16338ed0bf771a31b2ecad1f7d342b94148615 + 91af9ad334715d23c1382f71ccee9f45a501a70e diff --git a/eng/Versions.props b/eng/Versions.props index 13723ff188e7..2b36b3b139bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 0.2.0 - 6.0.407-servicing.23118.3 - 6.0.407-servicing.23118.3 + 6.0.407-servicing.23120.11 + 6.0.407-servicing.23120.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 19ccd58c041c99dfddfa62a80011d692eb66d796 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Feb 2023 20:54:58 +0000 Subject: [PATCH 0894/1244] Merged PR 29756: [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.AspNetCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (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**: 20230221.6 - **Date Produced**: February 21, 2023 6:40:51 PM UTC - **Commit**: 184bce99f0edbee2a6334f366c21980931bbed5f - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.310-servicing.23118.2 to 6.0.310-servicing.23121.6][1] - **Microsoft.NET.Sdk**: [from 6.0.310-servicing.23118.2 to 6.0.310-servicing.23121.6][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.15 to 6.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] - **dotnet-dev-certs**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] - **dotnet-user-secrets**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4f6a7f6&targetVersion=GC184bce9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC0cf7050&targetVersion=GCb51b398&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 95e86aeb42ef..ad8d3a8fed22 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 a5fcc063d608..edac2458bb1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d514aa078b709344008f1c595e854b9b56609cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f6a7f639f7921fcb8a7b11ff3b2718548f1f9c0 + 184bce99f0edbee2a6334f366c21980931bbed5f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f6a7f639f7921fcb8a7b11ff3b2718548f1f9c0 + 184bce99f0edbee2a6334f366c21980931bbed5f diff --git a/eng/Versions.props b/eng/Versions.props index 18e94929e340..a634b03ab50c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 0.2.0 - 6.0.310-servicing.23118.2 - 6.0.310-servicing.23118.2 + 6.0.310-servicing.23121.6 + 6.0.310-servicing.23121.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 99a8aa0f90564eefc820dc45d1845fb6bd6dd282 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Feb 2023 00:45:05 +0000 Subject: [PATCH 0895/1244] Merged PR 29809: [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.AspNetCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.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**: 20230226.2 - **Date Produced**: February 26, 2023 10:02:37 PM UTC - **Commit**: 9377719841f99261e56cca96905da8568de079c6 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.310-servicing.23121.6 to 6.0.310-servicing.23126.2][1] - **Microsoft.NET.Sdk**: [from 6.0.310-servicing.23121.6 to 6.0.310-servicing.23126.2][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.15 to 6.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-dev-certs**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-user-secrets**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC184bce9&targetVersion=GC9377719&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb51b398&targetVersion=GC6a6d775&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 12 ++++++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad8d3a8fed22..37ac3d3564f9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -18,9 +18,13 @@ + + + + @@ -41,14 +45,18 @@ - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edac2458bb1d..b5d1517d7858 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d514aa078b709344008f1c595e854b9b56609cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 184bce99f0edbee2a6334f366c21980931bbed5f + 9377719841f99261e56cca96905da8568de079c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 184bce99f0edbee2a6334f366c21980931bbed5f + 9377719841f99261e56cca96905da8568de079c6 diff --git a/eng/Versions.props b/eng/Versions.props index a634b03ab50c..bc4d421d0583 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 0.2.0 - 6.0.310-servicing.23121.6 - 6.0.310-servicing.23121.6 + 6.0.310-servicing.23126.2 + 6.0.310-servicing.23126.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d8659ea151969e597785b032f243b7a537c620c1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Feb 2023 00:45:10 +0000 Subject: [PATCH 0896/1244] Merged PR 29808: [internal/release/6.0.4xx] 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.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230226.3 - **Date Produced**: February 26, 2023 10:02:39 PM UTC - **Commit**: 6f7588fcd6922febeacca723a71b403edb9f4bdf - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.407-servicing.23120.11 to 6.0.407-servicing.23126.3][1] - **Microsoft.NET.Sdk**: [from 6.0.407-servicing.23120.11 to 6.0.407-servicing.23126.3][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.15 to 6.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-dev-certs**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-user-secrets**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC91af9ad&targetVersion=GC6f7588f&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb51b398&targetVersion=GC6a6d775&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1357fac19cae..bbd67aded632 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -20,6 +20,8 @@ + + @@ -40,7 +42,7 @@ - + @@ -48,6 +50,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01c76cd8a2e6..e926e9ad0045 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91af9ad334715d23c1382f71ccee9f45a501a70e + 6f7588fcd6922febeacca723a71b403edb9f4bdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91af9ad334715d23c1382f71ccee9f45a501a70e + 6f7588fcd6922febeacca723a71b403edb9f4bdf diff --git a/eng/Versions.props b/eng/Versions.props index 2b36b3b139bd..c1a331018309 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 0.2.0 - 6.0.407-servicing.23120.11 - 6.0.407-servicing.23120.11 + 6.0.407-servicing.23126.3 + 6.0.407-servicing.23126.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 672c25c7cda68443ada57f7cc58beae5800f1305 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 27 Feb 2023 18:58:29 +0000 Subject: [PATCH 0897/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230227.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.310-servicing.23126.2 -> To Version 6.0.310-servicing.23127.8 --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 37ac3d3564f9..94251bfafce0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,6 +16,7 @@ + @@ -23,6 +25,7 @@ + @@ -45,9 +48,11 @@ + + @@ -57,6 +62,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5d1517d7858..7654a80b16f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d514aa078b709344008f1c595e854b9b56609cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9377719841f99261e56cca96905da8568de079c6 + b502a47a9f68251ad2a6a773b50042d070314f8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9377719841f99261e56cca96905da8568de079c6 + b502a47a9f68251ad2a6a773b50042d070314f8d diff --git a/eng/Versions.props b/eng/Versions.props index bc4d421d0583..9f5254408159 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.310-servicing.23126.2 - 6.0.310-servicing.23126.2 + 6.0.310-servicing.23127.8 + 6.0.310-servicing.23127.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7f856954d35d2d311d39fb7f40ed144e7c9e7234 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 7 Mar 2023 10:11:35 -0800 Subject: [PATCH 0898/1244] Update branding to 6.0.311 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 892fd05f52a5..75cc17a76818 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 10 + 11 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 333c78c32a7c43a51b5c51dcbbe382ca6492df08 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 7 Mar 2023 10:11:39 -0800 Subject: [PATCH 0899/1244] Update branding to 6.0.408 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b9376b1f5ed3..6a7c8ae3b7e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 07 + 08 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From d5b7bcb55a147fe912225bf849d61c7b180dabfc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 7 Mar 2023 20:37:58 +0000 Subject: [PATCH 0900/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.407-servicing.23126.3 -> To Version 6.0.408-servicing.23157.8 --- NuGet.config | 12 ++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index bbd67aded632..698834a3db7a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,11 +17,15 @@ + + + + @@ -42,9 +48,13 @@ + + + + @@ -52,6 +62,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e926e9ad0045..52df3b49a30f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f7588fcd6922febeacca723a71b403edb9f4bdf + d6300a418ed4214d2010351d37521147bd27693f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f7588fcd6922febeacca723a71b403edb9f4bdf + d6300a418ed4214d2010351d37521147bd27693f diff --git a/eng/Versions.props b/eng/Versions.props index 2272bba06251..7d2b36c8f7ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.407-servicing.23126.3 - 6.0.407-servicing.23126.3 + 6.0.408-servicing.23157.8 + 6.0.408-servicing.23157.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 39c74a38ad301577606a1001be21f015863e5b86 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 7 Mar 2023 22:09:05 +0000 Subject: [PATCH 0901/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.310-servicing.23126.2 -> To Version 6.0.311-servicing.23157.12 --- NuGet.config | 10 ++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 94251bfafce0..62347f7f030d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -16,15 +17,19 @@ + + + + @@ -49,20 +54,25 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7654a80b16f2..b6962e566e7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d514aa078b709344008f1c595e854b9b56609cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b502a47a9f68251ad2a6a773b50042d070314f8d + 4c281ffb84e84dff9ed743cc4952156c8530b18b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b502a47a9f68251ad2a6a773b50042d070314f8d + 4c281ffb84e84dff9ed743cc4952156c8530b18b diff --git a/eng/Versions.props b/eng/Versions.props index 9f5254408159..ca09bb4b8245 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.310-servicing.23127.8 - 6.0.310-servicing.23127.8 + 6.0.311-servicing.23157.12 + 6.0.311-servicing.23157.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 05d6ddeec6b2fd7dd5051eb61999e93da71f618e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Mar 2023 01:45:45 +0000 Subject: [PATCH 0902/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.407-servicing.23126.3 -> To Version 6.0.408-servicing.23157.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 52df3b49a30f..c2f9353fac08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d6300a418ed4214d2010351d37521147bd27693f + 7b3112fca55adde458b1f129757508cac1eccf0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d6300a418ed4214d2010351d37521147bd27693f + 7b3112fca55adde458b1f129757508cac1eccf0f diff --git a/eng/Versions.props b/eng/Versions.props index 7d2b36c8f7ce..be1ab5d01ece 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.408-servicing.23157.8 - 6.0.408-servicing.23157.8 + 6.0.408-servicing.23157.26 + 6.0.408-servicing.23157.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 725dbe49aec80696390e9766b9fb51d3937566cc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 9 Mar 2023 21:33:13 +0000 Subject: [PATCH 0903/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230309.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.408-servicing.23157.26 -> To Version 6.0.408-servicing.23159.16 Dependency coherency updates 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 From Version 6.0.15-servicing.23115.7 -> To Version 6.0.16-servicing.23158.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++----- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 3 files changed, 46 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 698834a3db7a..4e09bbbb1aeb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,14 @@ - - - + + @@ -48,14 +47,13 @@ - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2f9353fac08..f43f3e20bea8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 6137b3cc317bdcc73f526baee723c2b79661cb1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 6137b3cc317bdcc73f526baee723c2b79661cb1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 6137b3cc317bdcc73f526baee723c2b79661cb1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 6137b3cc317bdcc73f526baee723c2b79661cb1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 6137b3cc317bdcc73f526baee723c2b79661cb1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 6137b3cc317bdcc73f526baee723c2b79661cb1c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7b3112fca55adde458b1f129757508cac1eccf0f + 8ce45d15c6b4ee90b2e16c4ebe3feeb0dc3c2b33 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7b3112fca55adde458b1f129757508cac1eccf0f + 8ce45d15c6b4ee90b2e16c4ebe3feeb0dc3c2b33 diff --git a/eng/Versions.props b/eng/Versions.props index 38f357e2f2d8..390ff4df1920 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.15 - 6.0.15 - 6.0.15-servicing.23124.4 - 6.0.15-servicing.23124.4 - 6.0.15-servicing.23124.4 - 6.0.15-servicing.23124.4 + 6.0.16 + 6.0.16 + 6.0.16-servicing.23159.1 + 6.0.16-servicing.23159.1 + 6.0.16-servicing.23159.1 + 6.0.16-servicing.23159.1 0.2.0 - 6.0.408-servicing.23157.26 - 6.0.408-servicing.23157.26 + 6.0.408-servicing.23159.16 + 6.0.408-servicing.23159.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.15-servicing.23115.7 - 6.0.15-servicing.23115.7 - 6.0.15 - 6.0.15 - 6.0.15 - 6.0.15 + 6.0.16-servicing.23158.23 + 6.0.16-servicing.23158.23 + 6.0.16 + 6.0.16 + 6.0.16 + 6.0.16 2.1.0 From 0d89344f12a83a73e19c0cdb26ec6d64a5063c7d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 10 Mar 2023 23:07:45 +0000 Subject: [PATCH 0904/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230310.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.408-servicing.23157.26 -> To Version 6.0.408-servicing.23160.20 Dependency coherency updates 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 From Version 6.0.15-servicing.23115.7 -> To Version 6.0.16-servicing.23159.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++++-------- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++-------- 3 files changed, 37 insertions(+), 43 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4e09bbbb1aeb..22ab5e1f61bc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,14 @@ - + - - - - + @@ -47,13 +44,10 @@ - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f43f3e20bea8..7e565066888d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + 964350a9d183cff60d800229c203ee8210a0a96e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + 964350a9d183cff60d800229c203ee8210a0a96e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + 964350a9d183cff60d800229c203ee8210a0a96e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + 964350a9d183cff60d800229c203ee8210a0a96e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + 964350a9d183cff60d800229c203ee8210a0a96e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + 964350a9d183cff60d800229c203ee8210a0a96e @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 964350a9d183cff60d800229c203ee8210a0a96e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ce45d15c6b4ee90b2e16c4ebe3feeb0dc3c2b33 + baf96e743f8a54782ff4a8f109a9a7ff1e390e9a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ce45d15c6b4ee90b2e16c4ebe3feeb0dc3c2b33 + baf96e743f8a54782ff4a8f109a9a7ff1e390e9a diff --git a/eng/Versions.props b/eng/Versions.props index 390ff4df1920..75aeb4bf3b2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,30 +46,30 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23159.1 - 6.0.16-servicing.23159.1 - 6.0.16-servicing.23159.1 - 6.0.16-servicing.23159.1 + 6.0.16-servicing.23160.6 + 6.0.16-servicing.23160.6 + 6.0.16-servicing.23160.6 + 6.0.16-servicing.23160.6 0.2.0 - 6.0.408-servicing.23159.16 - 6.0.408-servicing.23159.16 + 6.0.408-servicing.23160.20 + 6.0.408-servicing.23160.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.8 + 6.0.9 - 6.0.16-servicing.23158.23 - 6.0.16-servicing.23158.23 + 6.0.16-servicing.23159.13 + 6.0.16-servicing.23159.13 6.0.16 6.0.16 6.0.16 From ead93cfd8f481d6288936c187fbf53d621bd37ce Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 10 Mar 2023 23:08:08 +0000 Subject: [PATCH 0905/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230310.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.311-servicing.23157.12 -> To Version 6.0.311-servicing.23160.21 Dependency coherency updates 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 From Version 6.0.15-servicing.23115.7 -> To Version 6.0.16-servicing.23159.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 28 ++++------------ eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++---------- 3 files changed, 59 insertions(+), 75 deletions(-) diff --git a/NuGet.config b/NuGet.config index 62347f7f030d..80443b038a12 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,17 @@ - - - + - - - + - - - - - + @@ -53,20 +45,12 @@ - - - + - - - + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6962e566e7d..4dc81635921b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 964350a9d183cff60d800229c203ee8210a0a96e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 964350a9d183cff60d800229c203ee8210a0a96e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 964350a9d183cff60d800229c203ee8210a0a96e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 964350a9d183cff60d800229c203ee8210a0a96e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 964350a9d183cff60d800229c203ee8210a0a96e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 964350a9d183cff60d800229c203ee8210a0a96e @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 964350a9d183cff60d800229c203ee8210a0a96e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8d514aa078b709344008f1c595e854b9b56609cd + 06f082bc89b8803917cdc9e67d012bb9ef34dde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8d514aa078b709344008f1c595e854b9b56609cd + 06f082bc89b8803917cdc9e67d012bb9ef34dde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8d514aa078b709344008f1c595e854b9b56609cd + 06f082bc89b8803917cdc9e67d012bb9ef34dde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c281ffb84e84dff9ed743cc4952156c8530b18b + a76d8721ccbc89e0cc61621439841f32603a8017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c281ffb84e84dff9ed743cc4952156c8530b18b + a76d8721ccbc89e0cc61621439841f32603a8017 diff --git a/eng/Versions.props b/eng/Versions.props index 0a534709d704..656f6593dba4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.310 + 6.0.311 @@ -44,36 +44,36 @@ - 6.0.15 - 6.0.15 - 6.0.15-servicing.23124.4 - 6.0.15-servicing.23124.4 - 6.0.15-servicing.23124.4 - 6.0.15-servicing.23124.4 + 6.0.16 + 6.0.16 + 6.0.16-servicing.23160.6 + 6.0.16-servicing.23160.6 + 6.0.16-servicing.23160.6 + 6.0.16-servicing.23160.6 0.2.0 - 6.0.311-servicing.23157.12 - 6.0.311-servicing.23157.12 + 6.0.311-servicing.23160.21 + 6.0.311-servicing.23160.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.8 + 6.0.9 - 6.0.15-servicing.23115.7 - 6.0.15-servicing.23115.7 - 6.0.15 - 6.0.15 - 6.0.15 - 6.0.15 + 6.0.16-servicing.23159.13 + 6.0.16-servicing.23159.13 + 6.0.16 + 6.0.16 + 6.0.16 + 6.0.16 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.310 + 6.0.311 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 70a7a81aea8b9df6b6e7af10c8cadbbb763bcf08 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 12 Mar 2023 05:33:53 +0000 Subject: [PATCH 0906/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230311.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.408-servicing.23160.20 -> To Version 6.0.408-servicing.23161.1 Dependency coherency updates 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 From Version 6.0.16-servicing.23159.13 -> To Version 6.0.16-servicing.23160.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 +++---- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 22ab5e1f61bc..0d615458abd1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,14 @@ - + - + @@ -44,10 +44,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e565066888d..7d51c6db7ec7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - baf96e743f8a54782ff4a8f109a9a7ff1e390e9a + 248110f022721e52b26b3077f807e45f8ff8169e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - baf96e743f8a54782ff4a8f109a9a7ff1e390e9a + 248110f022721e52b26b3077f807e45f8ff8169e diff --git a/eng/Versions.props b/eng/Versions.props index 75aeb4bf3b2e..901bb5811b1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23160.6 - 6.0.16-servicing.23160.6 - 6.0.16-servicing.23160.6 - 6.0.16-servicing.23160.6 + 6.0.16-servicing.23160.16 + 6.0.16-servicing.23160.16 + 6.0.16-servicing.23160.16 + 6.0.16-servicing.23160.16 0.2.0 - 6.0.408-servicing.23160.20 - 6.0.408-servicing.23160.20 + 6.0.408-servicing.23161.1 + 6.0.408-servicing.23161.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.16-servicing.23159.13 - 6.0.16-servicing.23159.13 + 6.0.16-servicing.23160.8 + 6.0.16-servicing.23160.8 6.0.16 6.0.16 6.0.16 From 77939154ab734a442d562def4e325bf7bea02362 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 13 Mar 2023 05:50:05 +0000 Subject: [PATCH 0907/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230312.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.311-servicing.23160.21 -> To Version 6.0.311-servicing.23162.4 Dependency coherency updates 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 From Version 6.0.16-servicing.23159.13 -> To Version 6.0.16-servicing.23160.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 +++---- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 80443b038a12..77d893c030cb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,14 @@ - + - + @@ -45,10 +45,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dc81635921b..6a9afddd4452 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 06f082bc89b8803917cdc9e67d012bb9ef34dde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a76d8721ccbc89e0cc61621439841f32603a8017 + 02e4bb291d9a0f5103b26a62d600308219f8388a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a76d8721ccbc89e0cc61621439841f32603a8017 + 02e4bb291d9a0f5103b26a62d600308219f8388a diff --git a/eng/Versions.props b/eng/Versions.props index 656f6593dba4..51a7eedd5cca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23160.6 - 6.0.16-servicing.23160.6 - 6.0.16-servicing.23160.6 - 6.0.16-servicing.23160.6 + 6.0.16-servicing.23160.16 + 6.0.16-servicing.23160.16 + 6.0.16-servicing.23160.16 + 6.0.16-servicing.23160.16 0.2.0 - 6.0.311-servicing.23160.21 - 6.0.311-servicing.23160.21 + 6.0.311-servicing.23162.4 + 6.0.311-servicing.23162.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.16-servicing.23159.13 - 6.0.16-servicing.23159.13 + 6.0.16-servicing.23160.8 + 6.0.16-servicing.23160.8 6.0.16 6.0.16 6.0.16 From c15a7faf042e8e6c42c5080c3831f71eaa23e587 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 14 Mar 2023 19:40:15 +0000 Subject: [PATCH 0908/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230314.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.311-servicing.23160.21 -> To Version 6.0.311-servicing.23164.13 Dependency coherency updates 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 From Version 6.0.16-servicing.23159.13 -> To Version 6.0.16-servicing.23160.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 6a9afddd4452..d1ea386b727f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 06f082bc89b8803917cdc9e67d012bb9ef34dde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02e4bb291d9a0f5103b26a62d600308219f8388a + c120ade75f950b617b6f6a3b95a09a09b4b22d30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02e4bb291d9a0f5103b26a62d600308219f8388a + c120ade75f950b617b6f6a3b95a09a09b4b22d30 diff --git a/eng/Versions.props b/eng/Versions.props index 51a7eedd5cca..f23a5932b7b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.311-servicing.23162.4 - 6.0.311-servicing.23162.4 + 6.0.311-servicing.23164.13 + 6.0.311-servicing.23164.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8cddafebc657ea6444fde728cae8adff07e0e333 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Mar 2023 11:00:56 +0000 Subject: [PATCH 0909/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230315.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.311-servicing.23160.21 -> To Version 6.0.311-servicing.23165.6 Dependency coherency updates 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 From Version 6.0.16-servicing.23159.13 -> To Version 6.0.16-servicing.23160.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 d1ea386b727f..d7310aa16811 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 06f082bc89b8803917cdc9e67d012bb9ef34dde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c120ade75f950b617b6f6a3b95a09a09b4b22d30 + ee98159221d2eafece5fc4f40b320d0205e439ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c120ade75f950b617b6f6a3b95a09a09b4b22d30 + ee98159221d2eafece5fc4f40b320d0205e439ad diff --git a/eng/Versions.props b/eng/Versions.props index f23a5932b7b0..17b0e16f8a48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.311-servicing.23164.13 - 6.0.311-servicing.23164.13 + 6.0.311-servicing.23165.6 + 6.0.311-servicing.23165.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bccaae64c7323f920f8e53a53e92c938e14c7bfb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Mar 2023 22:47:44 +0000 Subject: [PATCH 0910/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230315.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.311-servicing.23160.21 -> To Version 6.0.311-servicing.23165.20 Dependency coherency updates 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 From Version 6.0.16-servicing.23159.13 -> To Version 6.0.16-servicing.23160.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 77d893c030cb..d6cfe31e27da 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -45,12 +45,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7310aa16811..94eb62efce44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 732cd26e19e07ff83dacc7fe1ec25acee913eace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 732cd26e19e07ff83dacc7fe1ec25acee913eace https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 732cd26e19e07ff83dacc7fe1ec25acee913eace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 732cd26e19e07ff83dacc7fe1ec25acee913eace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 732cd26e19e07ff83dacc7fe1ec25acee913eace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 732cd26e19e07ff83dacc7fe1ec25acee913eace https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 06f082bc89b8803917cdc9e67d012bb9ef34dde6 + 58d22dd23e0974e3fa632d04dff2a69975d0bd66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 06f082bc89b8803917cdc9e67d012bb9ef34dde6 + 58d22dd23e0974e3fa632d04dff2a69975d0bd66 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 06f082bc89b8803917cdc9e67d012bb9ef34dde6 + 58d22dd23e0974e3fa632d04dff2a69975d0bd66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ee98159221d2eafece5fc4f40b320d0205e439ad + 03de78b0ce195a3fbf4acbade9f462248ca8a128 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ee98159221d2eafece5fc4f40b320d0205e439ad + 03de78b0ce195a3fbf4acbade9f462248ca8a128 diff --git a/eng/Versions.props b/eng/Versions.props index 17b0e16f8a48..688d424fc6f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23160.16 - 6.0.16-servicing.23160.16 - 6.0.16-servicing.23160.16 - 6.0.16-servicing.23160.16 + 6.0.16-servicing.23164.13 + 6.0.16-servicing.23164.13 + 6.0.16-servicing.23164.13 + 6.0.16-servicing.23164.13 0.2.0 - 6.0.311-servicing.23165.6 - 6.0.311-servicing.23165.6 + 6.0.311-servicing.23165.20 + 6.0.311-servicing.23165.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f57f76cdebbe521e2bbe96f7c33540feee9a680f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 17 Mar 2023 20:20:51 +0000 Subject: [PATCH 0911/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230317.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.311-servicing.23160.21 -> To Version 6.0.311-servicing.23167.9 Dependency coherency updates 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 From Version 6.0.16-servicing.23159.13 -> To Version 6.0.16-servicing.23166.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++------------ eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 45 deletions(-) diff --git a/NuGet.config b/NuGet.config index d6cfe31e27da..d3e77eaef113 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,19 @@ - + - + - - - - - @@ -45,19 +40,14 @@ - + - + - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 94eb62efce44..655504f47b8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 732cd26e19e07ff83dacc7fe1ec25acee913eace + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 732cd26e19e07ff83dacc7fe1ec25acee913eace + 206b88efa734237274703a99f3b131e68a089767 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 732cd26e19e07ff83dacc7fe1ec25acee913eace + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 732cd26e19e07ff83dacc7fe1ec25acee913eace + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 732cd26e19e07ff83dacc7fe1ec25acee913eace + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 732cd26e19e07ff83dacc7fe1ec25acee913eace + 206b88efa734237274703a99f3b131e68a089767 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 58d22dd23e0974e3fa632d04dff2a69975d0bd66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 03de78b0ce195a3fbf4acbade9f462248ca8a128 + cc48aa83018f21a040f76a4690ca04dcea4c47fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 03de78b0ce195a3fbf4acbade9f462248ca8a128 + cc48aa83018f21a040f76a4690ca04dcea4c47fe diff --git a/eng/Versions.props b/eng/Versions.props index 688d424fc6f4..c9d292d88ebe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23164.13 - 6.0.16-servicing.23164.13 - 6.0.16-servicing.23164.13 - 6.0.16-servicing.23164.13 + 6.0.16-servicing.23166.11 + 6.0.16-servicing.23166.11 + 6.0.16-servicing.23166.11 + 6.0.16-servicing.23166.11 0.2.0 - 6.0.311-servicing.23165.20 - 6.0.311-servicing.23165.20 + 6.0.311-servicing.23167.9 + 6.0.311-servicing.23167.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.16-servicing.23160.8 - 6.0.16-servicing.23160.8 + 6.0.16-servicing.23166.11 + 6.0.16-servicing.23166.11 6.0.16 6.0.16 6.0.16 From bed753ff47001e30324c452ab642bcb1b777bc98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 10:53:19 -0700 Subject: [PATCH 0912/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#15836) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 10 ---------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index bbd67aded632..03d3587a670c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,16 @@ - - - - - @@ -42,17 +37,12 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e926e9ad0045..d30cb53aaa12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index cad08e19dd38..568b45eda2ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23114.5 + 6.0.0-beta.23167.1 diff --git a/global.json b/global.json index 85690be2c51f..5bd694fa0723 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.114", + "dotnet": "6.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23114.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23114.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23167.1" } } From 68dae6f298223683e9aa450bb7e98e2f068aca55 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Mar 2023 15:53:11 +0000 Subject: [PATCH 0913/1244] Merged PR 30039: [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**: 20230317.1 - **Date Produced**: March 17, 2023 4:15:05 PM UTC - **Commit**: 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.23114.5 to 6.0.0-beta.23167.1][2] - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.23114.5 to 6.0.0-beta.23167.1][2] - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.23114.5 to 6.0.0-beta.23167.1][2] [2]: https://github.com/dotnet/arcade/compare/0c93c1c...92c39a4 [DependencyUpdate]: <> (End) [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 655504f47b8c..d90efef68c38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 567f9251f9ea..4d69f50eb9d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23114.5 + 6.0.0-beta.23167.1 diff --git a/global.json b/global.json index 85690be2c51f..5bd694fa0723 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.114", + "dotnet": "6.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23114.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23114.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23167.1" } } From e8391e42e43aeee656cf8d5917e6931619b9c09e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Mar 2023 15:55:21 +0000 Subject: [PATCH 0914/1244] Merged PR 30006: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230317.8 - **Date Produced**: March 17, 2023 7:57:45 PM UTC - **Commit**: 91abb6f0627ff7198b847f7102e3125330565689 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23161.1 to 6.0.408-servicing.23167.8][6] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23161.1 to 6.0.408-servicing.23167.8][6] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23160.8 to 6.0.16-servicing.23166.11][7] - **Microsoft.NETCore.App.Ref**: [from 6.0.16 to 6.0.16][7] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.16-servicing.23160.8 to 6.0.16-servicing.23166.11][7] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][7] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.16 to 6.0.16][7] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.16 to 6.0.16][7] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.9][7] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.16 to 6.0.16][8] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.16-servicing.23160.16 to 6.0.16-servicing.23166.11][8] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][8] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23160.16 to 6.0.16-servicing.23166.11][8] - **dotnet-dev-certs**: [from 6.0.16-servicing.23160.16 to 6.0.16-servicing.23166.11][8] - **dotnet-user-secrets**: [from 6.0.16-servicing.23160.16 to 6.0.16-servicing.23166.11][8] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.406 to 6.0.408][9] - **Microsoft.TemplateEngine.Cli**: [from 6.0.406-rtm.23074.6 to 6.0.408-rtm.23165.2][9] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.406 to 6.0.408][9] [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC248110f&targetVersion=GC91abb6f&_a=files [7]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCb4ba75b&targetVersion=GC90ad458&_a=files [8]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC56b0b4a&targetVersion=GC206b88e&_a=files [9]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC647bf84&targetVersion=GCb2eeea6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) [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/dotne... --- NuGet.config | 20 +++++--------- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 45 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0d615458abd1..f26c40ae8bd7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,19 @@ - + - + + - - - - - @@ -44,19 +40,15 @@ - + - + + - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c97832f38f9d..ebc4c3b837f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 206b88efa734237274703a99f3b131e68a089767 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 206b88efa734237274703a99f3b131e68a089767 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 647bf84ba835f020ec0da08ca90f6682cd1ddc65 + b2eeea6da5301535d1b984b2d167b41d41d86a4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 647bf84ba835f020ec0da08ca90f6682cd1ddc65 + b2eeea6da5301535d1b984b2d167b41d41d86a4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 647bf84ba835f020ec0da08ca90f6682cd1ddc65 + b2eeea6da5301535d1b984b2d167b41d41d86a4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 248110f022721e52b26b3077f807e45f8ff8169e + 91abb6f0627ff7198b847f7102e3125330565689 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 248110f022721e52b26b3077f807e45f8ff8169e + 91abb6f0627ff7198b847f7102e3125330565689 diff --git a/eng/Versions.props b/eng/Versions.props index 6488414fffcb..6a01f858514a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.406 + 6.0.408 @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23160.16 - 6.0.16-servicing.23160.16 - 6.0.16-servicing.23160.16 - 6.0.16-servicing.23160.16 + 6.0.16-servicing.23166.11 + 6.0.16-servicing.23166.11 + 6.0.16-servicing.23166.11 + 6.0.16-servicing.23166.11 0.2.0 - 6.0.408-servicing.23161.1 - 6.0.408-servicing.23161.1 + 6.0.408-servicing.23167.8 + 6.0.408-servicing.23167.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.16-servicing.23160.8 - 6.0.16-servicing.23160.8 + 6.0.16-servicing.23166.11 + 6.0.16-servicing.23166.11 6.0.16 6.0.16 6.0.16 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.406 + 6.0.408 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From f9a1e742fe2f66f4a8f3e0412a984dba5217380a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Mar 2023 19:07:48 +0000 Subject: [PATCH 0915/1244] Merged PR 30109: [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**: 20230320.14 - **Date Produced**: March 20, 2023 10:10:50 PM UTC - **Commit**: 678ddd2a0714bea426951ffd6de8d7d7bac4156b - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.311-servicing.23167.9 to 6.0.311-servicing.23170.14][1] - **Microsoft.NET.Sdk**: [from 6.0.311-servicing.23167.9 to 6.0.311-servicing.23170.14][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCcc48aa8&targetVersion=GC678ddd2&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 54 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------ 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/NuGet.config b/NuGet.config index d3e77eaef113..53e5f0530d50 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -40,12 +40,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d90efef68c38..337db6c70a36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + 41a64905967d6579041b042c2295820c2cf38578 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + 41a64905967d6579041b042c2295820c2cf38578 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 58d22dd23e0974e3fa632d04dff2a69975d0bd66 + 3ae80688e3ad84ece02329f8d4f9f37330b5f790 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 58d22dd23e0974e3fa632d04dff2a69975d0bd66 + 3ae80688e3ad84ece02329f8d4f9f37330b5f790 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 58d22dd23e0974e3fa632d04dff2a69975d0bd66 + 3ae80688e3ad84ece02329f8d4f9f37330b5f790 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc48aa83018f21a040f76a4690ca04dcea4c47fe + af9e9fa86c6b9e38d1eb70fe62bb65316766e064 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc48aa83018f21a040f76a4690ca04dcea4c47fe + af9e9fa86c6b9e38d1eb70fe62bb65316766e064 diff --git a/eng/Versions.props b/eng/Versions.props index 4d69f50eb9d7..bfffc5c1b504 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23166.11 - 6.0.16-servicing.23166.11 - 6.0.16-servicing.23166.11 - 6.0.16-servicing.23166.11 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 0.2.0 - 6.0.311-servicing.23167.9 - 6.0.311-servicing.23167.9 + 6.0.311-servicing.23171.8 + 6.0.311-servicing.23171.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.16-servicing.23166.11 - 6.0.16-servicing.23166.11 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 6.0.16 6.0.16 6.0.16 From 0ec6bb5f16818c7d03ae46ff28a30b5243fd2e29 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 16:07:03 +0000 Subject: [PATCH 0916/1244] Merged PR 30136: [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.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.15-servicing.23117.9 to 6.0.15-servicing.23171.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23117.9 to 6.0.15-servicing.23171.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.311 to 6.0.311 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.311-servicing.23171.2 to 6.0.311-servicing.23171.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.311 to 6.0.311 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.15-servicing.23117.2 to 6.0.16-servicing.23171.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.15-servicing.23117.5 to 6.0.16-servicing.23171.3 (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**: 20230321.35 - **Date Produced**: March 22, 2023 12:28:05 AM UTC - **Commit**: c41fb4e17b3826bc563163c134784a99df5f66e9 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBui... --- NuGet.config | 10 +++++--- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 3 files changed, 44 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 53e5f0530d50..a0619674c679 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,9 +17,10 @@ - + + @@ -40,14 +41,15 @@ - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 337db6c70a36..004de28fcaa6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 + 8488fb31c8f0e9648730cf942a5ae868ddf975c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 + 8488fb31c8f0e9648730cf942a5ae868ddf975c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 + 8488fb31c8f0e9648730cf942a5ae868ddf975c2 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 + 8488fb31c8f0e9648730cf942a5ae868ddf975c2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ae80688e3ad84ece02329f8d4f9f37330b5f790 + 76f9cf41a0925eee8c85b78a0cb8aaaedab162cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ae80688e3ad84ece02329f8d4f9f37330b5f790 + 76f9cf41a0925eee8c85b78a0cb8aaaedab162cf https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ae80688e3ad84ece02329f8d4f9f37330b5f790 + 76f9cf41a0925eee8c85b78a0cb8aaaedab162cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - af9e9fa86c6b9e38d1eb70fe62bb65316766e064 + c41fb4e17b3826bc563163c134784a99df5f66e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - af9e9fa86c6b9e38d1eb70fe62bb65316766e064 + c41fb4e17b3826bc563163c134784a99df5f66e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1808f3abeb2af5809325c218ec752ab185df6678 + 02e4f4f5bc2d6027944d5144a3458bad23daa2ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c68b021c8a031d8f1bf757dc16e44c10ed8c820e + 6021156ac38d10eee9ca9d17553366352d3e8408 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index bfffc5c1b504..5fce54dc1f4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.15-servicing.23117.2 + 6.0.16-servicing.23171.2 - 6.0.15-servicing.23117.5 + 6.0.16-servicing.23171.3 @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 0.2.0 - 6.0.311-servicing.23171.8 - 6.0.311-servicing.23171.8 + 6.0.311-servicing.23171.35 + 6.0.311-servicing.23171.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.15-servicing.23117.9 - 6.0.15-servicing.23117.9 + 6.0.15-servicing.23171.6 + 6.0.15-servicing.23171.6 6.0.15 6.0.15 From 984df18d4945078b76055e00f96aba2ce1e19bc1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 16:49:31 +0000 Subject: [PATCH 0917/1244] Merged PR 30135: [internal/release/6.0.4xx] 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.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.15-servicing.23117.9 to 6.0.15-servicing.23171.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23117.9 to 6.0.15-servicing.23171.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.408 to 6.0.408 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.408-rtm.23165.2 to 6.0.408-rtm.23171.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.408 to 6.0.408 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.15-servicing.23117.2 to 6.0.16-servicing.23171.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-... --- NuGet.config | 14 ++++---- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 57 insertions(+), 55 deletions(-) diff --git a/NuGet.config b/NuGet.config index f26c40ae8bd7..c513f0d959e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,20 @@ - + - + - + + @@ -40,15 +41,16 @@ - + - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ebc4c3b837f2..c6fd8b0ab6e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 + 8488fb31c8f0e9648730cf942a5ae868ddf975c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 + 8488fb31c8f0e9648730cf942a5ae868ddf975c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 + 8488fb31c8f0e9648730cf942a5ae868ddf975c2 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 + 8488fb31c8f0e9648730cf942a5ae868ddf975c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b2eeea6da5301535d1b984b2d167b41d41d86a4c + 8af471086762e04add1ecf2991da0bd0200268be - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b2eeea6da5301535d1b984b2d167b41d41d86a4c + 8af471086762e04add1ecf2991da0bd0200268be https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b2eeea6da5301535d1b984b2d167b41d41d86a4c + 8af471086762e04add1ecf2991da0bd0200268be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91abb6f0627ff7198b847f7102e3125330565689 + d955d3b4e992bc28a3c1ac56f86cd09c0aab3de0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91abb6f0627ff7198b847f7102e3125330565689 + d955d3b4e992bc28a3c1ac56f86cd09c0aab3de0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1808f3abeb2af5809325c218ec752ab185df6678 + 02e4f4f5bc2d6027944d5144a3458bad23daa2ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c68b021c8a031d8f1bf757dc16e44c10ed8c820e + 6021156ac38d10eee9ca9d17553366352d3e8408 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6a01f858514a..027f5d4eafa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.15-servicing.23117.2 + 6.0.16-servicing.23171.2 - 6.0.15-servicing.23117.5 + 6.0.16-servicing.23171.3 @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23166.11 - 6.0.16-servicing.23166.11 - 6.0.16-servicing.23166.11 - 6.0.16-servicing.23166.11 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 0.2.0 - 6.0.408-servicing.23167.8 - 6.0.408-servicing.23167.8 + 6.0.408-servicing.23171.34 + 6.0.408-servicing.23171.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.16-servicing.23166.11 - 6.0.16-servicing.23166.11 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 6.0.16 6.0.16 6.0.16 @@ -78,8 +78,8 @@ - 6.0.15-servicing.23117.9 - 6.0.15-servicing.23117.9 + 6.0.15-servicing.23171.6 + 6.0.15-servicing.23171.6 6.0.15 6.0.15 From c1f6cbb80dd7d9af44932a56a32dbe55fdf8f496 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 18:53:17 +0000 Subject: [PATCH 0918/1244] Merged PR 30153: [internal/release/6.0.4xx] 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.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230322.11 - **Date Produced**: March 22, 2023 4:45:37 PM UTC - **Commit**: 689317e28f02dbc18867358491b75cdfc08ee487 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23171.34 to 6.0.408-servicing.23172.11][1] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23171.34 to 6.0.408-servicing.23172.11][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.16 to 6.0.16][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21][2] - **dotnet-dev-certs**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21][2] - **dotnet-user-secrets**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd955d3b&targetVersion=GC689317e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCbb8d881&targetVersion=GC41a6490&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 c513f0d959e1..bea49ce3c45a 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 c6fd8b0ab6e1..41ac374ec715 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8af471086762e04add1ecf2991da0bd0200268be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d955d3b4e992bc28a3c1ac56f86cd09c0aab3de0 + 689317e28f02dbc18867358491b75cdfc08ee487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d955d3b4e992bc28a3c1ac56f86cd09c0aab3de0 + 689317e28f02dbc18867358491b75cdfc08ee487 diff --git a/eng/Versions.props b/eng/Versions.props index 027f5d4eafa4..0b78522a0e56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 0.2.0 - 6.0.408-servicing.23171.34 - 6.0.408-servicing.23171.34 + 6.0.408-servicing.23172.11 + 6.0.408-servicing.23172.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84bd61b162dc88c51de634acf508937c128df7e6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 18:53:25 +0000 Subject: [PATCH 0919/1244] Merged PR 30152: [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.AspNetCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21 (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**: 20230322.10 - **Date Produced**: March 22, 2023 4:44:23 PM UTC - **Commit**: f83427b21403f7eeaec8895ecacba6617dfdffbb - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.311-servicing.23171.35 to 6.0.311-servicing.23172.10][1] - **Microsoft.NET.Sdk**: [from 6.0.311-servicing.23171.35 to 6.0.311-servicing.23172.10][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.16 to 6.0.16][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21][2] - **dotnet-dev-certs**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21][2] - **dotnet-user-secrets**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc41fb4e&targetVersion=GCf83427b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCbb8d881&targetVersion=GC41a6490&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 a0619674c679..dbcee1eae54c 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 004de28fcaa6..123f58039f19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 76f9cf41a0925eee8c85b78a0cb8aaaedab162cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c41fb4e17b3826bc563163c134784a99df5f66e9 + f83427b21403f7eeaec8895ecacba6617dfdffbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c41fb4e17b3826bc563163c134784a99df5f66e9 + f83427b21403f7eeaec8895ecacba6617dfdffbb diff --git a/eng/Versions.props b/eng/Versions.props index 5fce54dc1f4b..f69248d78b18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 0.2.0 - 6.0.311-servicing.23171.35 - 6.0.311-servicing.23171.35 + 6.0.311-servicing.23172.10 + 6.0.311-servicing.23172.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ccc26b65e4d5d807348770c19b7222850850990a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Mar 2023 13:57:31 +0000 Subject: [PATCH 0920/1244] Merged PR 30184: [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.Test.Sdk**: from 17.2.0-release-20220408-11 to 17.2.0 (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**: 20230322.25 - **Date Produced**: March 23, 2023 1:33:13 AM UTC - **Commit**: 15bb2db263380e84bf4e69703b32edcc6331fc2c - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.311-servicing.23172.10 to 6.0.311-servicing.23172.25][1] - **Microsoft.NET.Sdk**: [from 6.0.311-servicing.23172.10 to 6.0.311-servicing.23172.25][1] - **Microsoft.NET.Test.Sdk**: [from 17.2.0-release-20220408-11 to 17.2.0][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf83427b214&targetVersion=GC15bb2db263&_a=files [2]: https://github.com/microsoft/vstest/compare/717d0cf949...717d0cf949 [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 123f58039f19..5cd01f0073dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 76f9cf41a0925eee8c85b78a0cb8aaaedab162cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f83427b21403f7eeaec8895ecacba6617dfdffbb + 15bb2db263380e84bf4e69703b32edcc6331fc2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f83427b21403f7eeaec8895ecacba6617dfdffbb + 15bb2db263380e84bf4e69703b32edcc6331fc2c @@ -130,7 +130,7 @@ 702b8e77f5fbfe21e6743324c1750503e02f182d - + https://github.com/microsoft/vstest 717d0cf94925e9cf67466dbee46c1019930eb212 diff --git a/eng/Versions.props b/eng/Versions.props index f69248d78b18..7e4d689b1287 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.311-servicing.23172.10 - 6.0.311-servicing.23172.10 + 6.0.311-servicing.23172.25 + 6.0.311-servicing.23172.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-release-20220408-11 + 17.2.0 From a7b826c98184e97ee81572f52dc1b5e0bc9e18a7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Mar 2023 16:00:36 +0000 Subject: [PATCH 0921/1244] Merged PR 30194: [internal/release/6.0.4xx] 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.Test.Sdk**: from 17.3.1 to 17.3.2 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230323.4 - **Date Produced**: March 23, 2023 3:29:58 PM UTC - **Commit**: 42e2abaa4121743673f8695c74aa69d681e8f4af - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23172.11 to 6.0.408-servicing.23173.4][1] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23172.11 to 6.0.408-servicing.23173.4][1] - **Microsoft.NET.Test.Sdk**: [from 17.3.1 to 17.3.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC689317e28f&targetVersion=GC42e2abaa41&_a=files [2]: https://github.com/microsoft/vstest/compare/83d2f8162d...dd7c26bf1f [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 41ac374ec715..9f16a5d165a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8af471086762e04add1ecf2991da0bd0200268be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 689317e28f02dbc18867358491b75cdfc08ee487 + 42e2abaa4121743673f8695c74aa69d681e8f4af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 689317e28f02dbc18867358491b75cdfc08ee487 + 42e2abaa4121743673f8695c74aa69d681e8f4af @@ -130,9 +130,9 @@ 5d69143fbe992d8fa33d5b83d5fdd5f4ed7bb4fc - + https://github.com/microsoft/vstest - 83d2f8162d29a66a8ff323c4bba93c8250013511 + dd7c26bf1fa66d50a0f21999e24f7b7e4195ae05 diff --git a/eng/Versions.props b/eng/Versions.props index 0b78522a0e56..ac761201a52f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.408-servicing.23172.11 - 6.0.408-servicing.23172.11 + 6.0.408-servicing.23173.4 + 6.0.408-servicing.23173.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.1 + 17.3.2 From 32da91a29e51a3ef6f25b15a08811bcebdc57b88 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 24 Mar 2023 20:17:03 +0000 Subject: [PATCH 0922/1244] Merged PR 30205: [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.Test.Sdk**: from 17.2.0 to 17.2.1-release-20230323-13 (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**: 20230323.16 - **Date Produced**: March 24, 2023 6:13:45 AM UTC - **Commit**: 1d7a15ab5d9e76a668d41e69b183c3b905566f24 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.311-servicing.23172.25 to 6.0.311-servicing.23173.16][1] - **Microsoft.NET.Sdk**: [from 6.0.311-servicing.23172.25 to 6.0.311-servicing.23173.16][1] - **Microsoft.NET.Test.Sdk**: [from 17.2.0 to 17.2.1-release-20230323-13][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC15bb2db263&targetVersion=GC1d7a15ab5d&_a=files [2]: https://github.com/microsoft/vstest/compare/717d0cf949...0c34747ff6 [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 2 -- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index dbcee1eae54c..53f9a74fc8d2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,6 @@ - @@ -49,7 +48,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cd01f0073dc..a7625e8a9b86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 76f9cf41a0925eee8c85b78a0cb8aaaedab162cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 15bb2db263380e84bf4e69703b32edcc6331fc2c + 1d7a15ab5d9e76a668d41e69b183c3b905566f24 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 15bb2db263380e84bf4e69703b32edcc6331fc2c + 1d7a15ab5d9e76a668d41e69b183c3b905566f24 @@ -130,9 +130,9 @@ 702b8e77f5fbfe21e6743324c1750503e02f182d - + https://github.com/microsoft/vstest - 717d0cf94925e9cf67466dbee46c1019930eb212 + 0c34747ff62ec59acb1579dfea5377acaf54027d diff --git a/eng/Versions.props b/eng/Versions.props index 7e4d689b1287..4c66d13e6be2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.311-servicing.23172.25 - 6.0.311-servicing.23172.25 + 6.0.311-servicing.23173.16 + 6.0.311-servicing.23173.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0 + 17.2.1-release-20230323-13 From d2f1af24d5dbf1530e4d5aa7025266e70f066efb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 16:14:11 +0000 Subject: [PATCH 0923/1244] Merged PR 30225: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.9 (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**: 20230324.12 - **Date Produced**: March 24, 2023 8:43:54 PM UTC - **Commit**: 1aa97e5123b778879c2329bfd15bcbfa187da318 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.311-servicing.23173.16 to 6.0.311-servicing.23174.12][1] - **Microsoft.NET.Sdk**: [from 6.0.311-servicing.23173.16 to 6.0.311-servicing.23174.12][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.16 to 6.0.16][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.16 to 6.0.16][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.16 to 6.0.16][2] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1d7a15ab5d&targetVersion=GC1aa97e5123&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC567ff53ac7&targetVersion=GC1e620a42e7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 53f9a74fc8d2..4098d41cc39f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7625e8a9b86..fb4fbe85c2cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 8488fb31c8f0e9648730cf942a5ae868ddf975c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 76f9cf41a0925eee8c85b78a0cb8aaaedab162cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d7a15ab5d9e76a668d41e69b183c3b905566f24 + 1aa97e5123b778879c2329bfd15bcbfa187da318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d7a15ab5d9e76a668d41e69b183c3b905566f24 + 1aa97e5123b778879c2329bfd15bcbfa187da318 diff --git a/eng/Versions.props b/eng/Versions.props index 4c66d13e6be2..57fb53149144 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.311-servicing.23173.16 - 6.0.311-servicing.23173.16 + 6.0.311-servicing.23174.12 + 6.0.311-servicing.23174.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 + 6.0.16-servicing.23173.11 + 6.0.16-servicing.23173.11 6.0.16 6.0.16 6.0.16 From 50050b19ed5bf45225d668d4a07cca7c21d33ee9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 16:14:19 +0000 Subject: [PATCH 0924/1244] Merged PR 30227: [internal/release/6.0.4xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230324.13 - **Date Produced**: March 24, 2023 8:46:45 PM UTC - **Commit**: c2e11e37e99cdc36f17bee572c0b0e605dd60fff - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23173.4 to 6.0.408-servicing.23174.13][1] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23173.4 to 6.0.408-servicing.23174.13][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.16 to 6.0.16][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.16 to 6.0.16][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.16 to 6.0.16][2] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC42e2abaa41&targetVersion=GCc2e11e37e9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC567ff53ac7&targetVersion=GC1e620a42e7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index bea49ce3c45a..d48582a42582 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,13 +14,12 @@ - + - @@ -44,13 +43,12 @@ - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f16a5d165a9..9d2325c80795 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 8488fb31c8f0e9648730cf942a5ae868ddf975c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8af471086762e04add1ecf2991da0bd0200268be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 42e2abaa4121743673f8695c74aa69d681e8f4af + c2e11e37e99cdc36f17bee572c0b0e605dd60fff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 42e2abaa4121743673f8695c74aa69d681e8f4af + c2e11e37e99cdc36f17bee572c0b0e605dd60fff diff --git a/eng/Versions.props b/eng/Versions.props index ac761201a52f..e91e0a4f8f68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.408-servicing.23173.4 - 6.0.408-servicing.23173.4 + 6.0.408-servicing.23174.13 + 6.0.408-servicing.23174.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 + 6.0.16-servicing.23173.11 + 6.0.16-servicing.23173.11 6.0.16 6.0.16 6.0.16 From 06fdcb17cf8251e8824bda41d1afd159e0bc431b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 19:20:35 +0000 Subject: [PATCH 0925/1244] Merged PR 30244: [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.AspNetCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.311 to 6.0.311 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.311-servicing.23171.10 to 6.0.311-servicing.23174.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.311 to 6.0.311 (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**: 20230325.2 - **Date Produced**: March 25, 2023 4:40:55 PM UTC - **Commit**: 502b4c216dd56bb1ebb5c93e8e356fde7f826de0 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.311-servicing.23174.12 to 6.0.311-servicing.23175.2][1] - **Microsoft.NET.Sdk**: [from 6.0.311-servicing.23174.12 to 6.0.311-servicing.23175.2][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.16 to 6.0.16][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2] - **dotnet-dev-certs**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2] - **dotnet-user-secrets**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.311 to 6.0.311][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.311-servicing.23171.10 to 6.0.311-servicing.23174.6][3] - **M... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4098d41cc39f..2c39ca7b08c2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -40,12 +40,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb4fbe85c2cf..dba43af5ea35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 76f9cf41a0925eee8c85b78a0cb8aaaedab162cf + 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 76f9cf41a0925eee8c85b78a0cb8aaaedab162cf + 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 76f9cf41a0925eee8c85b78a0cb8aaaedab162cf + 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aa97e5123b778879c2329bfd15bcbfa187da318 + 502b4c216dd56bb1ebb5c93e8e356fde7f826de0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aa97e5123b778879c2329bfd15bcbfa187da318 + 502b4c216dd56bb1ebb5c93e8e356fde7f826de0 diff --git a/eng/Versions.props b/eng/Versions.props index 57fb53149144..afc1ffcf208e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 + 6.0.16-servicing.23174.6 + 6.0.16-servicing.23174.6 + 6.0.16-servicing.23174.6 + 6.0.16-servicing.23174.6 0.2.0 - 6.0.311-servicing.23174.12 - 6.0.311-servicing.23174.12 + 6.0.311-servicing.23175.2 + 6.0.311-servicing.23175.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3d2f6cc5e6d748d4fca121c026fad8d422d22b2f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 19:20:40 +0000 Subject: [PATCH 0926/1244] Merged PR 30245: [internal/release/6.0.4xx] 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.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.408 to 6.0.408 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.408-rtm.23171.3 to 6.0.408-rtm.23174.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.408 to 6.0.408 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230325.3 - **Date Produced**: March 25, 2023 4:41:12 PM UTC - **Commit**: 19eb8146e388a98ba03c09e911baf54402d8d1e3 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23174.13 to 6.0.408-servicing.23175.3][1] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23174.13 to 6.0.408-servicing.23175.3][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.16 to 6.0.16][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2] - **dotnet-dev-certs**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2] - **dotnet-user-secrets**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.408 to 6.0.408][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.408-rtm.23171.3 to 6.0.408-rtm.23174.7][3] - **Microsoft.DotNet.Common.Pro... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index d48582a42582..105358b1627d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -40,13 +40,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d2325c80795..c188eebb1937 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8af471086762e04add1ecf2991da0bd0200268be + 1450763a83b184fa2fdd590d5774556b709bf4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8af471086762e04add1ecf2991da0bd0200268be + 1450763a83b184fa2fdd590d5774556b709bf4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8af471086762e04add1ecf2991da0bd0200268be + 1450763a83b184fa2fdd590d5774556b709bf4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2e11e37e99cdc36f17bee572c0b0e605dd60fff + 19eb8146e388a98ba03c09e911baf54402d8d1e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2e11e37e99cdc36f17bee572c0b0e605dd60fff + 19eb8146e388a98ba03c09e911baf54402d8d1e3 diff --git a/eng/Versions.props b/eng/Versions.props index e91e0a4f8f68..062ebcdd99ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 + 6.0.16-servicing.23174.6 + 6.0.16-servicing.23174.6 + 6.0.16-servicing.23174.6 + 6.0.16-servicing.23174.6 0.2.0 - 6.0.408-servicing.23174.13 - 6.0.408-servicing.23174.13 + 6.0.408-servicing.23175.3 + 6.0.408-servicing.23175.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3ee20c1bcfb024cfe2e7dbe6d871d751ef5cb5c7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 22:08:16 +0000 Subject: [PATCH 0927/1244] Merged PR 30255: [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.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.15-servicing.23171.6 to 6.0.15-servicing.23175.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23171.6 to 6.0.15-servicing.23175.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.16-servicing.23171.2 to 6.0.16-servicing.23174.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.16-servicing.23171.3 to 6.0.16-servicing.23175.3 (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**: 20230325.13 - **Date Produced**: March 25, 2023 8:18:02 PM UTC - **Commit**: fd8d37f14b77fa3df518fe4720191b218a68933d - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.311-servicing.23175.2 to 6.0.311-servicing.23175.13][1] - **Microsoft.NET.Sdk**: [from 6.0.311-servicing.23175.2 to 6.0.311-servicing.23175.13][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23171.6 to 6.0.15-servicing.23175.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.15-servicing.23171.6 to 6.0.15-servicing.23175.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.16-servicing.23171.2 to 6.0.16-servicing.23174.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.16-servicing.23171.3 to 6.0.16-servicing.23175.3][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC502b4c216d&targetVersion=GCfd8d37f14b&_a=files [2]: https://d... --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2c39ca7b08c2..59e3c6180b4e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,6 +20,7 @@ + @@ -48,6 +49,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dba43af5ea35..818b5c508434 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8488fb31c8f0e9648730cf942a5ae868ddf975c2 + 1b343fdc0950b4a59881538c9768e32b16a97ecf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8488fb31c8f0e9648730cf942a5ae868ddf975c2 + 1b343fdc0950b4a59881538c9768e32b16a97ecf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8488fb31c8f0e9648730cf942a5ae868ddf975c2 + 1b343fdc0950b4a59881538c9768e32b16a97ecf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8488fb31c8f0e9648730cf942a5ae868ddf975c2 + 1b343fdc0950b4a59881538c9768e32b16a97ecf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 502b4c216dd56bb1ebb5c93e8e356fde7f826de0 + fd8d37f14b77fa3df518fe4720191b218a68933d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 502b4c216dd56bb1ebb5c93e8e356fde7f826de0 + fd8d37f14b77fa3df518fe4720191b218a68933d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 02e4f4f5bc2d6027944d5144a3458bad23daa2ec + 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6021156ac38d10eee9ca9d17553366352d3e8408 + 8f6fa2d5a7ef6c9fdfe6452ce35ca4bd17cf3f55 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index afc1ffcf208e..284fae16a702 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.16-servicing.23171.2 + 6.0.16-servicing.23174.2 - 6.0.16-servicing.23171.3 + 6.0.16-servicing.23175.3 @@ -56,8 +56,8 @@ - 6.0.311-servicing.23175.2 - 6.0.311-servicing.23175.2 + 6.0.311-servicing.23175.13 + 6.0.311-servicing.23175.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.15-servicing.23171.6 - 6.0.15-servicing.23171.6 + 6.0.15-servicing.23175.3 + 6.0.15-servicing.23175.3 6.0.15 6.0.15 From bfd6ec740e905beb535ce88d63cc54568ae54c3c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 22:08:20 +0000 Subject: [PATCH 0928/1244] Merged PR 30254: [internal/release/6.0.4xx] 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.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.15-servicing.23171.6 to 6.0.15-servicing.23175.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23171.6 to 6.0.15-servicing.23175.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.16-servicing.23171.2 to 6.0.16-servicing.23174.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.16-servicing.23171.3 to 6.0.16-servicing.23175.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230325.11 - **Date Produced**: March 25, 2023 8:17:53 PM UTC - **Commit**: c5e53edfefe7a53aab594a3691bfa3ac0a107ada - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23175.3 to 6.0.408-servicing.23175.11][1] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23175.3 to 6.0.408-servicing.23175.11][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23171.6 to 6.0.15-servicing.23175.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.15-servicing.23171.6 to 6.0.15-servicing.23175.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.16-servicing.23171.2 to 6.0.16-servicing.23174.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.16-servicing.23171.3 to 6.0.16-servicing.23175.3][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC19eb8146e3&targetVersion=GCc5e53edfef&_a=files [2]: https://d... --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 105358b1627d..2050fdc983c5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,6 +20,7 @@ + @@ -49,6 +50,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c188eebb1937..7e1bdec8a983 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8488fb31c8f0e9648730cf942a5ae868ddf975c2 + 1b343fdc0950b4a59881538c9768e32b16a97ecf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8488fb31c8f0e9648730cf942a5ae868ddf975c2 + 1b343fdc0950b4a59881538c9768e32b16a97ecf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8488fb31c8f0e9648730cf942a5ae868ddf975c2 + 1b343fdc0950b4a59881538c9768e32b16a97ecf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8488fb31c8f0e9648730cf942a5ae868ddf975c2 + 1b343fdc0950b4a59881538c9768e32b16a97ecf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1450763a83b184fa2fdd590d5774556b709bf4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19eb8146e388a98ba03c09e911baf54402d8d1e3 + c5e53edfefe7a53aab594a3691bfa3ac0a107ada - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19eb8146e388a98ba03c09e911baf54402d8d1e3 + c5e53edfefe7a53aab594a3691bfa3ac0a107ada - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 02e4f4f5bc2d6027944d5144a3458bad23daa2ec + 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6021156ac38d10eee9ca9d17553366352d3e8408 + 8f6fa2d5a7ef6c9fdfe6452ce35ca4bd17cf3f55 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 062ebcdd99ff..5f40fcf56a73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.16-servicing.23171.2 + 6.0.16-servicing.23174.2 - 6.0.16-servicing.23171.3 + 6.0.16-servicing.23175.3 @@ -56,8 +56,8 @@ - 6.0.408-servicing.23175.3 - 6.0.408-servicing.23175.3 + 6.0.408-servicing.23175.11 + 6.0.408-servicing.23175.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.15-servicing.23171.6 - 6.0.15-servicing.23171.6 + 6.0.15-servicing.23175.3 + 6.0.15-servicing.23175.3 6.0.15 6.0.15 From 0c3669d367ab1dc948988caebc0a2eb26fa18d59 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Mar 2023 22:59:30 +0000 Subject: [PATCH 0929/1244] Merged PR 30279: [internal/release/6.0.4xx] 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.15 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.15-servicing.23175.3 to 6.0.16-servicing.23177.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23175.3 to 6.0.16-servicing.23177.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.16 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230327.15 - **Date Produced**: March 27, 2023 10:27:33 PM UTC - **Commit**: 4478215a43d6cec39061c414d65d0a1dd78993f0 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23175.11 to 6.0.408-servicing.23177.15][1] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23175.11 to 6.0.408-servicing.23177.15][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.15 to 6.0.16][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23175.3 to 6.0.16-servicing.23177.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.15-servicing.23175.3 to 6.0.16-servicing.23177.4][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.16][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.16][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc5e53edfef&targetVersion=GC4478215a43&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC1b343fdc09&targetVersion=GCbde268e756&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2050fdc983c5..dee0d7d6fa30 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,8 @@ - + + @@ -50,7 +51,8 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e1bdec8a983..cbf0b4598edc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1b343fdc0950b4a59881538c9768e32b16a97ecf + bde268e756b9e5b8240cce27114a150e9f61967e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1b343fdc0950b4a59881538c9768e32b16a97ecf + bde268e756b9e5b8240cce27114a150e9f61967e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1b343fdc0950b4a59881538c9768e32b16a97ecf + bde268e756b9e5b8240cce27114a150e9f61967e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1b343fdc0950b4a59881538c9768e32b16a97ecf + bde268e756b9e5b8240cce27114a150e9f61967e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1450763a83b184fa2fdd590d5774556b709bf4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5e53edfefe7a53aab594a3691bfa3ac0a107ada + 4478215a43d6cec39061c414d65d0a1dd78993f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5e53edfefe7a53aab594a3691bfa3ac0a107ada + 4478215a43d6cec39061c414d65d0a1dd78993f0 diff --git a/eng/Versions.props b/eng/Versions.props index 5f40fcf56a73..ccb8e247918f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.408-servicing.23175.11 - 6.0.408-servicing.23175.11 + 6.0.408-servicing.23177.15 + 6.0.408-servicing.23177.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.15-servicing.23175.3 - 6.0.15-servicing.23175.3 - 6.0.15 - 6.0.15 + 6.0.16-servicing.23177.4 + 6.0.16-servicing.23177.4 + 6.0.16 + 6.0.16 From 91f8cfa061bdfc25276bffb28b72957a66547591 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 28 Mar 2023 00:02:28 +0000 Subject: [PATCH 0930/1244] Merged PR 30281: [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.15 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.15-servicing.23175.3 to 6.0.16-servicing.23177.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23175.3 to 6.0.16-servicing.23177.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.16 (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**: 20230327.16 - **Date Produced**: March 27, 2023 9:04:39 PM UTC - **Commit**: 66e869d7ab5ae253fa3a4e3bca9046c387ee12a9 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.311-servicing.23175.13 to 6.0.311-servicing.23177.16][1] - **Microsoft.NET.Sdk**: [from 6.0.311-servicing.23175.13 to 6.0.311-servicing.23177.16][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.15 to 6.0.16][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23175.3 to 6.0.16-servicing.23177.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.15-servicing.23175.3 to 6.0.16-servicing.23177.4][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.16][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.16][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCfd8d37f14b&targetVersion=GC66e869d7ab&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC1b343fdc09&targetVersion=GCbde268e756&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59e3c6180b4e..043f28d3ba1e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,8 @@ - + + @@ -49,7 +50,8 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 818b5c508434..1ba865110cf9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1b343fdc0950b4a59881538c9768e32b16a97ecf + bde268e756b9e5b8240cce27114a150e9f61967e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1b343fdc0950b4a59881538c9768e32b16a97ecf + bde268e756b9e5b8240cce27114a150e9f61967e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1b343fdc0950b4a59881538c9768e32b16a97ecf + bde268e756b9e5b8240cce27114a150e9f61967e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1b343fdc0950b4a59881538c9768e32b16a97ecf + bde268e756b9e5b8240cce27114a150e9f61967e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fd8d37f14b77fa3df518fe4720191b218a68933d + 66e869d7ab5ae253fa3a4e3bca9046c387ee12a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fd8d37f14b77fa3df518fe4720191b218a68933d + 66e869d7ab5ae253fa3a4e3bca9046c387ee12a9 diff --git a/eng/Versions.props b/eng/Versions.props index 284fae16a702..f2a974327593 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.311-servicing.23175.13 - 6.0.311-servicing.23175.13 + 6.0.311-servicing.23177.16 + 6.0.311-servicing.23177.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.15-servicing.23175.3 - 6.0.15-servicing.23175.3 - 6.0.15 - 6.0.15 + 6.0.16-servicing.23177.4 + 6.0.16-servicing.23177.4 + 6.0.16 + 6.0.16 From 5d063647673a47a6b218ddf2d743e3e3451cd438 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Apr 2023 10:33:37 -0700 Subject: [PATCH 0931/1244] Update branding to 6.0.312 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6e744e14776c..e3a93011bcc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 11 + 12 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 7d884aa771f89625f9191b28f482006c93c9cb0a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Apr 2023 10:33:43 -0700 Subject: [PATCH 0932/1244] Update branding to 6.0.409 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 568b45eda2ba..ee7f8503cc27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 08 + 09 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 5f54896027e69d550e1ad5e229f72257ffc9645d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 10:10:40 -0700 Subject: [PATCH 0933/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#16072) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index dee0d7d6fa30..bb95457fed64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -15,12 +14,18 @@ + + + + + + @@ -42,16 +47,21 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cbf0b4598edc..b43e4b46949d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e39ad4f17671..3cd2ea603e36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23167.1 + 6.0.0-beta.23211.7 diff --git a/global.json b/global.json index 5bd694fa0723..1f0711594557 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.115", + "dotnet": "6.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23167.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23211.7" } } From 3b57a2b9a489dfc145a2f3794e674019ebd601d7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 13 Apr 2023 17:16:34 +0000 Subject: [PATCH 0934/1244] Merged PR 30554: [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**: 20230411.7 - **Date Produced**: April 11, 2023 8:39:02 PM UTC - **Commit**: 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.23167.1 to 6.0.0-beta.23211.7][1] - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.23167.1 to 6.0.0-beta.23211.7][1] - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.23167.1 to 6.0.0-beta.23211.7][1] [1]: https://github.com/dotnet/arcade/compare/92c39a4f0b...7bca7a24df [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 6.0.116 [marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934) --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 043f28d3ba1e..f8fb2fb33e00 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -15,12 +14,18 @@ + + + + + + @@ -42,15 +47,20 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ba865110cf9..31fa15648531 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index a43d29388dd8..278fe85d5cfd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23167.1 + 6.0.0-beta.23211.7 diff --git a/global.json b/global.json index 5bd694fa0723..1f0711594557 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.115", + "dotnet": "6.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23167.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23211.7" } } From d03d699b09ae9cc51ec28277d85ab512e035d9ef Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 15 Apr 2023 20:17:53 +0000 Subject: [PATCH 0935/1244] Merged PR 30689: [internal/release/6.0.4xx] 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.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.16-servicing.23177.4 to 6.0.17-servicing.23213.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.16-servicing.23177.4 to 6.0.17-servicing.23213.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.408 to 6.0.409 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.408-rtm.23174.7 to 6.0.409-rtm.23213.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.408 to 6.0.409 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23213.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.... --- NuGet.config | 30 ++++-------- eng/Version.Details.xml | 102 ++++++++++++++++++++-------------------- eng/Versions.props | 46 +++++++++--------- 3 files changed, 84 insertions(+), 94 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb95457fed64..074ca0c703bd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,21 @@ + - - - + + - - - + - - - - + @@ -47,22 +42,17 @@ + - - - + + - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b43e4b46949d..1ecd1190b49f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1450763a83b184fa2fdd590d5774556b709bf4c1 + 1d32cba54f57b8436de0e670f9157857ea658381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1450763a83b184fa2fdd590d5774556b709bf4c1 + 1d32cba54f57b8436de0e670f9157857ea658381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1450763a83b184fa2fdd590d5774556b709bf4c1 + 1d32cba54f57b8436de0e670f9157857ea658381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4478215a43d6cec39061c414d65d0a1dd78993f0 + ad7fc2b8478c658ca841a7ea2671aafe11aeb797 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4478215a43d6cec39061c414d65d0a1dd78993f0 + ad7fc2b8478c658ca841a7ea2671aafe11aeb797 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d + 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8f6fa2d5a7ef6c9fdfe6452ce35ca4bd17cf3f55 + 0595f2eaaa1c0cdef5878f1989c6dc3c0110957b https://github.com/dotnet/fsharp @@ -130,9 +130,9 @@ 5d69143fbe992d8fa33d5b83d5fdd5f4ed7bb4fc - + https://github.com/microsoft/vstest - dd7c26bf1fa66d50a0f21999e24f7b7e4195ae05 + 6e76d580fcc69954441344175bd1b0ab2e432026 @@ -151,9 +151,9 @@ 561848881bab01749e6d8b03be2869a18ca944f7 - - https://github.com/nuget/nuget.client - a90539fd502f9425311b34451cdd2965516f5d26 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 5e444458a8c4a2dac9806fc1d387b7f157669540 diff --git a/eng/Versions.props b/eng/Versions.props index 8eab0dc133c9..783422594193 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.16-servicing.23174.2 + 6.0.17-servicing.23213.3 - 6.0.16-servicing.23175.3 + 6.0.17-servicing.23213.7 - 6.0.408 + 6.0.409 @@ -44,20 +44,20 @@ - 6.0.16 - 6.0.16 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 + 6.0.17 + 6.0.17 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 0.2.0 - 6.0.408-servicing.23177.15 - 6.0.408-servicing.23177.15 + 6.0.409-servicing.23215.3 + 6.0.409-servicing.23215.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.16-servicing.23173.11 - 6.0.16-servicing.23173.11 - 6.0.16 - 6.0.16 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23212.18 + 6.0.17-servicing.23212.18 + 6.0.17 + 6.0.17 + 6.0.17 + 6.0.17 2.1.0 - 6.0.16-servicing.23177.4 - 6.0.16-servicing.23177.4 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23213.12 + 6.0.17-servicing.23213.12 + 6.0.17 + 6.0.17 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.408 + 6.0.409 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.2 + 17.3.3-release-20230405-02 From f1a405947785344bd1f4078525a61a82463c0671 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 15 Apr 2023 20:18:11 +0000 Subject: [PATCH 0936/1244] Merged PR 30688: [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.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.16-servicing.23177.4 to 6.0.17-servicing.23213.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.16-servicing.23177.4 to 6.0.17-servicing.23213.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.311 to 6.0.312 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.311-servicing.23174.6 to 6.0.312-servicing.23213.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.311 to 6.0.312 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23213.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop... --- NuGet.config | 30 ++++-------- eng/Version.Details.xml | 104 ++++++++++++++++++++-------------------- eng/Versions.props | 46 +++++++++--------- 3 files changed, 85 insertions(+), 95 deletions(-) diff --git a/NuGet.config b/NuGet.config index f8fb2fb33e00..98ebbff1c1c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,21 @@ + - - - + + - - - + - - - - + @@ -47,21 +42,16 @@ + - - - + + - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31fa15648531..dc108d0d306a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + 110c63b62d458c319cdaacca2dfd64fe677a3d55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 + a4a285f074250f192ab49ecb4a80c9ce11adb7e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 + a4a285f074250f192ab49ecb4a80c9ce11adb7e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 + a4a285f074250f192ab49ecb4a80c9ce11adb7e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 66e869d7ab5ae253fa3a4e3bca9046c387ee12a9 + 93f3d085773bb5f0bac5a864c1e59c22625738ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 66e869d7ab5ae253fa3a4e3bca9046c387ee12a9 + 93f3d085773bb5f0bac5a864c1e59c22625738ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d + 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8f6fa2d5a7ef6c9fdfe6452ce35ca4bd17cf3f55 + 0595f2eaaa1c0cdef5878f1989c6dc3c0110957b https://github.com/dotnet/fsharp @@ -130,9 +130,9 @@ 702b8e77f5fbfe21e6743324c1750503e02f182d - + https://github.com/microsoft/vstest - 0c34747ff62ec59acb1579dfea5377acaf54027d + 5948b392c5d8c2580d08c9f6570409315243f86e @@ -151,9 +151,9 @@ 038f9bae9b34d1cca653360a46c5ce1eba4c2ac8 - - https://github.com/nuget/nuget.client - 51ca5ad938c742e6ff876ea1545b0712b130f9d1 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 diff --git a/eng/Versions.props b/eng/Versions.props index 278fe85d5cfd..3224186bc490 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.16-servicing.23174.2 + 6.0.17-servicing.23213.3 - 6.0.16-servicing.23175.3 + 6.0.17-servicing.23213.7 - 6.0.311 + 6.0.312 @@ -44,20 +44,20 @@ - 6.0.16 - 6.0.16 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 + 6.0.17 + 6.0.17 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 0.2.0 - 6.0.311-servicing.23177.16 - 6.0.311-servicing.23177.16 + 6.0.312-servicing.23215.2 + 6.0.312-servicing.23215.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.16-servicing.23173.11 - 6.0.16-servicing.23173.11 - 6.0.16 - 6.0.16 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23212.18 + 6.0.17-servicing.23212.18 + 6.0.17 + 6.0.17 + 6.0.17 + 6.0.17 2.1.0 - 6.0.16-servicing.23177.4 - 6.0.16-servicing.23177.4 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23213.12 + 6.0.17-servicing.23213.12 + 6.0.17 + 6.0.17 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.311 + 6.0.312 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.1-release-20230323-13 + 17.2.1-release-20230405-01 From 13565e2b982ef0e66e92b2337389f6b6eaebdee1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 16 Apr 2023 17:23:35 +0000 Subject: [PATCH 0937/1244] Merged PR 30719: [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.9 to 6.0.9 (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**: 20230416.3 - **Date Produced**: April 16, 2023 5:04:20 PM UTC - **Commit**: 1faeafd01ba2fc70cb9bd62a613e15925558882c - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.312-servicing.23215.2 to 6.0.312-servicing.23216.3][1] - **Microsoft.NET.Sdk**: [from 6.0.312-servicing.23215.2 to 6.0.312-servicing.23216.3][1] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC93f3d08577&targetVersion=GC1faeafd01b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC110c63b62d&targetVersion=GC1e620a42e7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 dc108d0d306a..553afd0ecdd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 110c63b62d458c319cdaacca2dfd64fe677a3d55 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a4a285f074250f192ab49ecb4a80c9ce11adb7e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93f3d085773bb5f0bac5a864c1e59c22625738ba + 1faeafd01ba2fc70cb9bd62a613e15925558882c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93f3d085773bb5f0bac5a864c1e59c22625738ba + 1faeafd01ba2fc70cb9bd62a613e15925558882c diff --git a/eng/Versions.props b/eng/Versions.props index 3224186bc490..038005d1814a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.312-servicing.23215.2 - 6.0.312-servicing.23215.2 + 6.0.312-servicing.23216.3 + 6.0.312-servicing.23216.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 934a4f73a91e9fcb85a65fe3888f26adfb1a33c9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Apr 2023 16:36:48 +0000 Subject: [PATCH 0938/1244] Merged PR 30758: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (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**: 20230418.6 - **Date Produced**: April 18, 2023 3:28:13 PM UTC - **Commit**: ae62f868ad40f9193a94695eaad6c5233190d110 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.312-servicing.23216.3 to 6.0.312-servicing.23218.6][1] - **Microsoft.NET.Sdk**: [from 6.0.312-servicing.23216.3 to 6.0.312-servicing.23218.6][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.17][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.17][2] - **Microsoft.NETCore.App.Host.win-x64*... --- NuGet.config | 14 +++++++------ eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 98ebbff1c1c4..cdb6685f94fb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,22 @@ - + - - + + + @@ -42,15 +43,16 @@ - + - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 553afd0ecdd2..74d6eb48f26e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a4a285f074250f192ab49ecb4a80c9ce11adb7e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1faeafd01ba2fc70cb9bd62a613e15925558882c + ae62f868ad40f9193a94695eaad6c5233190d110 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1faeafd01ba2fc70cb9bd62a613e15925558882c + ae62f868ad40f9193a94695eaad6c5233190d110 diff --git a/eng/Versions.props b/eng/Versions.props index 038005d1814a..fddcf42892c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.17 6.0.17 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 0.2.0 - 6.0.312-servicing.23216.3 - 6.0.312-servicing.23216.3 + 6.0.312-servicing.23218.6 + 6.0.312-servicing.23218.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.17-servicing.23212.18 - 6.0.17-servicing.23212.18 + 6.0.17-servicing.23217.9 + 6.0.17-servicing.23217.9 6.0.17 6.0.17 6.0.17 From 87380a18ebe0118506aba93c47d3f2313286c984 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Apr 2023 16:36:52 +0000 Subject: [PATCH 0939/1244] Merged PR 30759: [internal/release/6.0.4xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230418.5 - **Date Produced**: April 18, 2023 3:28:35 PM UTC - **Commit**: f5d9e9d2deefcd0c88f470d4271246df2bf5add6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.409-servicing.23215.3 to 6.0.409-servicing.23218.5][1] - **Microsoft.NET.Sdk**: [from 6.0.409-servicing.23215.3 to 6.0.409-servicing.23218.5][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.17][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.17][2] - **Microsoft.NETCore.App.Host.win-x64*... --- NuGet.config | 14 +++++++------ eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 074ca0c703bd..a0c2db74ee75 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,22 @@ - + - - + + + @@ -42,16 +43,17 @@ - + - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ecd1190b49f..cb93eb12a5f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1d32cba54f57b8436de0e670f9157857ea658381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad7fc2b8478c658ca841a7ea2671aafe11aeb797 + f5d9e9d2deefcd0c88f470d4271246df2bf5add6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad7fc2b8478c658ca841a7ea2671aafe11aeb797 + f5d9e9d2deefcd0c88f470d4271246df2bf5add6 diff --git a/eng/Versions.props b/eng/Versions.props index 783422594193..398ff8575ec3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.17 6.0.17 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 0.2.0 - 6.0.409-servicing.23215.3 - 6.0.409-servicing.23215.3 + 6.0.409-servicing.23218.5 + 6.0.409-servicing.23218.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.17-servicing.23212.18 - 6.0.17-servicing.23212.18 + 6.0.17-servicing.23217.9 + 6.0.17-servicing.23217.9 6.0.17 6.0.17 6.0.17 From ab49d953c3a96b1019fbdc1d4b992820ebc5d3fe Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 May 2023 10:59:52 -0700 Subject: [PATCH 0940/1244] Update branding to 6.0.313 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a43d29388dd8..833dd4f4623c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 12 + 13 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 01c1454fb13059ffee1edf4d6a0bdef83424a7d3 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 May 2023 10:59:56 -0700 Subject: [PATCH 0941/1244] Update branding to 6.0.410 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8eab0dc133c9..1fe96be53875 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 09 + 10 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From aa85b410d28b2f86d0d69f1ea3d6bbd6b4f16ba0 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 8 May 2023 05:48:25 -0700 Subject: [PATCH 0942/1244] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16330) Co-authored-by: Matt Thalman Co-authored-by: Jason Zhai --- .../eng/common/templates/job/source-build-build-tarball.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 488425c7984f..9ae170d1c95c 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -85,7 +85,7 @@ jobs: - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - download: ${{ parameters.installerBuildResourceId }} artifact: BlobArtifacts - patterns: '**/dotnet-sdk-!(*-*)-linux-${{ parameters.architecture }}.tar.gz' + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' displayName: Download MSFT sdk Tarball - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: From 0214289b98afab8120648ec34202cd9c6037965b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 May 2023 20:56:05 +0000 Subject: [PATCH 0943/1244] Merged PR 31218: [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.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.17-servicing.23213.12 to 6.0.18-servicing.23252.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.17-servicing.23213.12 to 6.0.18-servicing.23252.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23253.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23253.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23261.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23261.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23261.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23261.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.312 to 6.0.312 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.312-servicing.23213.13 to 6.0.312-servicing.23218.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.312 to 6.0.312 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_g... --- NuGet.config | 20 +++++------ eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 3 files changed, 66 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index cdb6685f94fb..d10a82c284ea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,20 @@ - + - + - - + - - + @@ -43,17 +41,15 @@ - + - + - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74d6eb48f26e..b806bf3d8206 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 0642fba66a9347d8b2550181eb17cf4f24fad77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 0642fba66a9347d8b2550181eb17cf4f24fad77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 0642fba66a9347d8b2550181eb17cf4f24fad77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 0642fba66a9347d8b2550181eb17cf4f24fad77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + bacc9fceb336ee1b1f9acae25caabae88b43cc14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + bacc9fceb336ee1b1f9acae25caabae88b43cc14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + bacc9fceb336ee1b1f9acae25caabae88b43cc14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + bacc9fceb336ee1b1f9acae25caabae88b43cc14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + bacc9fceb336ee1b1f9acae25caabae88b43cc14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + bacc9fceb336ee1b1f9acae25caabae88b43cc14 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a4a285f074250f192ab49ecb4a80c9ce11adb7e3 + 7cb3955a498e7c378c075b50f69b72ef12cca9f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a4a285f074250f192ab49ecb4a80c9ce11adb7e3 + 7cb3955a498e7c378c075b50f69b72ef12cca9f5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a4a285f074250f192ab49ecb4a80c9ce11adb7e3 + 7cb3955a498e7c378c075b50f69b72ef12cca9f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae62f868ad40f9193a94695eaad6c5233190d110 + ac7e7ee45a3e2a6353031d7df4bbabf88ae0669d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae62f868ad40f9193a94695eaad6c5233190d110 + ac7e7ee45a3e2a6353031d7df4bbabf88ae0669d diff --git a/eng/Versions.props b/eng/Versions.props index 997f2d0fdfb1..4c2802234437 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.17 - 6.0.17 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 + 6.0.18 + 6.0.18 + 6.0.18-servicing.23261.2 + 6.0.18-servicing.23261.2 + 6.0.18-servicing.23261.2 + 6.0.18-servicing.23261.2 0.2.0 - 6.0.312-servicing.23218.6 - 6.0.312-servicing.23218.6 + 6.0.313-servicing.23261.9 + 6.0.313-servicing.23261.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.17-servicing.23217.9 - 6.0.17-servicing.23217.9 - 6.0.17 - 6.0.17 - 6.0.17 - 6.0.17 + 6.0.18-servicing.23253.8 + 6.0.18-servicing.23253.8 + 6.0.18 + 6.0.18 + 6.0.18 + 6.0.18 2.1.0 - 6.0.17-servicing.23213.12 - 6.0.17-servicing.23213.12 - 6.0.17 - 6.0.17 + 6.0.18-servicing.23252.3 + 6.0.18-servicing.23252.3 + 6.0.18 + 6.0.18 From 1d5188379db294dec0753666898e1fec0ea8fa16 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 May 2023 23:56:26 +0000 Subject: [PATCH 0944/1244] Merged PR 31287: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230517.19 - **Date Produced**: May 17, 2023 9:23:43 PM UTC - **Commit**: 326ba9e30e560c6d20c18f60394d1af5523b5a01 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.409-servicing.23218.5 to 6.0.410-servicing.23267.19][2] - **Microsoft.NET.Sdk**: [from 6.0.409-servicing.23218.5 to 6.0.410-servicing.23267.19][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.17 to 6.0.18][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23213.12 to 6.0.18-servicing.23261.3][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.17-servicing.23213.12 to 6.0.18-servicing.23261.3][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.5][4] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.18][4] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.5][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][4] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.17 to 6.0.18][4] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.17 to 6.0.18][4] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.17 to 6.0.18][5] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23266.7][5] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][5] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23266.7][5] - **dotnet-dev-certs**: [from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23266.7][5] - **dotnet-user-secrets**: [from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23266.7][5] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.409 to 6.0.410][6] - **Microsoft.TemplateEngine.Cli**: [from 6.0.409-rtm.23213.14 to 6.0.410-rtm.23261.12][6] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.409 to 6.0.410][6] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][7] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.17-servicing.23213.7 to 6.0.18-servicing.23258.5][8] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf5d9e9d2de&targetVersion=GC326ba9e30e&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCcf2cbab34d&targetVersion=GC7882... --- NuGet.config | 20 ++++----- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index a0c2db74ee75..5addf7d71f67 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,20 @@ - + - + - - + - - + @@ -43,18 +41,16 @@ - + - + - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb93eb12a5f9..25aeedd4e1c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + 9fa9da7badeacc7c8e89547a466b92232ae127bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + 9fa9da7badeacc7c8e89547a466b92232ae127bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + 9fa9da7badeacc7c8e89547a466b92232ae127bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + 9fa9da7badeacc7c8e89547a466b92232ae127bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + 9fa9da7badeacc7c8e89547a466b92232ae127bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + 9fa9da7badeacc7c8e89547a466b92232ae127bf @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1d32cba54f57b8436de0e670f9157857ea658381 + 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1d32cba54f57b8436de0e670f9157857ea658381 + 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1d32cba54f57b8436de0e670f9157857ea658381 + 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5d9e9d2deefcd0c88f470d4271246df2bf5add6 + 326ba9e30e560c6d20c18f60394d1af5523b5a01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5d9e9d2deefcd0c88f470d4271246df2bf5add6 + 326ba9e30e560c6d20c18f60394d1af5523b5a01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 + 455077d161050f52799300d335ac47d53b6cfedb - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0595f2eaaa1c0cdef5878f1989c6dc3c0110957b + bd8f52b18e0976ce565161b6603b7ffc8f0b5153 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 49ec290552c6..ed23edb1a428 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.17-servicing.23213.3 + 6.0.17-servicing.23218.1 - 6.0.17-servicing.23213.7 + 6.0.18-servicing.23258.5 - 6.0.409 + 6.0.410 @@ -44,20 +44,20 @@ - 6.0.17 - 6.0.17 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 + 6.0.18 + 6.0.18 + 6.0.18-servicing.23266.7 + 6.0.18-servicing.23266.7 + 6.0.18-servicing.23266.7 + 6.0.18-servicing.23266.7 0.2.0 - 6.0.409-servicing.23218.5 - 6.0.409-servicing.23218.5 + 6.0.410-servicing.23267.19 + 6.0.410-servicing.23267.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.17-servicing.23217.9 - 6.0.17-servicing.23217.9 - 6.0.17 - 6.0.17 - 6.0.17 - 6.0.17 + 6.0.18-servicing.23266.5 + 6.0.18-servicing.23266.5 + 6.0.18 + 6.0.18 + 6.0.18 + 6.0.18 2.1.0 - 6.0.17-servicing.23213.12 - 6.0.17-servicing.23213.12 - 6.0.17 - 6.0.17 + 6.0.18-servicing.23261.3 + 6.0.18-servicing.23261.3 + 6.0.18 + 6.0.18 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.409 + 6.0.410 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 0c3baf4363ffa2d0ce630addfadbe1d6394f86e8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 May 2023 16:45:43 +0000 Subject: [PATCH 0945/1244] Merged PR 31306: [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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23252.3 to 6.0.18-servicing.23261.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23252.3 to 6.0.18-servicing.23261.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23253.8 to 6.0.18-servicing.23266.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23253.8 to 6.0.18-servicing.23266.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23261.2 to 6.0.18-servicing.23266.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23261.2 to 6.0.18-servicing.23266.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23261.2 to 6.0.18-servicing.23266.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23261.2 to 6.0.18-servicing.23266.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.312 to 6.0.313 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.312-servicing.23218.4 to 6.0.313-servicing.23261.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.312 to 6.0.313 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNe... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++-------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/NuGet.config b/NuGet.config index d10a82c284ea..e10b02079ede 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b806bf3d8206..c5847440b973 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0642fba66a9347d8b2550181eb17cf4f24fad77f + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0642fba66a9347d8b2550181eb17cf4f24fad77f + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0642fba66a9347d8b2550181eb17cf4f24fad77f + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0642fba66a9347d8b2550181eb17cf4f24fad77f + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bacc9fceb336ee1b1f9acae25caabae88b43cc14 + 9fa9da7badeacc7c8e89547a466b92232ae127bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bacc9fceb336ee1b1f9acae25caabae88b43cc14 + 9fa9da7badeacc7c8e89547a466b92232ae127bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bacc9fceb336ee1b1f9acae25caabae88b43cc14 + 9fa9da7badeacc7c8e89547a466b92232ae127bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bacc9fceb336ee1b1f9acae25caabae88b43cc14 + 9fa9da7badeacc7c8e89547a466b92232ae127bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bacc9fceb336ee1b1f9acae25caabae88b43cc14 + 9fa9da7badeacc7c8e89547a466b92232ae127bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bacc9fceb336ee1b1f9acae25caabae88b43cc14 + 9fa9da7badeacc7c8e89547a466b92232ae127bf @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7cb3955a498e7c378c075b50f69b72ef12cca9f5 + 109b3f1b3ec1cded20fbfd552a732a2849271e8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7cb3955a498e7c378c075b50f69b72ef12cca9f5 + 109b3f1b3ec1cded20fbfd552a732a2849271e8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7cb3955a498e7c378c075b50f69b72ef12cca9f5 + 109b3f1b3ec1cded20fbfd552a732a2849271e8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac7e7ee45a3e2a6353031d7df4bbabf88ae0669d + 30032717b19a14558f5392495e0ad002864023ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac7e7ee45a3e2a6353031d7df4bbabf88ae0669d + 30032717b19a14558f5392495e0ad002864023ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 + 455077d161050f52799300d335ac47d53b6cfedb - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0595f2eaaa1c0cdef5878f1989c6dc3c0110957b + bd8f52b18e0976ce565161b6603b7ffc8f0b5153 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4c2802234437..ab7bad292a02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.17-servicing.23213.3 + 6.0.17-servicing.23218.1 - 6.0.17-servicing.23213.7 + 6.0.18-servicing.23258.5 - 6.0.312 + 6.0.313 @@ -46,18 +46,18 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23261.2 - 6.0.18-servicing.23261.2 - 6.0.18-servicing.23261.2 - 6.0.18-servicing.23261.2 + 6.0.18-servicing.23266.7 + 6.0.18-servicing.23266.7 + 6.0.18-servicing.23266.7 + 6.0.18-servicing.23266.7 0.2.0 - 6.0.313-servicing.23261.9 - 6.0.313-servicing.23261.9 + 6.0.313-servicing.23267.17 + 6.0.313-servicing.23267.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.18-servicing.23253.8 - 6.0.18-servicing.23253.8 + 6.0.18-servicing.23266.5 + 6.0.18-servicing.23266.5 6.0.18 6.0.18 6.0.18 @@ -78,8 +78,8 @@ - 6.0.18-servicing.23252.3 - 6.0.18-servicing.23252.3 + 6.0.18-servicing.23261.3 + 6.0.18-servicing.23261.3 6.0.18 6.0.18 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.312 + 6.0.313 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 98c3e32451300747fb3d8c5d1407fdd80d0b2b92 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 May 2023 20:43:21 +0000 Subject: [PATCH 0946/1244] Merged PR 31327: [internal/release/6.0.4xx] 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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23261.3 to 6.0.18-servicing.23267.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23261.3 to 6.0.18-servicing.23267.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.5 to 6.0.18-servicing.23266.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23266.5 to 6.0.18-servicing.23266.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23252.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23258.5 to 6.0.18-servicing.23261.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2... --- NuGet.config | 12 ++++---- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5addf7d71f67..e6b836bc7d3b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + @@ -41,16 +41,16 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25aeedd4e1c4..6c605f6ced24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + 822d7be63c77a447a8c72234a478a7ddc2101217 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + 822d7be63c77a447a8c72234a478a7ddc2101217 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + 822d7be63c77a447a8c72234a478a7ddc2101217 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + 822d7be63c77a447a8c72234a478a7ddc2101217 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 326ba9e30e560c6d20c18f60394d1af5523b5a01 + beb9b36629d3628fa469e87853cc2a6cca880c53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 326ba9e30e560c6d20c18f60394d1af5523b5a01 + beb9b36629d3628fa469e87853cc2a6cca880c53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 455077d161050f52799300d335ac47d53b6cfedb + 24e38444348603b9b97149b5e3ffb73f7baddc85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bd8f52b18e0976ce565161b6603b7ffc8f0b5153 + 4bf4fd59d82399a8a5598c1f81c98c2abeaaf469 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ed23edb1a428..54ff10e4b07d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.17-servicing.23218.1 + 6.0.18-servicing.23252.5 - 6.0.18-servicing.23258.5 + 6.0.18-servicing.23261.2 @@ -46,30 +46,30 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 + 6.0.18-servicing.23267.15 + 6.0.18-servicing.23267.15 + 6.0.18-servicing.23267.15 + 6.0.18-servicing.23267.15 0.2.0 - 6.0.410-servicing.23267.19 - 6.0.410-servicing.23267.19 + 6.0.410-servicing.23268.2 + 6.0.410-servicing.23268.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.9 + 6.0.10 - 6.0.18-servicing.23266.5 - 6.0.18-servicing.23266.5 + 6.0.18-servicing.23266.17 + 6.0.18-servicing.23266.17 6.0.18 6.0.18 6.0.18 @@ -78,8 +78,8 @@ - 6.0.18-servicing.23261.3 - 6.0.18-servicing.23261.3 + 6.0.18-servicing.23267.2 + 6.0.18-servicing.23267.2 6.0.18 6.0.18 From f8ee70b62797d9e043883758741928dc2278e0a5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 18:36:12 +0000 Subject: [PATCH 0947/1244] Merged PR 31385: [internal/release/6.0.4xx] 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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23267.2 to 6.0.18-servicing.23268.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23267.2 to 6.0.18-servicing.23268.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23267.15 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23267.15 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23267.15 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23267.15 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23261.2 to 6.0.18-servicing.23268.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a... --- NuGet.config | 12 ++++---- eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index e6b836bc7d3b..6cf1e814dfbb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + @@ -41,16 +41,16 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c605f6ced24..955547a0e83d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 822d7be63c77a447a8c72234a478a7ddc2101217 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 822d7be63c77a447a8c72234a478a7ddc2101217 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 822d7be63c77a447a8c72234a478a7ddc2101217 + e79c355ec611c39c236842d55b62dfbfc1a228d5 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 822d7be63c77a447a8c72234a478a7ddc2101217 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - beb9b36629d3628fa469e87853cc2a6cca880c53 + c6d43dc3a4cb4821ad81b42d97df9e7df0f2bf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - beb9b36629d3628fa469e87853cc2a6cca880c53 + c6d43dc3a4cb4821ad81b42d97df9e7df0f2bf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24e38444348603b9b97149b5e3ffb73f7baddc85 + bac4e66c4abaf7e2a20990556b315f015cd518ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4bf4fd59d82399a8a5598c1f81c98c2abeaaf469 + f82a2b2d304233b5e27a18fbc2ff65ede97e37eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 54ff10e4b07d..12e8015b325c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.18-servicing.23252.5 + 6.0.18-servicing.23268.4 - 6.0.18-servicing.23261.2 + 6.0.18-servicing.23268.3 @@ -46,18 +46,18 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23267.15 - 6.0.18-servicing.23267.15 - 6.0.18-servicing.23267.15 - 6.0.18-servicing.23267.15 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 0.2.0 - 6.0.410-servicing.23268.2 - 6.0.410-servicing.23268.2 + 6.0.410-servicing.23269.5 + 6.0.410-servicing.23269.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.18-servicing.23266.17 - 6.0.18-servicing.23266.17 + 6.0.18-servicing.23268.10 + 6.0.18-servicing.23268.10 6.0.18 6.0.18 6.0.18 @@ -78,8 +78,8 @@ - 6.0.18-servicing.23267.2 - 6.0.18-servicing.23267.2 + 6.0.18-servicing.23268.4 + 6.0.18-servicing.23268.4 6.0.18 6.0.18 From 443a92855f1e57ad4f78365acf5c6bfe759113f8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 19:22:46 +0000 Subject: [PATCH 0948/1244] Merged PR 31395: [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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23261.3 to 6.0.18-servicing.23268.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23261.3 to 6.0.18-servicing.23268.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.5 to 6.0.18-servicing.23268.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23266.5 to 6.0.18-servicing.23268.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.313 to 6.0.313 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.313-servicing.23261.11 to 6.0.313-servicing.23268.21 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.313 to 6.0.313 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23268.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.A... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index e10b02079ede..23889d3cb5cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5847440b973..0fc1b8d3f395 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + e79c355ec611c39c236842d55b62dfbfc1a228d5 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + 320aeb73d891e262d000327191c61a0f74e2e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + 320aeb73d891e262d000327191c61a0f74e2e918 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 119232c91c39668e983be4558d944dc81115b434 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 119232c91c39668e983be4558d944dc81115b434 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 109b3f1b3ec1cded20fbfd552a732a2849271e8b + 5d160bc14947eb77de730179ef7bb3146a1d37e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 109b3f1b3ec1cded20fbfd552a732a2849271e8b + 5d160bc14947eb77de730179ef7bb3146a1d37e2 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 109b3f1b3ec1cded20fbfd552a732a2849271e8b + 5d160bc14947eb77de730179ef7bb3146a1d37e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 30032717b19a14558f5392495e0ad002864023ab + 43570358e714de8f182a5dd2cb69ca805d6581cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 30032717b19a14558f5392495e0ad002864023ab + 43570358e714de8f182a5dd2cb69ca805d6581cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 455077d161050f52799300d335ac47d53b6cfedb + bac4e66c4abaf7e2a20990556b315f015cd518ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bd8f52b18e0976ce565161b6603b7ffc8f0b5153 + f82a2b2d304233b5e27a18fbc2ff65ede97e37eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ab7bad292a02..667fb42930c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.17-servicing.23218.1 + 6.0.18-servicing.23268.4 - 6.0.18-servicing.23258.5 + 6.0.18-servicing.23268.3 @@ -46,30 +46,30 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 0.2.0 - 6.0.313-servicing.23267.17 - 6.0.313-servicing.23267.17 + 6.0.313-servicing.23269.9 + 6.0.313-servicing.23269.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.9 + 6.0.10 - 6.0.18-servicing.23266.5 - 6.0.18-servicing.23266.5 + 6.0.18-servicing.23268.10 + 6.0.18-servicing.23268.10 6.0.18 6.0.18 6.0.18 @@ -78,8 +78,8 @@ - 6.0.18-servicing.23261.3 - 6.0.18-servicing.23261.3 + 6.0.18-servicing.23268.4 + 6.0.18-servicing.23268.4 6.0.18 6.0.18 From b6b7bfa5e92ede21d0dace802d4ab508b32d2729 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 14:29:46 +0000 Subject: [PATCH 0949/1244] Merged PR 31408: [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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.6 (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**: 20230519.19 - **Date Produced**: May 19, 2023 8:41:21 PM UTC - **Commit**: 27e299c7e96eb96f798581d96cf0cf9d5917a340 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.313-servicing.23269.9 to 6.0.313-servicing.23269.19][1] - **Microsoft.NET.Sdk**: [from 6.0.313-servicing.23269.9 to 6.0.313-servicing.23269.19][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.6][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC43570358e7&targetVersion=GC27e299c7e9&_a=files [2]: https://dev... --- 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 23889d3cb5cd..68b334424f2a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fc1b8d3f395..d566c005807c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5d160bc14947eb77de730179ef7bb3146a1d37e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 43570358e714de8f182a5dd2cb69ca805d6581cc + 27e299c7e96eb96f798581d96cf0cf9d5917a340 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 43570358e714de8f182a5dd2cb69ca805d6581cc + 27e299c7e96eb96f798581d96cf0cf9d5917a340 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bac4e66c4abaf7e2a20990556b315f015cd518ca + 9e5f193ed61f002d5d870df9c8b0b5e880fa595c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f82a2b2d304233b5e27a18fbc2ff65ede97e37eb + 7cd35b1648ac297ea6404c1f7645aaae8a216938 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 667fb42930c2..e76aa84685c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.18-servicing.23268.4 + 6.0.18-servicing.23268.8 - 6.0.18-servicing.23268.3 + 6.0.18-servicing.23269.6 @@ -56,8 +56,8 @@ - 6.0.313-servicing.23269.9 - 6.0.313-servicing.23269.9 + 6.0.313-servicing.23269.19 + 6.0.313-servicing.23269.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.18-servicing.23268.4 - 6.0.18-servicing.23268.4 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 6.0.18 6.0.18 From e4bd2e65f0a29182f870652d97a91a410bff0e64 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 14:30:15 +0000 Subject: [PATCH 0950/1244] Merged PR 31407: [internal/release/6.0.4xx] 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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230519.20 - **Date Produced**: May 19, 2023 8:41:07 PM UTC - **Commit**: a61ce7bb43104606df14c04d902c2d243a3a50c3 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.410-servicing.23269.5 to 6.0.410-servicing.23269.20][1] - **Microsoft.NET.Sdk**: [from 6.0.410-servicing.23269.5 to 6.0.410-servicing.23269.20][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.6][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc6d43dc3a4&targetVersion=GCa61ce7bb43&_a=files [2]: https://dev... --- 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 6cf1e814dfbb..7d8b1d42f806 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 955547a0e83d..95a7cbfbda2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c6d43dc3a4cb4821ad81b42d97df9e7df0f2bf10 + a61ce7bb43104606df14c04d902c2d243a3a50c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c6d43dc3a4cb4821ad81b42d97df9e7df0f2bf10 + a61ce7bb43104606df14c04d902c2d243a3a50c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bac4e66c4abaf7e2a20990556b315f015cd518ca + 9e5f193ed61f002d5d870df9c8b0b5e880fa595c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f82a2b2d304233b5e27a18fbc2ff65ede97e37eb + 7cd35b1648ac297ea6404c1f7645aaae8a216938 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 12e8015b325c..be23a6ad24a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.18-servicing.23268.4 + 6.0.18-servicing.23268.8 - 6.0.18-servicing.23268.3 + 6.0.18-servicing.23269.6 @@ -56,8 +56,8 @@ - 6.0.410-servicing.23269.5 - 6.0.410-servicing.23269.5 + 6.0.410-servicing.23269.20 + 6.0.410-servicing.23269.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.18-servicing.23268.4 - 6.0.18-servicing.23268.4 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 6.0.18 6.0.18 From 6f2c3204ac12da6ecec49d2fdf532cf83acc5bcd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 15:28:14 +0000 Subject: [PATCH 0951/1244] Merged PR 31446: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (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**: 20230522.7 - **Date Produced**: May 22, 2023 2:54:27 PM UTC - **Commit**: fb967c6347d470d72897e1bd1e0fe1bc9d3e997a - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.313-servicing.23269.19 to 6.0.313-servicing.23272.7][1] - **Microsoft.NET.Sdk**: [from 6.0.313-servicing.23269.19 to 6.0.313-servicing.23272.7][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Runt... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 68b334424f2a..4ae07eb47d2d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,14 @@ - + - + @@ -41,10 +41,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d566c005807c..2a4767c38294 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5d160bc14947eb77de730179ef7bb3146a1d37e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27e299c7e96eb96f798581d96cf0cf9d5917a340 + fb967c6347d470d72897e1bd1e0fe1bc9d3e997a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27e299c7e96eb96f798581d96cf0cf9d5917a340 + fb967c6347d470d72897e1bd1e0fe1bc9d3e997a diff --git a/eng/Versions.props b/eng/Versions.props index e76aa84685c3..0d027ccd44b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 0.2.0 - 6.0.313-servicing.23269.19 - 6.0.313-servicing.23269.19 + 6.0.313-servicing.23272.7 + 6.0.313-servicing.23272.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.18-servicing.23268.10 - 6.0.18-servicing.23268.10 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 6.0.18 6.0.18 6.0.18 From b8721936343cc594471dc0d093dbd7d0277d883f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 15:28:27 +0000 Subject: [PATCH 0952/1244] Merged PR 31447: [internal/release/6.0.4xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230522.8 - **Date Produced**: May 22, 2023 2:57:08 PM UTC - **Commit**: 814ec5ad6d1ea981aac992273c1149d2969800ba - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.410-servicing.23269.20 to 6.0.410-servicing.23272.8][1] - **Microsoft.NET.Sdk**: [from 6.0.410-servicing.23269.20 to 6.0.410-servicing.23272.8][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Runt... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7d8b1d42f806..32e2719f03d6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,14 @@ - + - + @@ -41,10 +41,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95a7cbfbda2c..80692ddc3d30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a61ce7bb43104606df14c04d902c2d243a3a50c3 + 814ec5ad6d1ea981aac992273c1149d2969800ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a61ce7bb43104606df14c04d902c2d243a3a50c3 + 814ec5ad6d1ea981aac992273c1149d2969800ba diff --git a/eng/Versions.props b/eng/Versions.props index be23a6ad24a1..4c93d9cd3f46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 0.2.0 - 6.0.410-servicing.23269.20 - 6.0.410-servicing.23269.20 + 6.0.410-servicing.23272.8 + 6.0.410-servicing.23272.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.18-servicing.23268.10 - 6.0.18-servicing.23268.10 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 6.0.18 6.0.18 6.0.18 From 9fc16b3685bb747a9a7f784d4f58d3ade4b6e0b6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 21:28:02 +0000 Subject: [PATCH 0953/1244] Merged PR 31455: [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.DotNet.Common.ItemTemplates**: from 6.0.313 to 6.0.313 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.313-servicing.23268.21 to 6.0.313-servicing.23272.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.313 to 6.0.313 (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**: 20230522.16 - **Date Produced**: May 22, 2023 4:19:43 PM UTC - **Commit**: 2d505333fdcbcff7e5344aa046c39452643ecc09 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.313-servicing.23272.7 to 6.0.313-servicing.23272.16][1] - **Microsoft.NET.Sdk**: [from 6.0.313-servicing.23272.7 to 6.0.313-servicing.23272.16][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.313 to 6.0.313][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.313-servicing.23268.21 to 6.0.313-servicing.23272.6][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.313 to 6.0.313][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCfb967c6347&targetVersion=GC2d505333fd&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC5d160bc149&targetVersion=GC61b9e8db59&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 4ae07eb47d2d..a663dd3311e0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a4767c38294..8b50d592a57b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5d160bc14947eb77de730179ef7bb3146a1d37e2 + 61b9e8db59eccd3a3a20b247a54896dd977e134d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5d160bc14947eb77de730179ef7bb3146a1d37e2 + 61b9e8db59eccd3a3a20b247a54896dd977e134d https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5d160bc14947eb77de730179ef7bb3146a1d37e2 + 61b9e8db59eccd3a3a20b247a54896dd977e134d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb967c6347d470d72897e1bd1e0fe1bc9d3e997a + 2d505333fdcbcff7e5344aa046c39452643ecc09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb967c6347d470d72897e1bd1e0fe1bc9d3e997a + 2d505333fdcbcff7e5344aa046c39452643ecc09 diff --git a/eng/Versions.props b/eng/Versions.props index 0d027ccd44b4..56d20d0f02b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.313-servicing.23272.7 - 6.0.313-servicing.23272.7 + 6.0.313-servicing.23272.16 + 6.0.313-servicing.23272.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From af57c55c7f0cb20fbfa5c148cc91d13a6d3163ef Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 21:28:07 +0000 Subject: [PATCH 0954/1244] Merged PR 31463: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230522.27 - **Date Produced**: May 22, 2023 7:28:30 PM UTC - **Commit**: dfaebbad22b58193db81ac408655711a264f952b - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.410-servicing.23272.8 to 6.0.410-servicing.23272.27][1] - **Microsoft.NET.Sdk**: [from 6.0.410-servicing.23272.8 to 6.0.410-servicing.23272.27][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC814ec5ad6d&targetVersion=GCdfaebbad22&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 80692ddc3d30..9c82f3384006 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 814ec5ad6d1ea981aac992273c1149d2969800ba + dfaebbad22b58193db81ac408655711a264f952b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 814ec5ad6d1ea981aac992273c1149d2969800ba + dfaebbad22b58193db81ac408655711a264f952b diff --git a/eng/Versions.props b/eng/Versions.props index 4c93d9cd3f46..4b2f93c6efe3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.410-servicing.23272.8 - 6.0.410-servicing.23272.8 + 6.0.410-servicing.23272.27 + 6.0.410-servicing.23272.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4985279bcb64c58fee0be4c2bef6c0f02bb130aa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 22:23:11 +0000 Subject: [PATCH 0955/1244] Merged PR 31467: [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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2 (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**: 20230522.30 - **Date Produced**: May 22, 2023 9:52:42 PM UTC - **Commit**: 0916fe56744d1c533e4a15aaa7293e6fa7b92b99 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.313-servicing.23272.16 to 6.0.313-servicing.23272.30][1] - **Microsoft.NET.Sdk**: [from 6.0.313-servicing.23272.16 to 6.0.313-servicing.23272.30][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2d505333fd&targetVersion=GC0916fe5674&_a=files [2]: https://d... --- 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 a663dd3311e0..dfabbd633b0c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b50d592a57b..e812a01933b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 61b9e8db59eccd3a3a20b247a54896dd977e134d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d505333fdcbcff7e5344aa046c39452643ecc09 + 0916fe56744d1c533e4a15aaa7293e6fa7b92b99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d505333fdcbcff7e5344aa046c39452643ecc09 + 0916fe56744d1c533e4a15aaa7293e6fa7b92b99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9e5f193ed61f002d5d870df9c8b0b5e880fa595c + 865895cec5e8dc357b65c98a4a7af58643d10997 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7cd35b1648ac297ea6404c1f7645aaae8a216938 + a29a62bc7aa91d9e7509261a138af3c27c0506ea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 56d20d0f02b5..febf9abacf70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.18-servicing.23268.8 + 6.0.18-servicing.23272.1 - 6.0.18-servicing.23269.6 + 6.0.18-servicing.23272.2 @@ -56,8 +56,8 @@ - 6.0.313-servicing.23272.16 - 6.0.313-servicing.23272.16 + 6.0.313-servicing.23272.30 + 6.0.313-servicing.23272.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.18-servicing.23269.7 - 6.0.18-servicing.23269.7 + 6.0.18-servicing.23272.2 + 6.0.18-servicing.23272.2 6.0.18 6.0.18 From 02627d94e213afd3e8c9dc085dbf652399590f51 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 22:23:16 +0000 Subject: [PATCH 0956/1244] Merged PR 31468: [internal/release/6.0.4xx] 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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230522.31 - **Date Produced**: May 22, 2023 9:58:29 PM UTC - **Commit**: 9edbc4da0c5288d32b998064289b5c548e389253 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.410-servicing.23272.27 to 6.0.410-servicing.23272.31][1] - **Microsoft.NET.Sdk**: [from 6.0.410-servicing.23272.27 to 6.0.410-servicing.23272.31][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCdfaebbad22&targetVersion=GC9edbc4da0c&_a=files [2]: https://d... --- 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 32e2719f03d6..fb5f93c078f0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c82f3384006..28470fa9bb13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dfaebbad22b58193db81ac408655711a264f952b + 9edbc4da0c5288d32b998064289b5c548e389253 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dfaebbad22b58193db81ac408655711a264f952b + 9edbc4da0c5288d32b998064289b5c548e389253 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9e5f193ed61f002d5d870df9c8b0b5e880fa595c + 865895cec5e8dc357b65c98a4a7af58643d10997 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7cd35b1648ac297ea6404c1f7645aaae8a216938 + a29a62bc7aa91d9e7509261a138af3c27c0506ea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4b2f93c6efe3..437ca086fc05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.18-servicing.23268.8 + 6.0.18-servicing.23272.1 - 6.0.18-servicing.23269.6 + 6.0.18-servicing.23272.2 @@ -56,8 +56,8 @@ - 6.0.410-servicing.23272.27 - 6.0.410-servicing.23272.27 + 6.0.410-servicing.23272.31 + 6.0.410-servicing.23272.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.18-servicing.23269.7 - 6.0.18-servicing.23269.7 + 6.0.18-servicing.23272.2 + 6.0.18-servicing.23272.2 6.0.18 6.0.18 From 28c7c894a318575fbc2f290db2c5b0d95bf1fc60 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 23:53:24 +0000 Subject: [PATCH 0957/1244] Merged PR 31474: [internal/release/6.0.4xx] 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.410 to 6.0.410 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.410-rtm.23261.12 to 6.0.410-rtm.23272.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.410 to 6.0.410 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230522.38 - **Date Produced**: May 22, 2023 11:21:44 PM UTC - **Commit**: 3936afb953219ad1e565eca91e78f32e906d19f9 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.410-servicing.23272.31 to 6.0.410-servicing.23272.38][1] - **Microsoft.NET.Sdk**: [from 6.0.410-servicing.23272.31 to 6.0.410-servicing.23272.38][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.410 to 6.0.410][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.410-rtm.23261.12 to 6.0.410-rtm.23272.7][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.410 to 6.0.410][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9edbc4da0c&targetVersion=GC3936afb953&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC85e4c28245&targetVersion=GC9cd9762fb7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 fb5f93c078f0..8e5a345de522 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28470fa9bb13..d3289d5b477a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 85e4c2824577397d49037ae98fc601f4fd9e3ccb + 9cd9762fb7eee396cc62d03e16c78f3565c220a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 85e4c2824577397d49037ae98fc601f4fd9e3ccb + 9cd9762fb7eee396cc62d03e16c78f3565c220a1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 85e4c2824577397d49037ae98fc601f4fd9e3ccb + 9cd9762fb7eee396cc62d03e16c78f3565c220a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9edbc4da0c5288d32b998064289b5c548e389253 + 3936afb953219ad1e565eca91e78f32e906d19f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9edbc4da0c5288d32b998064289b5c548e389253 + 3936afb953219ad1e565eca91e78f32e906d19f9 diff --git a/eng/Versions.props b/eng/Versions.props index 437ca086fc05..14811a9e420e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.410-servicing.23272.31 - 6.0.410-servicing.23272.31 + 6.0.410-servicing.23272.38 + 6.0.410-servicing.23272.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c9406fa27b3adbf190ef396cfc4d73aa87b22ce4 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Jun 2023 13:10:49 -0700 Subject: [PATCH 0958/1244] Update branding to 6.0.314 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 833dd4f4623c..5e816e476cc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 13 + 14 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 35376d26f102a4446d5b1fae21ef37b1ba60161e Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Jun 2023 13:10:53 -0700 Subject: [PATCH 0959/1244] Update branding to 6.0.411 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1fe96be53875..84717c399f71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 10 + 11 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 806ef9c26b08aa3a0f7fc6206fc759de38203b17 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 13 Jun 2023 11:24:53 -0700 Subject: [PATCH 0960/1244] Update ManualVersions.props --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 2bf456f306d8..fb41f0badd6f 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.28 - 10.0.18362.28 - 10.0.19041.28 - 10.0.20348.28 - 10.0.22000.28 - 10.0.22621.28 + 10.0.17763.29 + 10.0.18362.29 + 10.0.19041.29 + 10.0.20348.29 + 10.0.22000.29 + 10.0.22621.29 From c9f58f8391c90df2c65d89d8b3383e1004c424d8 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 13 Jun 2023 11:26:29 -0700 Subject: [PATCH 0961/1244] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 2bf456f306d8..fb41f0badd6f 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.28 - 10.0.18362.28 - 10.0.19041.28 - 10.0.20348.28 - 10.0.22000.28 - 10.0.22621.28 + 10.0.17763.29 + 10.0.18362.29 + 10.0.19041.29 + 10.0.20348.29 + 10.0.22000.29 + 10.0.22621.29 From 5cae2790d7a6079830bf319ba1c6207483639729 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 14 Jun 2023 22:36:12 +0000 Subject: [PATCH 0962/1244] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 10 ++++------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index dfabbd633b0c..c68a71688a65 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,18 @@ + + - - - @@ -41,15 +40,14 @@ + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e812a01933b9..21a39af7eb2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 61b9e8db59eccd3a3a20b247a54896dd977e134d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0916fe56744d1c533e4a15aaa7293e6fa7b92b99 + 8cc6c4455b64f468949454aa00508a5ab6b0bb31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0916fe56744d1c533e4a15aaa7293e6fa7b92b99 + 8cc6c4455b64f468949454aa00508a5ab6b0bb31 diff --git a/eng/Versions.props b/eng/Versions.props index 8382e79c379a..4092c219db04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.313-servicing.23272.30 - 6.0.313-servicing.23272.30 + 6.0.314-servicing.23314.11 + 6.0.314-servicing.23314.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 298f1196d19c18952566381428b06260fb4b1d1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 20:46:29 +0000 Subject: [PATCH 0963/1244] Update dependencies from https://github.com/dotnet/arcade build 20230613.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.23211.7 -> To Version 6.0.0-beta.23313.5 --- NuGet.config | 10 +++---- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 26 +++++++++++++------ .../templates/steps/component-governance.yml | 10 +++++++ global.json | 6 ++--- 6 files changed, 42 insertions(+), 24 deletions(-) create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/NuGet.config b/NuGet.config index 8e5a345de522..7dd0c5e034b9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,18 @@ + + - - - @@ -41,16 +40,15 @@ + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3289d5b477a..e3a560abf704 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c9da3f850f08..3fbf82613cf5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23211.7 + 6.0.0-beta.23313.5 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 547d878da073..0e10e7db69c7 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,7 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false - disableComponentGovernance: false + disableComponentGovernance: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -73,6 +73,10 @@ jobs: - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - name: EnableRichCodeNavigation value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -81,7 +85,7 @@ jobs: - ${{ if ne(variable.name, '') }}: - name: ${{ variable.name }} value: ${{ variable.value }} - + # handle variable groups - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} @@ -141,14 +145,20 @@ 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 + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks + displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} env: @@ -216,7 +226,7 @@ jobs: displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' + testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} @@ -227,7 +237,7 @@ jobs: displayName: Publish TRX Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' + testResultsFiles: '*.trx' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml new file mode 100644 index 000000000000..babc2757d8d1 --- /dev/null +++ b/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/global.json b/global.json index 1f0711594557..b358f87d3bc3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.116", + "dotnet": "6.0.118", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23211.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23313.5" } } From 717240d06509b180f3cafb7a29b67688de067fc7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 15 Jun 2023 22:02:18 +0000 Subject: [PATCH 0964/1244] [internal/release/6.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 26 +++++++++++++------ .../templates/steps/component-governance.yml | 10 +++++++ global.json | 6 ++--- 5 files changed, 38 insertions(+), 18 deletions(-) create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21a39af7eb2f..26b3bfde8ce1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 4092c219db04..5cb7f0b36b38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23211.7 + 6.0.0-beta.23313.5 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 547d878da073..0e10e7db69c7 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,7 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false - disableComponentGovernance: false + disableComponentGovernance: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -73,6 +73,10 @@ jobs: - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - name: EnableRichCodeNavigation value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -81,7 +85,7 @@ jobs: - ${{ if ne(variable.name, '') }}: - name: ${{ variable.name }} value: ${{ variable.value }} - + # handle variable groups - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} @@ -141,14 +145,20 @@ 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 + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks + displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} env: @@ -216,7 +226,7 @@ jobs: displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' + testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} @@ -227,7 +237,7 @@ jobs: displayName: Publish TRX Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' + testResultsFiles: '*.trx' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml new file mode 100644 index 000000000000..babc2757d8d1 --- /dev/null +++ b/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/global.json b/global.json index 1f0711594557..b358f87d3bc3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.116", + "dotnet": "6.0.118", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23211.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23313.5" } } From 078d557112cc8744f218b5b33d521138fd60491d Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 15 Jun 2023 22:31:35 -0700 Subject: [PATCH 0965/1244] Fix the build errors --- NuGet.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1d5f2aadb3c5..c9c491deec7a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,8 +8,6 @@ - - From da2f85050991e590452392a0c97ecc37c8da45ef Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Jun 2023 19:25:45 +0000 Subject: [PATCH 0966/1244] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23315.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23315.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23313.28 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23313.28 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23313.28 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23313.28 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.313 to 6.0.314 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.313-servicing.23272.6 to 6.0.314-servicing.23314.10 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.313 to 6.0.314 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.18-servicing.23272.1 to 6.0.19-servicing.23314.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23314.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 14 +++--- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 79 insertions(+), 77 deletions(-) diff --git a/NuGet.config b/NuGet.config index c68a71688a65..730cfe99d826 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,20 @@ - - - + + + + @@ -40,14 +41,15 @@ - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26b3bfde8ce1..5fc2cc077d63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 61b9e8db59eccd3a3a20b247a54896dd977e134d + 51a3e30097b11df176bb610b54f099cd75afda69 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 61b9e8db59eccd3a3a20b247a54896dd977e134d + 51a3e30097b11df176bb610b54f099cd75afda69 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 61b9e8db59eccd3a3a20b247a54896dd977e134d + 51a3e30097b11df176bb610b54f099cd75afda69 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8cc6c4455b64f468949454aa00508a5ab6b0bb31 + 33f94c3e68d8ffaf2ce97293d47c33d73031e630 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8cc6c4455b64f468949454aa00508a5ab6b0bb31 + 33f94c3e68d8ffaf2ce97293d47c33d73031e630 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 865895cec5e8dc357b65c98a4a7af58643d10997 + b1b9ae8774dbff146d4a0149a85229360e1d5dfd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a29a62bc7aa91d9e7509261a138af3c27c0506ea + 80d0a961366ba61097c1e1b51ad47466984d734e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5cb7f0b36b38..dae35afdf234 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.18-servicing.23272.1 + 6.0.19-servicing.23314.6 - 6.0.18-servicing.23272.2 + 6.0.19-servicing.23314.6 - 6.0.313 + 6.0.314 @@ -44,44 +44,44 @@ - 6.0.18 - 6.0.18 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 + 6.0.19 + 6.0.19 + 6.0.19-servicing.23313.28 + 6.0.19-servicing.23313.28 + 6.0.19-servicing.23313.28 + 6.0.19-servicing.23313.28 0.2.0 - 6.0.314-servicing.23314.11 - 6.0.314-servicing.23314.11 + 6.0.314-servicing.23315.34 + 6.0.314-servicing.23315.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.10 + 6.0.11 - 6.0.18-servicing.23269.7 - 6.0.18-servicing.23269.7 - 6.0.18 - 6.0.18 - 6.0.18 - 6.0.18 + 6.0.19-servicing.23313.25 + 6.0.19-servicing.23313.25 + 6.0.19 + 6.0.19 + 6.0.19 + 6.0.19 2.1.0 - 6.0.18-servicing.23272.2 - 6.0.18-servicing.23272.2 - 6.0.18 - 6.0.18 + 6.0.19-servicing.23315.1 + 6.0.19-servicing.23315.1 + 6.0.19 + 6.0.19 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.313 + 6.0.314 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 1f8fa50d1b30daf201abff07135d2626fb209ec7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Jun 2023 22:32:11 +0000 Subject: [PATCH 0967/1244] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 12 +++++------ eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 730cfe99d826..c8000546db2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,10 +17,10 @@ - + - + @@ -41,15 +41,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fc2cc077d63..45500982b54f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 + 23b442c3594414a52a901c710902639653c94b8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 + 23b442c3594414a52a901c710902639653c94b8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 + 23b442c3594414a52a901c710902639653c94b8d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 + 23b442c3594414a52a901c710902639653c94b8d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 51a3e30097b11df176bb610b54f099cd75afda69 + 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 51a3e30097b11df176bb610b54f099cd75afda69 + 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 51a3e30097b11df176bb610b54f099cd75afda69 + 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 33f94c3e68d8ffaf2ce97293d47c33d73031e630 + d410e6f94041b08f891a838cb3867b924b57089f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 33f94c3e68d8ffaf2ce97293d47c33d73031e630 + d410e6f94041b08f891a838cb3867b924b57089f diff --git a/eng/Versions.props b/eng/Versions.props index dae35afdf234..830cd0a00e40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.19 6.0.19 - 6.0.19-servicing.23313.28 - 6.0.19-servicing.23313.28 - 6.0.19-servicing.23313.28 - 6.0.19-servicing.23313.28 + 6.0.19-servicing.23315.15 + 6.0.19-servicing.23315.15 + 6.0.19-servicing.23315.15 + 6.0.19-servicing.23315.15 0.2.0 - 6.0.314-servicing.23315.34 - 6.0.314-servicing.23315.34 + 6.0.314-servicing.23316.42 + 6.0.314-servicing.23316.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.19-servicing.23315.1 - 6.0.19-servicing.23315.1 + 6.0.19-servicing.23316.3 + 6.0.19-servicing.23316.3 6.0.19 6.0.19 From f2c3021a191dd372625cd073d9630252ec1c26ed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Jun 2023 22:40:28 +0000 Subject: [PATCH 0968/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230616.46 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.410-servicing.23272.38 -> To Version 6.0.411-servicing.23316.46 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.18 -> To Version 6.0.19 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 +++--- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 79 insertions(+), 77 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7dd0c5e034b9..85cbee834d3c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,20 @@ - - - + + + + @@ -40,15 +41,16 @@ - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3a560abf704..ad7b66fe297a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 23b442c3594414a52a901c710902639653c94b8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 23b442c3594414a52a901c710902639653c94b8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 23b442c3594414a52a901c710902639653c94b8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 23b442c3594414a52a901c710902639653c94b8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9cd9762fb7eee396cc62d03e16c78f3565c220a1 + da62ce98a3ee40bd5a5f68e089a7d7fe11c8ba51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9cd9762fb7eee396cc62d03e16c78f3565c220a1 + da62ce98a3ee40bd5a5f68e089a7d7fe11c8ba51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9cd9762fb7eee396cc62d03e16c78f3565c220a1 + da62ce98a3ee40bd5a5f68e089a7d7fe11c8ba51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3936afb953219ad1e565eca91e78f32e906d19f9 + 256cc027914283de5cb622ce409326aa0aa2e4ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3936afb953219ad1e565eca91e78f32e906d19f9 + 256cc027914283de5cb622ce409326aa0aa2e4ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 865895cec5e8dc357b65c98a4a7af58643d10997 + b1b9ae8774dbff146d4a0149a85229360e1d5dfd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a29a62bc7aa91d9e7509261a138af3c27c0506ea + 80d0a961366ba61097c1e1b51ad47466984d734e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3fbf82613cf5..10532ddac287 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.18-servicing.23272.1 + 6.0.19-servicing.23314.6 - 6.0.18-servicing.23272.2 + 6.0.19-servicing.23314.6 - 6.0.410 + 6.0.411 @@ -44,44 +44,44 @@ - 6.0.18 - 6.0.18 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 + 6.0.19 + 6.0.19 + 6.0.19-servicing.23315.15 + 6.0.19-servicing.23315.15 + 6.0.19-servicing.23315.15 + 6.0.19-servicing.23315.15 0.2.0 - 6.0.410-servicing.23272.38 - 6.0.410-servicing.23272.38 + 6.0.411-servicing.23316.46 + 6.0.411-servicing.23316.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.10 + 6.0.11 - 6.0.18-servicing.23269.7 - 6.0.18-servicing.23269.7 - 6.0.18 - 6.0.18 - 6.0.18 - 6.0.18 + 6.0.19-servicing.23313.25 + 6.0.19-servicing.23313.25 + 6.0.19 + 6.0.19 + 6.0.19 + 6.0.19 2.1.0 - 6.0.18-servicing.23272.2 - 6.0.18-servicing.23272.2 - 6.0.18 - 6.0.18 + 6.0.19-servicing.23316.3 + 6.0.19-servicing.23316.3 + 6.0.19 + 6.0.19 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.410 + 6.0.411 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7ffe202ef66f4b7271fa5d9481d6cf800c73a4c4 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 19 Jun 2023 10:36:37 -0700 Subject: [PATCH 0969/1244] Update branding to 6.0.315 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 882aabe101e7..967fd94f3fce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 14 + 15 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 4359922858a58e60c62804abe186cebc15fc389c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 19 Jun 2023 10:36:43 -0700 Subject: [PATCH 0970/1244] Update branding to 6.0.412 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3fbf82613cf5..4083592e2253 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 11 + 12 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 1fb1cc9b9780adc88a3a9622546c60c13b40561e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 19:18:36 +0000 Subject: [PATCH 0971/1244] Merged PR 32042: [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.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.3 to 6.0.19-servicing.23316.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.19-servicing.23316.3 to 6.0.19-servicing.23316.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.8 (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**: 20230619.17 - **Date Produced**: June 19, 2023 4:53:03 PM UTC - **Commit**: d522678314f3caedeb106994f0198cc62f807ea9 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.314-servicing.23316.42 to 6.0.314-servicing.23319.17][1] - **Microsoft.NET.Sdk**: [from 6.0.314-servicing.23316.42 to 6.0.314-servicing.23319.17][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.19 to 6.0.19][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.19-servi... --- 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 c8000546db2e..ad23de3e831f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45500982b54f..d1a6a14ebc40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d410e6f94041b08f891a838cb3867b924b57089f + b85af7cbbb6fabe77fc290780c3f15f0627d296f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d410e6f94041b08f891a838cb3867b924b57089f + b85af7cbbb6fabe77fc290780c3f15f0627d296f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b1b9ae8774dbff146d4a0149a85229360e1d5dfd + 4e9cc74519c57c5c4913459618f0dab2d6696ea1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 80d0a961366ba61097c1e1b51ad47466984d734e + b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 99f038044d26..756b5ea96671 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.19-servicing.23314.6 + 6.0.19-servicing.23316.2 - 6.0.19-servicing.23314.6 + 6.0.19-servicing.23316.8 @@ -46,18 +46,18 @@ 6.0.19 6.0.19 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 0.2.0 - 6.0.314-servicing.23316.42 - 6.0.314-servicing.23316.42 + 6.0.315-servicing.23319.32 + 6.0.315-servicing.23319.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.19-servicing.23316.3 - 6.0.19-servicing.23316.3 + 6.0.19-servicing.23316.11 + 6.0.19-servicing.23316.11 6.0.19 6.0.19 From 9dbd715de3b00bbf659eeb96681cfd173d09e2a7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 19:19:00 +0000 Subject: [PATCH 0972/1244] Merged PR 32043: [internal/release/6.0.4xx] 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.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.3 to 6.0.19-servicing.23316.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.19-servicing.23316.3 to 6.0.19-servicing.23316.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230619.18 - **Date Produced**: June 19, 2023 4:52:53 PM UTC - **Commit**: 06aa117f6fde6b16a29b2808caddffd01279c574 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.411-servicing.23316.46 to 6.0.411-servicing.23319.18][1] - **Microsoft.NET.Sdk**: [from 6.0.411-servicing.23316.46 to 6.0.411-servicing.23319.18][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.19 to 6.0.19][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.19-servi... --- 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 85cbee834d3c..1830d5f483fb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad7b66fe297a..803276a6cbab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating da62ce98a3ee40bd5a5f68e089a7d7fe11c8ba51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 256cc027914283de5cb622ce409326aa0aa2e4ff + a515e11d5b5b327a857a7500dee968887c619e4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 256cc027914283de5cb622ce409326aa0aa2e4ff + a515e11d5b5b327a857a7500dee968887c619e4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b1b9ae8774dbff146d4a0149a85229360e1d5dfd + 4e9cc74519c57c5c4913459618f0dab2d6696ea1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 80d0a961366ba61097c1e1b51ad47466984d734e + b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 240166714f9b..066f0b3304df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.19-servicing.23314.6 + 6.0.19-servicing.23316.2 - 6.0.19-servicing.23314.6 + 6.0.19-servicing.23316.8 @@ -46,18 +46,18 @@ 6.0.19 6.0.19 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 0.2.0 - 6.0.411-servicing.23316.46 - 6.0.411-servicing.23316.46 + 6.0.412-servicing.23319.33 + 6.0.412-servicing.23319.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.19-servicing.23316.3 - 6.0.19-servicing.23316.3 + 6.0.19-servicing.23316.11 + 6.0.19-servicing.23316.11 6.0.19 6.0.19 From b8cb60edae8ea694b2a05707eb3c005deb5da793 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 20:51:31 +0000 Subject: [PATCH 0973/1244] Merged PR 32122: [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.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.11 to 6.0.20-servicing.23319.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.19-servicing.23316.11 to 6.0.20-servicing.23319.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.314 to 6.0.315 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.314-servicing.23316.16 to 6.0.315-servicing.23320.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.314 to 6.0.315 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (B... --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 40 +++++++++---------- 3 files changed, 71 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad23de3e831f..49bd305f7a30 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1a6a14ebc40..9035638c8021 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 + e058a95e92f41e53e56790d1b2f7a4ba6e104034 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 + e058a95e92f41e53e56790d1b2f7a4ba6e104034 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 + e058a95e92f41e53e56790d1b2f7a4ba6e104034 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b85af7cbbb6fabe77fc290780c3f15f0627d296f + e08ea90cf3c415461f5bd983e9e6861b5b62e895 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b85af7cbbb6fabe77fc290780c3f15f0627d296f + e08ea90cf3c415461f5bd983e9e6861b5b62e895 diff --git a/eng/Versions.props b/eng/Versions.props index 756b5ea96671..e38d206782d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.314 + 6.0.315 @@ -44,20 +44,20 @@ - 6.0.19 - 6.0.19 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 + 6.0.20 + 6.0.20 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 0.2.0 - 6.0.315-servicing.23319.32 - 6.0.315-servicing.23319.32 + 6.0.315-servicing.23321.9 + 6.0.315-servicing.23321.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.19-servicing.23313.25 - 6.0.19-servicing.23313.25 - 6.0.19 - 6.0.19 - 6.0.19 - 6.0.19 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 + 6.0.20 + 6.0.20 + 6.0.20 + 6.0.20 2.1.0 - 6.0.19-servicing.23316.11 - 6.0.19-servicing.23316.11 - 6.0.19 - 6.0.19 + 6.0.20-servicing.23319.7 + 6.0.20-servicing.23319.7 + 6.0.20 + 6.0.20 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.314 + 6.0.315 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 4afc24ece692275bede7d7d2814b473f9535bcc9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 04:45:46 +0000 Subject: [PATCH 0974/1244] Merged PR 32134: [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.20 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.20-servicing.23319.7 to 6.0.20-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.20-servicing.23319.7 to 6.0.20-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.20 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.20-servicing.23320.17 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.20 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.20-servicing.23320.17 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.20-servicing.23320.17 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.20-servicing.23320.17 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.20 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23321.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.20 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.19-servicing.23316.8 to 6.0.20-servicing.23321.8 (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**: 20230621.37 - **Date Produced**: June 22, 2023 12:58:13 AM UTC - **Commit**: 942c2e51b71ef5aaa289f5f2edd62db728e25201 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.315-servicing.23321.9 to 6.0.315-servicing.23321.37][1] - **Microsoft.NET.Sdk**: [from 6.0.315-servicing.23321.9 to 6.0.315-servicing.23321.37][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.20 to 6.0.20][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.20-servicin... --- 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 49bd305f7a30..3fa4c766870c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9035638c8021..6d72dc29443d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c34980ca5ff05b3673b08399dbe40e0d027d14bd + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c34980ca5ff05b3673b08399dbe40e0d027d14bd + 39e0501ee91dcf2b9b885d647795184815fb0408 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c34980ca5ff05b3673b08399dbe40e0d027d14bd + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c34980ca5ff05b3673b08399dbe40e0d027d14bd + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c34980ca5ff05b3673b08399dbe40e0d027d14bd + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c34980ca5ff05b3673b08399dbe40e0d027d14bd + 39e0501ee91dcf2b9b885d647795184815fb0408 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e058a95e92f41e53e56790d1b2f7a4ba6e104034 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e08ea90cf3c415461f5bd983e9e6861b5b62e895 + 942c2e51b71ef5aaa289f5f2edd62db728e25201 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e08ea90cf3c415461f5bd983e9e6861b5b62e895 + 942c2e51b71ef5aaa289f5f2edd62db728e25201 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e9cc74519c57c5c4913459618f0dab2d6696ea1 + 7f67c1539dcfa02ef740306820b44a713bdcb525 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0 + 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e38d206782d7..2cfe4db3a1f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.19-servicing.23316.2 + 6.0.20-servicing.23321.4 - 6.0.19-servicing.23316.8 + 6.0.20-servicing.23321.8 @@ -46,18 +46,18 @@ 6.0.20 6.0.20 - 6.0.20-servicing.23320.17 - 6.0.20-servicing.23320.17 - 6.0.20-servicing.23320.17 - 6.0.20-servicing.23320.17 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 0.2.0 - 6.0.315-servicing.23321.9 - 6.0.315-servicing.23321.9 + 6.0.315-servicing.23321.37 + 6.0.315-servicing.23321.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.20-servicing.23319.7 - 6.0.20-servicing.23319.7 + 6.0.20-servicing.23321.10 + 6.0.20-servicing.23321.10 6.0.20 6.0.20 From 908566b3a2e422029b7bd8b14aedd13f9e946937 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 04:45:50 +0000 Subject: [PATCH 0975/1244] Merged PR 32133: [internal/release/6.0.4xx] 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.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.11 to 6.0.20-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.19-servicing.23316.11 to 6.0.20-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.411 to 6.0.412 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.411-rtm.23316.14 to 6.0.412-rtm.23320.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.411 to 6.0.412 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23321.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtim... --- NuGet.config | 16 +++---- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 44 +++++++++---------- 3 files changed, 77 insertions(+), 77 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1830d5f483fb..2d1e748e3d5a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 803276a6cbab..d1fa89201ecd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + 39e0501ee91dcf2b9b885d647795184815fb0408 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - da62ce98a3ee40bd5a5f68e089a7d7fe11c8ba51 + d7a51182768daf8bb30acf5a62024fd6e309dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - da62ce98a3ee40bd5a5f68e089a7d7fe11c8ba51 + d7a51182768daf8bb30acf5a62024fd6e309dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - da62ce98a3ee40bd5a5f68e089a7d7fe11c8ba51 + d7a51182768daf8bb30acf5a62024fd6e309dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a515e11d5b5b327a857a7500dee968887c619e4f + bb732bb118dac94abd62fc2bd556737845a67ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a515e11d5b5b327a857a7500dee968887c619e4f + bb732bb118dac94abd62fc2bd556737845a67ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e9cc74519c57c5c4913459618f0dab2d6696ea1 + 7f67c1539dcfa02ef740306820b44a713bdcb525 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0 + 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 066f0b3304df..e840acb816bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.19-servicing.23316.2 + 6.0.20-servicing.23321.4 - 6.0.19-servicing.23316.8 + 6.0.20-servicing.23321.8 - 6.0.411 + 6.0.412 @@ -44,20 +44,20 @@ - 6.0.19 - 6.0.19 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 + 6.0.20 + 6.0.20 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 0.2.0 - 6.0.412-servicing.23319.33 - 6.0.412-servicing.23319.33 + 6.0.412-servicing.23321.36 + 6.0.412-servicing.23321.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.19-servicing.23313.25 - 6.0.19-servicing.23313.25 - 6.0.19 - 6.0.19 - 6.0.19 - 6.0.19 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 + 6.0.20 + 6.0.20 + 6.0.20 + 6.0.20 2.1.0 - 6.0.19-servicing.23316.11 - 6.0.19-servicing.23316.11 - 6.0.19 - 6.0.19 + 6.0.20-servicing.23321.10 + 6.0.20-servicing.23321.10 + 6.0.20 + 6.0.20 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.411 + 6.0.412 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7d6cbdc87e1251264c97a7fc31e81ddd009e0b12 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 16:49:02 +0000 Subject: [PATCH 0976/1244] Merged PR 32175: [internal/release/6.0.4xx] 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.412 to 6.0.412 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.412-rtm.23320.10 to 6.0.412-rtm.23322.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.412 to 6.0.412 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230622.4 - **Date Produced**: June 22, 2023 4:09:08 PM UTC - **Commit**: 91c8d35e8864be590748dfe7ded49c5eb7e7aa01 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.412-servicing.23321.36 to 6.0.412-servicing.23322.4][1] - **Microsoft.NET.Sdk**: [from 6.0.412-servicing.23321.36 to 6.0.412-servicing.23322.4][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.412 to 6.0.412][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.412-rtm.23320.10 to 6.0.412-rtm.23322.6][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.412 to 6.0.412][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbb732bb118&targetVersion=GC91c8d35e88&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCd7a5118276&targetVersion=GCd540963680&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 2d1e748e3d5a..7eebbc30b977 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1fa89201ecd..a9b4d7bb0b1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d7a51182768daf8bb30acf5a62024fd6e309dd86 + d5409636809f75eb115d80785f31736829594f34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d7a51182768daf8bb30acf5a62024fd6e309dd86 + d5409636809f75eb115d80785f31736829594f34 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d7a51182768daf8bb30acf5a62024fd6e309dd86 + d5409636809f75eb115d80785f31736829594f34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb732bb118dac94abd62fc2bd556737845a67ca6 + 91c8d35e8864be590748dfe7ded49c5eb7e7aa01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb732bb118dac94abd62fc2bd556737845a67ca6 + 91c8d35e8864be590748dfe7ded49c5eb7e7aa01 diff --git a/eng/Versions.props b/eng/Versions.props index e840acb816bd..9e235edf1249 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.412-servicing.23321.36 - 6.0.412-servicing.23321.36 + 6.0.412-servicing.23322.4 + 6.0.412-servicing.23322.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 14e7d3c0b176d7936d4a3510b60e5ff4f5bc83f1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 18:34:47 +0000 Subject: [PATCH 0977/1244] Merged PR 32179: [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.DotNet.Common.ItemTemplates**: from 6.0.315 to 6.0.315 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.315-servicing.23320.9 to 6.0.315-servicing.23322.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.315 to 6.0.315 (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**: 20230622.9 - **Date Produced**: June 22, 2023 5:52:42 PM UTC - **Commit**: 326d33693c0fc67483ad0da850d5f36ea5a078e8 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.315-servicing.23321.37 to 6.0.315-servicing.23322.9][1] - **Microsoft.NET.Sdk**: [from 6.0.315-servicing.23321.37 to 6.0.315-servicing.23322.9][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.315 to 6.0.315][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.315-servicing.23320.9 to 6.0.315-servicing.23322.5][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.315 to 6.0.315][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC942c2e51b7&targetVersion=GC326d33693c&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe058a95e92&targetVersion=GC3a75313bb4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 3fa4c766870c..3453596a3c35 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d72dc29443d..de3d76128301 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e058a95e92f41e53e56790d1b2f7a4ba6e104034 + 3a75313bb4f23e7fb72e1d382e944351dd4fa473 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e058a95e92f41e53e56790d1b2f7a4ba6e104034 + 3a75313bb4f23e7fb72e1d382e944351dd4fa473 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e058a95e92f41e53e56790d1b2f7a4ba6e104034 + 3a75313bb4f23e7fb72e1d382e944351dd4fa473 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 942c2e51b71ef5aaa289f5f2edd62db728e25201 + 326d33693c0fc67483ad0da850d5f36ea5a078e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 942c2e51b71ef5aaa289f5f2edd62db728e25201 + 326d33693c0fc67483ad0da850d5f36ea5a078e8 diff --git a/eng/Versions.props b/eng/Versions.props index 2cfe4db3a1f6..59c6bea8b0f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.315-servicing.23321.37 - 6.0.315-servicing.23321.37 + 6.0.315-servicing.23322.9 + 6.0.315-servicing.23322.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2282fe998c54635c744653971f1903f98a33d49b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 23 Jun 2023 00:23:50 +0000 Subject: [PATCH 0978/1244] Merged PR 32189: [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**: 20230622.16 - **Date Produced**: June 22, 2023 7:18:04 PM UTC - **Commit**: b9359aebf07bec085619421d7b078affadbd4b05 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.315-servicing.23322.9 to 6.0.315-servicing.23322.16][1] - **Microsoft.NET.Sdk**: [from 6.0.315-servicing.23322.9 to 6.0.315-servicing.23322.16][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC326d33693c&targetVersion=GCb9359aebf0&_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 de3d76128301..690e7b881e5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3a75313bb4f23e7fb72e1d382e944351dd4fa473 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 326d33693c0fc67483ad0da850d5f36ea5a078e8 + b9359aebf07bec085619421d7b078affadbd4b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 326d33693c0fc67483ad0da850d5f36ea5a078e8 + b9359aebf07bec085619421d7b078affadbd4b05 diff --git a/eng/Versions.props b/eng/Versions.props index 59c6bea8b0f7..b21111188a96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.315-servicing.23322.9 - 6.0.315-servicing.23322.9 + 6.0.315-servicing.23322.16 + 6.0.315-servicing.23322.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ee124f7fe1946ba82febd79ef25c3040de461d3a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 23 Jun 2023 00:23:54 +0000 Subject: [PATCH 0979/1244] Merged PR 32190: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230622.15 - **Date Produced**: June 22, 2023 7:18:20 PM UTC - **Commit**: 6a49236d0540364ac6e9f81a7ea637c06b17d88e - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.412-servicing.23322.4 to 6.0.412-servicing.23322.15][1] - **Microsoft.NET.Sdk**: [from 6.0.412-servicing.23322.4 to 6.0.412-servicing.23322.15][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC91c8d35e88&targetVersion=GC6a49236d05&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 a9b4d7bb0b1d..9983da94a421 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d5409636809f75eb115d80785f31736829594f34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91c8d35e8864be590748dfe7ded49c5eb7e7aa01 + 6a49236d0540364ac6e9f81a7ea637c06b17d88e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91c8d35e8864be590748dfe7ded49c5eb7e7aa01 + 6a49236d0540364ac6e9f81a7ea637c06b17d88e diff --git a/eng/Versions.props b/eng/Versions.props index 9e235edf1249..df96cf8398ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.412-servicing.23322.4 - 6.0.412-servicing.23322.4 + 6.0.412-servicing.23322.15 + 6.0.412-servicing.23322.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ab99c450a0979d254ccfb39c3555c77154acc140 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 5 Jul 2023 14:38:44 -0700 Subject: [PATCH 0980/1244] Update branding to 6.0.316 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 967fd94f3fce..9faed2877f3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 15 + 16 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c6222f0702596c999af7cfe453f95135bbcd821f Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 5 Jul 2023 14:38:50 -0700 Subject: [PATCH 0981/1244] Update branding to 6.0.413 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4083592e2253..21add4a976f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 12 + 13 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 7a0352f5fbc633103de8fc9691bf77cc4bfc6f4b Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 6 Jul 2023 10:09:19 -0700 Subject: [PATCH 0982/1244] [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16891) Co-authored-by: dotnet-maestro[bot] Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Jason Zhai Co-authored-by: Noah Gilson Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: Matt Thalman --- eng/Versions.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 21add4a976f0..f9d19a1e0f9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,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.116 + 6.0.119 diff --git a/global.json b/global.json index b358f87d3bc3..31e65ea4d6ae 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.118", + "dotnet": "6.0.119", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" From fd5696554aeafb907663ed0fed8bcc875123a9db Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 7 Jul 2023 13:07:58 -0700 Subject: [PATCH 0983/1244] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16898) Co-authored-by: Nikola Milosavljevic Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: Matt Thalman --- src/SourceBuild/tarball/content/build.proj | 4 +- .../content/repos/package-source-build.proj | 2 +- .../assets/baselines/MsftToSbSdk.diff | 17 ----- ...explicit-System.Text.Json-dependency.patch | 73 +++++++++++++++++++ ...explicit-System.Text.Json-dependency.patch | 31 ++++++++ 5 files changed, 107 insertions(+), 20 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch create mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 3cef840dc3bd..523128954a6c 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -134,7 +134,7 @@ - $(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).tar.gz + $(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).$(TargetRid).tar.gz $(SmokeTestsArtifactsDir)prereq-packages/ @@ -190,7 +190,7 @@ - $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(BuildArchitecture).tar.gz + $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(TargetRid).tar.gz $(ResultingPrebuiltPackagesDir) diff --git a/src/SourceBuild/tarball/content/repos/package-source-build.proj b/src/SourceBuild/tarball/content/repos/package-source-build.proj index 0101374dc046..44c8e5cf5edf 100644 --- a/src/SourceBuild/tarball/content/repos/package-source-build.proj +++ b/src/SourceBuild/tarball/content/repos/package-source-build.proj @@ -47,7 +47,7 @@ Directories="$(SourceBuildReferencePackagesDestination)extractArtifacts/" /> - $(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).tar.gz + $(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).$(TargetRid).tar.gz 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 4e98d267b0bd..1b86a0d2ee86 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 @@ -14,20 +14,7 @@ index ------------ ./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.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.portable-rid/ @@ -42,10 +29,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/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.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch new file mode 100644 index 000000000000..b82faadcd3ad --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch @@ -0,0 +1,73 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Mon, 26 Jun 2023 23:46:46 +0000 +Subject: [PATCH] Add explicit System.Text.Json dependency + +Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up +from PSB, via Microsoft.Build package. + +Backport: https://github.com/dotnet/format/pull/1887 +--- + Directory.Packages.props | 1 + + eng/Version.Details.xml | 4 ++++ + eng/Versions.props | 2 ++ + src/dotnet-format.csproj | 6 ++++++ + 4 files changed, 13 insertions(+) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index 6b628c22..c9f86593 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -36,5 +36,6 @@ + + + ++ + + +\ No newline at end of file +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index cdfa5f5e..86f02b44 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -13,6 +13,10 @@ + https://github.com/dotnet/command-line-api + 82273cb56c83b589e8e5b63da0ac9745ffc6e105 + ++ ++ https://github.com/dotnet/runtime ++ 3241df7f2b0f3e2dada8d07229723c79fdbe4991 ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 27582078..bccaf176 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -20,6 +20,8 @@ + + 2.0.0-beta1.21473.1 + 0.3.0-alpha.21473.1 ++ ++ 6.0.8 + + ++ + + + diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch new file mode 100644 index 000000000000..74e217fbe550 --- /dev/null +++ b/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Mon, 26 Jun 2023 23:02:20 +0000 +Subject: [PATCH] Add explicit System.Text.Json dependency + +Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up +from PSB, via Microsoft.Build package. + +Backport: https://github.com/dotnet/sdk/pull/33618 +--- + src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj +index 065f750f72..13d2c1ed99 100644 +--- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj ++++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj +@@ -23,6 +23,13 @@ + + + ++ ++ ++ ++ + + + From 65db63eb44f459af9c57a288c4b49e0147ad6cc3 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 10 Jul 2023 08:06:04 -0500 Subject: [PATCH 0984/1244] Update format patch --- .../0002-Add-explicit-System.Text.Json-dependency.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch index b82faadcd3ad..70f2cdd0f809 100644 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch @@ -32,7 +32,7 @@ index cdfa5f5e..86f02b44 100644 +++ b/eng/Version.Details.xml @@ -13,6 +13,10 @@ https://github.com/dotnet/command-line-api - 82273cb56c83b589e8e5b63da0ac9745ffc6e105 + c776cd4e906b669b9cce1017fee7d0ba9845d163 + + https://github.com/dotnet/runtime @@ -40,7 +40,7 @@ index cdfa5f5e..86f02b44 100644 + - + diff --git a/eng/Versions.props b/eng/Versions.props index 27582078..bccaf176 100644 --- a/eng/Versions.props From c5f29a611da1d98f24f05608341fd6b1e90ccd5a Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 10 Jul 2023 09:31:51 -0500 Subject: [PATCH 0985/1244] Update format patch --- .../0002-Add-explicit-System.Text.Json-dependency.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch index 70f2cdd0f809..3176d939bd2e 100644 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch @@ -47,8 +47,8 @@ index 27582078..bccaf176 100644 +++ b/eng/Versions.props @@ -20,6 +20,8 @@ - 2.0.0-beta1.21473.1 - 0.3.0-alpha.21473.1 + 2.0.0-beta4.22504.1 + 0.4.0-alpha.22504.1 + + 6.0.8 From d1ab1020fd88070368bfcfcfa975b52091d3a22a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 12 Jul 2023 18:35:57 +0000 Subject: [PATCH 0986/1244] Update dependencies from https://github.com/dotnet/arcade build 20230711.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.23313.5 -> To Version 6.0.0-beta.23361.3 --- NuGet.config | 8 -------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3453596a3c35..2cf5556c3e9c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 690e7b881e5a..a1ef1a795910 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index a37934b0e2a0..f352cdb4aee5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23313.5 + 6.0.0-beta.23361.3 diff --git a/global.json b/global.json index 31e65ea4d6ae..3364ad030482 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.119", + "dotnet": "6.0.120", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23313.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23361.3" } } From a1073db7fccaef4fd894229328b30e71fbc93c07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 13:55:29 -0700 Subject: [PATCH 0987/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#16968) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 8 -------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7eebbc30b977..03d3587a670c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,16 +37,12 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9983da94a421..e89c33bea946 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index dc8513d92333..1c288da7d445 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23313.5 + 6.0.0-beta.23361.3 diff --git a/global.json b/global.json index 31e65ea4d6ae..3364ad030482 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.119", + "dotnet": "6.0.120", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23313.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23361.3" } } From ed642f02d8315fdbb5e5912fc81ac11fd2951a4f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jul 2023 13:05:58 +0000 Subject: [PATCH 0988/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230714.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.315-servicing.23322.16 -> To Version 6.0.316-servicing.23364.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.20 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cf5556c3e9c..e6622435c0f0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -15,8 +16,10 @@ + + @@ -37,11 +40,14 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1ef1a795910..6801f0a25f2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3a75313bb4f23e7fb72e1d382e944351dd4fa473 + 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3a75313bb4f23e7fb72e1d382e944351dd4fa473 + 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3a75313bb4f23e7fb72e1d382e944351dd4fa473 + 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9359aebf07bec085619421d7b078affadbd4b05 + 1439d8bce6207584e4f75fb24691d2f146b93be5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9359aebf07bec085619421d7b078affadbd4b05 + 1439d8bce6207584e4f75fb24691d2f146b93be5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7f67c1539dcfa02ef740306820b44a713bdcb525 + 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 + c4dcb2663686315258f2f687c51f1ff5bb7d0aea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f352cdb4aee5..bcd147d2f10c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.20-servicing.23321.4 + 6.0.21-servicing.23363.11 - 6.0.20-servicing.23321.8 + 6.0.21-servicing.23363.8 - 6.0.315 + 6.0.316 @@ -44,20 +44,20 @@ - 6.0.20 - 6.0.20 - 6.0.20-servicing.23321.6 - 6.0.20-servicing.23321.6 - 6.0.20-servicing.23321.6 - 6.0.20-servicing.23321.6 + 6.0.21 + 6.0.21 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 0.2.0 - 6.0.315-servicing.23322.16 - 6.0.315-servicing.23322.16 + 6.0.316-servicing.23364.13 + 6.0.316-servicing.23364.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.20-servicing.23321.10 - 6.0.20-servicing.23321.10 - 6.0.20 - 6.0.20 + 6.0.21-servicing.23364.1 + 6.0.21-servicing.23364.1 + 6.0.21 + 6.0.21 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.315 + 6.0.316 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 310c694977bdbf1754c5ee8b396785eea7b223f3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jul 2023 13:06:23 +0000 Subject: [PATCH 0989/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230714.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.412-servicing.23322.15 -> To Version 6.0.413-servicing.23364.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.20 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03d3587a670c..3d8f2fb681ff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -15,8 +16,10 @@ + + @@ -37,12 +40,15 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e89c33bea946..1f6d6250dc1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d5409636809f75eb115d80785f31736829594f34 + 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d5409636809f75eb115d80785f31736829594f34 + 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d5409636809f75eb115d80785f31736829594f34 + 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6a49236d0540364ac6e9f81a7ea637c06b17d88e + 2645f1e26e70544cfae5dbc7198ef403ec96c0db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6a49236d0540364ac6e9f81a7ea637c06b17d88e + 2645f1e26e70544cfae5dbc7198ef403ec96c0db - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7f67c1539dcfa02ef740306820b44a713bdcb525 + 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 + c4dcb2663686315258f2f687c51f1ff5bb7d0aea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a1ce0ea159d6..bd1118896a9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.20-servicing.23321.4 + 6.0.21-servicing.23363.11 - 6.0.20-servicing.23321.8 + 6.0.21-servicing.23363.8 - 6.0.412 + 6.0.413 @@ -44,20 +44,20 @@ - 6.0.20 - 6.0.20 - 6.0.20-servicing.23321.6 - 6.0.20-servicing.23321.6 - 6.0.20-servicing.23321.6 - 6.0.20-servicing.23321.6 + 6.0.21 + 6.0.21 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 0.2.0 - 6.0.412-servicing.23322.15 - 6.0.412-servicing.23322.15 + 6.0.413-servicing.23364.12 + 6.0.413-servicing.23364.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.20-servicing.23321.10 - 6.0.20-servicing.23321.10 - 6.0.20 - 6.0.20 + 6.0.21-servicing.23364.1 + 6.0.21-servicing.23364.1 + 6.0.21 + 6.0.21 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.412 + 6.0.413 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 4dce61d3fae364b71c768e6421366cbd3d00cf92 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jul 2023 19:38:09 +0000 Subject: [PATCH 0990/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23364.13 -> To Version 6.0.316-servicing.23367.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++--- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++--------- 3 files changed, 58 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index e6622435c0f0..237478e93ac2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,20 @@ - + + - + @@ -40,14 +41,15 @@ - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6801f0a25f2d..2569e5124d8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1439d8bce6207584e4f75fb24691d2f146b93be5 + 68456cae299435babf6fe194ec79e305275985f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1439d8bce6207584e4f75fb24691d2f146b93be5 + 68456cae299435babf6fe194ec79e305275985f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 + 052009561f916cf06df82d89297ae3ed66cf5d2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c4dcb2663686315258f2f687c51f1ff5bb7d0aea + fa467fd679da61d9e429ce2654ef63766afcd7f5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index bcd147d2f10c..6370a3eb9c71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.21-servicing.23363.11 + 6.0.21-servicing.23364.6 - 6.0.21-servicing.23363.8 + 6.0.21-servicing.23364.5 @@ -46,18 +46,18 @@ 6.0.21 6.0.21 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 + 6.0.21-servicing.23364.38 + 6.0.21-servicing.23364.38 + 6.0.21-servicing.23364.38 + 6.0.21-servicing.23364.38 0.2.0 - 6.0.316-servicing.23364.13 - 6.0.316-servicing.23364.13 + 6.0.316-servicing.23367.14 + 6.0.316-servicing.23367.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,18 +68,18 @@ - 6.0.20-servicing.23320.17 - 6.0.20-servicing.23320.17 - 6.0.20 - 6.0.20 - 6.0.20 - 6.0.20 + 6.0.21-servicing.23363.11 + 6.0.21-servicing.23363.11 + 6.0.21 + 6.0.21 + 6.0.21 + 6.0.21 2.1.0 - 6.0.21-servicing.23364.1 - 6.0.21-servicing.23364.1 + 6.0.21-servicing.23367.3 + 6.0.21-servicing.23367.3 6.0.21 6.0.21 From 5d26c38ee96606c1e474039d445c27cba6d2b229 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 17 Jul 2023 21:09:22 +0000 Subject: [PATCH 0991/1244] Merged PR 32709: Remove applied source build patch - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Remove applied source build patch --- ...explicit-System.Text.Json-dependency.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch deleted file mode 100644 index 74e217fbe550..000000000000 --- a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 26 Jun 2023 23:02:20 +0000 -Subject: [PATCH] Add explicit System.Text.Json dependency - -Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up -from PSB, via Microsoft.Build package. - -Backport: https://github.com/dotnet/sdk/pull/33618 ---- - src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -index 065f750f72..13d2c1ed99 100644 ---- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -+++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -@@ -23,6 +23,13 @@ - - - -+ -+ -+ -+ - - - From 10710f7d8e8fa29aea83b7ba59c0e169a7afc008 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Jul 2023 21:13:18 +0000 Subject: [PATCH 0992/1244] Merged PR 32707: [internal/release/6.0.4xx] 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.21 to 6.0.21 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.21-servicing.23364.1 to 6.0.21-servicing.23367.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.21-servicing.23364.1 to 6.0.21-servicing.23367.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.20-servicing.23320.17 to 6.0.21-servicing.23363.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.20-servicing.23320.17 to 6.0.21-servicing.23363.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.21-servicing.23363.11 to 6.0.21-servicing.23364.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.21-servicing.23363.8 to 6.0.21-servicing.23364.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_gi... --- NuGet.config | 10 +-- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 32 ++++----- ...explicit-System.Text.Json-dependency.patch | 31 -------- 4 files changed, 58 insertions(+), 87 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch diff --git a/NuGet.config b/NuGet.config index 3d8f2fb681ff..adbb455777ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,20 @@ - + + - + @@ -40,15 +41,16 @@ - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f6d6250dc1c..a5554bca6535 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2645f1e26e70544cfae5dbc7198ef403ec96c0db + 32a105ca98fd8a3807b81912fbef60a085378f24 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2645f1e26e70544cfae5dbc7198ef403ec96c0db + 32a105ca98fd8a3807b81912fbef60a085378f24 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 + 052009561f916cf06df82d89297ae3ed66cf5d2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c4dcb2663686315258f2f687c51f1ff5bb7d0aea + fa467fd679da61d9e429ce2654ef63766afcd7f5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index bd1118896a9d..97effa0a5a10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.21-servicing.23363.11 + 6.0.21-servicing.23364.6 - 6.0.21-servicing.23363.8 + 6.0.21-servicing.23364.5 @@ -46,18 +46,18 @@ 6.0.21 6.0.21 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 + 6.0.21-servicing.23364.38 + 6.0.21-servicing.23364.38 + 6.0.21-servicing.23364.38 + 6.0.21-servicing.23364.38 0.2.0 - 6.0.413-servicing.23364.12 - 6.0.413-servicing.23364.12 + 6.0.413-servicing.23367.15 + 6.0.413-servicing.23367.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,18 +68,18 @@ - 6.0.20-servicing.23320.17 - 6.0.20-servicing.23320.17 - 6.0.20 - 6.0.20 - 6.0.20 - 6.0.20 + 6.0.21-servicing.23363.11 + 6.0.21-servicing.23363.11 + 6.0.21 + 6.0.21 + 6.0.21 + 6.0.21 2.1.0 - 6.0.21-servicing.23364.1 - 6.0.21-servicing.23364.1 + 6.0.21-servicing.23367.3 + 6.0.21-servicing.23367.3 6.0.21 6.0.21 diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch deleted file mode 100644 index 74e217fbe550..000000000000 --- a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 26 Jun 2023 23:02:20 +0000 -Subject: [PATCH] Add explicit System.Text.Json dependency - -Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up -from PSB, via Microsoft.Build package. - -Backport: https://github.com/dotnet/sdk/pull/33618 ---- - src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -index 065f750f72..13d2c1ed99 100644 ---- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -+++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -@@ -23,6 +23,13 @@ - - - -+ -+ -+ -+ - - - From 9beeb9ef34c235ffca7d3b8eb60542f6472c5d32 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Aug 2023 11:01:00 -0700 Subject: [PATCH 0993/1244] Update branding to 6.0.317 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f352cdb4aee5..a1d216e46779 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 16 + 17 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From eccb361192f2f1e70224c47be9579afe12c07b5c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Aug 2023 11:01:05 -0700 Subject: [PATCH 0994/1244] Update branding to 6.0.414 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a1ce0ea159d6..b4f44346edbb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 13 + 14 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From fd19247682774290394c6304e9a2b26a7ae7304d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 1 Aug 2023 21:00:12 +0000 Subject: [PATCH 0995/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23401.9 --- 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 adbb455777ce..36c72335769c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -41,15 +49,23 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5554bca6535..bd159ad109b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 1b7e089bba6c87921600e03f83ddb77ba6bb59e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 1b7e089bba6c87921600e03f83ddb77ba6bb59e2 diff --git a/eng/Versions.props b/eng/Versions.props index 97effa0a5a10..3d2372ddcce9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.413-servicing.23367.15 - 6.0.413-servicing.23367.15 + 6.0.414-servicing.23401.9 + 6.0.414-servicing.23401.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4e403960548a2b1c58eede62f6f6e71693597a76 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 1 Aug 2023 21:01:13 +0000 Subject: [PATCH 0996/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23401.7 --- 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 237478e93ac2..f2ea52dee8f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -41,14 +49,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2569e5124d8e..eb01205924ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68456cae299435babf6fe194ec79e305275985f9 + e5c6a3f05fd8eb4be6365c0c9c3fb6eb4f3472e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68456cae299435babf6fe194ec79e305275985f9 + e5c6a3f05fd8eb4be6365c0c9c3fb6eb4f3472e0 diff --git a/eng/Versions.props b/eng/Versions.props index c1cb463e7573..32aecf03a0ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.316-servicing.23367.14 - 6.0.316-servicing.23367.14 + 6.0.317-servicing.23401.7 + 6.0.317-servicing.23401.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fe9469ff1c6d39f18ac2500d00a7c6aaecc3ab62 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 1 Aug 2023 23:37:34 +0000 Subject: [PATCH 0997/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23401.20 --- 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 eb01205924ac..90cb5129ff0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5c6a3f05fd8eb4be6365c0c9c3fb6eb4f3472e0 + 674ce8a93a6de851e91ae8151e72693314daef56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5c6a3f05fd8eb4be6365c0c9c3fb6eb4f3472e0 + 674ce8a93a6de851e91ae8151e72693314daef56 diff --git a/eng/Versions.props b/eng/Versions.props index 32aecf03a0ab..6224051b5740 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23401.7 - 6.0.317-servicing.23401.7 + 6.0.317-servicing.23401.20 + 6.0.317-servicing.23401.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5368f4278f60e1e94d6f6576df8ec6d17eb22477 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Aug 2023 19:53:57 +0000 Subject: [PATCH 0998/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230808.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23408.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 90cb5129ff0e..1d99db0eb0c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 674ce8a93a6de851e91ae8151e72693314daef56 + 14ca8605fe72f4e61f0aeb4ae8eaad71e324808a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 674ce8a93a6de851e91ae8151e72693314daef56 + 14ca8605fe72f4e61f0aeb4ae8eaad71e324808a diff --git a/eng/Versions.props b/eng/Versions.props index 6224051b5740..812bd6d64fa3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23401.20 - 6.0.317-servicing.23401.20 + 6.0.317-servicing.23408.8 + 6.0.317-servicing.23408.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 10caa4a7f128d436eb91b5fa081787c36d6a8568 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Aug 2023 21:55:54 +0000 Subject: [PATCH 0999/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230808.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23408.18 --- 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 bd159ad109b1..26beb5cd6405 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b7e089bba6c87921600e03f83ddb77ba6bb59e2 + 1fa8b41e99188499e02b7e18f30960c80130acbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b7e089bba6c87921600e03f83ddb77ba6bb59e2 + 1fa8b41e99188499e02b7e18f30960c80130acbb diff --git a/eng/Versions.props b/eng/Versions.props index 3d2372ddcce9..6e6c35af7086 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23401.9 - 6.0.414-servicing.23401.9 + 6.0.414-servicing.23408.18 + 6.0.414-servicing.23408.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 67ece7f3cb341470c3236af917d4269291584e80 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Aug 2023 10:15:06 +0000 Subject: [PATCH 1000/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230809.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23409.2 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36c72335769c..f27f973a5773 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,6 @@ - - - @@ -54,9 +51,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26beb5cd6405..606e014f2b2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8b41e99188499e02b7e18f30960c80130acbb + 61fa08a18b023d205e572969bc4acdeeda2e98a8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8b41e99188499e02b7e18f30960c80130acbb + 61fa08a18b023d205e572969bc4acdeeda2e98a8 diff --git a/eng/Versions.props b/eng/Versions.props index 6e6c35af7086..bd4f80d85822 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23408.18 - 6.0.414-servicing.23408.18 + 6.0.414-servicing.23409.2 + 6.0.414-servicing.23409.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4cc5d8c18a541c28ad7d20e577f3a63582a19635 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Aug 2023 15:10:40 +0000 Subject: [PATCH 1001/1244] Update dependencies from https://github.com/dotnet/arcade build 20230808.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.23361.3 -> To Version 6.0.0-beta.23408.5 --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 237478e93ac2..a6c9c345eca4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,24 @@ + + - + + + + @@ -41,14 +46,19 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2569e5124d8e..62db8623ab0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c1cb463e7573..c9f660c5a149 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23361.3 + 6.0.0-beta.23408.5 diff --git a/global.json b/global.json index 3364ad030482..327cfe0275d9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.120", + "dotnet": "6.0.121", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23361.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" } } From 95c297b5f7e841767ff178fff0ba9259e0e84a2a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 10:27:14 -0700 Subject: [PATCH 1002/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#17158) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index adbb455777ce..f27f973a5773 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,24 @@ + + - + + + + @@ -41,15 +46,20 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5554bca6535..9c3d54c5e4bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 384dc784400f..891c7b729d7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23361.3 + 6.0.0-beta.23408.5 diff --git a/global.json b/global.json index 3364ad030482..327cfe0275d9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.120", + "dotnet": "6.0.121", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23361.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" } } From 9ed07936ec7ad2454c6e99b2d4c8babe90b437a6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Aug 2023 18:27:09 +0000 Subject: [PATCH 1003/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230809.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23409.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 606e014f2b2a..024d08ad0b11 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61fa08a18b023d205e572969bc4acdeeda2e98a8 + abf876d5642725dcfc24748308ba5fe849d6fab7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61fa08a18b023d205e572969bc4acdeeda2e98a8 + abf876d5642725dcfc24748308ba5fe849d6fab7 diff --git a/eng/Versions.props b/eng/Versions.props index bd4f80d85822..93c78b957039 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23409.2 - 6.0.414-servicing.23409.2 + 6.0.414-servicing.23409.9 + 6.0.414-servicing.23409.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e68b8872b07966792171f6a5d8d77facb8b42a65 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 10 Aug 2023 00:35:35 +0000 Subject: [PATCH 1004/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230809.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23409.16 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index f2ea52dee8f5..a6c9c345eca4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,6 @@ - - - @@ -54,9 +51,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d99db0eb0c5..3cfee3060fc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 14ca8605fe72f4e61f0aeb4ae8eaad71e324808a + 4a3a5b0ba38cf8300582504ffc072c4b4582d4d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 14ca8605fe72f4e61f0aeb4ae8eaad71e324808a + 4a3a5b0ba38cf8300582504ffc072c4b4582d4d1 diff --git a/eng/Versions.props b/eng/Versions.props index 812bd6d64fa3..c4129850df49 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23408.8 - 6.0.317-servicing.23408.8 + 6.0.317-servicing.23409.16 + 6.0.317-servicing.23409.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 14f5e6b15b38d00384047f85bd4ac669457a1231 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 17:49:53 +0000 Subject: [PATCH 1005/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23415.27 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++--------- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 3 files changed, 66 insertions(+), 78 deletions(-) diff --git a/NuGet.config b/NuGet.config index f27f973a5773..98c2f6245cc3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,19 @@ - - - + + - - - - - - + @@ -46,21 +40,15 @@ - - - + + - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9a07d5677a3..62d6bee3ae86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - abf876d5642725dcfc24748308ba5fe849d6fab7 + 80c31bae826a31d33443ddcce33ac3c1f2d6f7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - abf876d5642725dcfc24748308ba5fe849d6fab7 + 80c31bae826a31d33443ddcce33ac3c1f2d6f7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 0e63a4c51e83395143e12eb3df9d1de0081905f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + ccb899fabb951da0ce4ada295ab2783170aacef8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 76663d25f708..a10ada7e507e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.21-servicing.23364.6 + 6.0.22-servicing.23409.7 - 6.0.21-servicing.23364.5 + 6.0.22-servicing.23409.17 @@ -44,20 +44,20 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.22 + 6.0.22 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 0.2.0 - 6.0.414-servicing.23409.9 - 6.0.414-servicing.23409.9 + 6.0.414-servicing.23415.27 + 6.0.414-servicing.23415.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23414.22 + 6.0.22-servicing.23414.22 + 6.0.22 + 6.0.22 + 6.0.22 + 6.0.22 2.1.0 - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23410.4 + 6.0.22-servicing.23410.4 + 6.0.22 + 6.0.22 From a54f92707fbea8a4ae52c3ed3263eb530248febf Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 15 Aug 2023 18:25:56 +0000 Subject: [PATCH 1006/1244] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.21-servicing.23367.3 to 6.0.22-servicing.23410.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.21-servicing.23367.3 to 6.0.22-servicing.23410.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.21-servicing.23364.38 to 6.0.22-servicing.23415.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.21-servicing.23364.38 to 6.0.22-servicing.23415.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.21-servicing.23364.38 to 6.0.22-servicing.23415.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.21-servicing.23364.38 to 6.0.22-servicing.23415.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.316 to 6.0.317 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.316-servicing.23363.10 to 6.0.317-servicing.23410.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.316 to 6.0.317 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.21-servicing.23364.6 to 6.0.22-servicing.23409.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.21-servicing.23364.5 to 6.0.22-servicing.23409.17 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 26 ++++-------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 86 deletions(-) diff --git a/NuGet.config b/NuGet.config index a6c9c345eca4..41960ca45df2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,20 @@ - - - + + - - - + - - - + @@ -46,20 +41,15 @@ - - - + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb5994d3bba3..7a429bf9016a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + 82d2a38fd04a1db368e48280fd60da635c8988c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + 82d2a38fd04a1db368e48280fd60da635c8988c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + 82d2a38fd04a1db368e48280fd60da635c8988c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a3a5b0ba38cf8300582504ffc072c4b4582d4d1 + b97627e7dfff543aec01fb1cafe5016a934b3c2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a3a5b0ba38cf8300582504ffc072c4b4582d4d1 + b97627e7dfff543aec01fb1cafe5016a934b3c2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 0e63a4c51e83395143e12eb3df9d1de0081905f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + ccb899fabb951da0ce4ada295ab2783170aacef8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dab8cd878ee2..d3e52d9a6448 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.21-servicing.23364.6 + 6.0.22-servicing.23409.7 - 6.0.21-servicing.23364.5 + 6.0.22-servicing.23409.17 - 6.0.316 + 6.0.317 @@ -44,20 +44,20 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.22 + 6.0.22 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 0.2.0 - 6.0.317-servicing.23409.16 - 6.0.317-servicing.23409.16 + 6.0.317-servicing.23415.28 + 6.0.317-servicing.23415.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23414.22 + 6.0.22-servicing.23414.22 + 6.0.22 + 6.0.22 + 6.0.22 + 6.0.22 2.1.0 - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23410.4 + 6.0.22-servicing.23410.4 + 6.0.22 + 6.0.22 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.316 + 6.0.317 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 9496edd76d185be0be2375b23c06a6d5bba008c6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 21:51:17 +0000 Subject: [PATCH 1007/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.43 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23415.43 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.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 98c2f6245cc3..770aaf731a99 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,9 +14,10 @@ - + + @@ -43,9 +44,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62d6bee3ae86..b2e17d56021a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80c31bae826a31d33443ddcce33ac3c1f2d6f7bf + 1d9b4b0dc0d0c47dd9f2959aad442d4d54cb0861 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80c31bae826a31d33443ddcce33ac3c1f2d6f7bf + 1d9b4b0dc0d0c47dd9f2959aad442d4d54cb0861 diff --git a/eng/Versions.props b/eng/Versions.props index a10ada7e507e..0002da27c84f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.413 + 6.0.414 @@ -56,8 +56,8 @@ - 6.0.414-servicing.23415.27 - 6.0.414-servicing.23415.27 + 6.0.414-servicing.23415.43 + 6.0.414-servicing.23415.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23414.22 - 6.0.22-servicing.23414.22 + 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.3 6.0.22 6.0.22 6.0.22 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.413 + 6.0.414 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 05e8f967633a5cb7292f4ca74e4798c076e0165d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 21:51:35 +0000 Subject: [PATCH 1008/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.42 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23415.28 -> To Version 6.0.317-servicing.23415.42 Dependency coherency updates 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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.22-servicing.23414.22 -> To Version 6.0.22-servicing.23415.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 41960ca45df2..98bb498d375c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,10 +14,10 @@ - + - + @@ -44,9 +44,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a429bf9016a..84c0190a15aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82d2a38fd04a1db368e48280fd60da635c8988c0 + ec605f4126da7a5d8bf87437887ebdbf2d523b14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82d2a38fd04a1db368e48280fd60da635c8988c0 + ec605f4126da7a5d8bf87437887ebdbf2d523b14 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82d2a38fd04a1db368e48280fd60da635c8988c0 + ec605f4126da7a5d8bf87437887ebdbf2d523b14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b97627e7dfff543aec01fb1cafe5016a934b3c2f + 2d2e78bf4ab78e3853609d953c2d9c7a302204d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b97627e7dfff543aec01fb1cafe5016a934b3c2f + 2d2e78bf4ab78e3853609d953c2d9c7a302204d0 diff --git a/eng/Versions.props b/eng/Versions.props index d3e52d9a6448..60aa1eeac071 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23415.28 - 6.0.317-servicing.23415.28 + 6.0.317-servicing.23415.42 + 6.0.317-servicing.23415.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23414.22 - 6.0.22-servicing.23414.22 + 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.3 6.0.22 6.0.22 6.0.22 From 18862d431c696379569985e36be608b3b97f0b14 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 23:47:21 +0000 Subject: [PATCH 1009/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.54 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23415.54 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.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 770aaf731a99..c537de64273c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -41,13 +41,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2e17d56021a..05893bc10af6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa + c01790a7867594b5690846097ee6132e8ab43730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa + c01790a7867594b5690846097ee6132e8ab43730 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa + c01790a7867594b5690846097ee6132e8ab43730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d9b4b0dc0d0c47dd9f2959aad442d4d54cb0861 + a2b41011e7c7aeab6e671e50888686b4ded9b437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d9b4b0dc0d0c47dd9f2959aad442d4d54cb0861 + a2b41011e7c7aeab6e671e50888686b4ded9b437 diff --git a/eng/Versions.props b/eng/Versions.props index 0002da27c84f..362ce3c9bc45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 0.2.0 - 6.0.414-servicing.23415.43 - 6.0.414-servicing.23415.43 + 6.0.414-servicing.23415.54 + 6.0.414-servicing.23415.54 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e4bc155f49ee15f38d88f8fbf85964c5c2681d0f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 23:47:53 +0000 Subject: [PATCH 1010/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.55 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23415.28 -> To Version 6.0.317-servicing.23415.55 Dependency coherency updates 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 From Version 6.0.22-servicing.23414.22 -> To Version 6.0.22-servicing.23415.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 98bb498d375c..4138eba4e302 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -41,12 +41,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84c0190a15aa..21c833ce48d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ec605f4126da7a5d8bf87437887ebdbf2d523b14 + edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ec605f4126da7a5d8bf87437887ebdbf2d523b14 + edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ec605f4126da7a5d8bf87437887ebdbf2d523b14 + edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d2e78bf4ab78e3853609d953c2d9c7a302204d0 + d46d5b9980f0635c0b5a532bc674aa79626ca6a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d2e78bf4ab78e3853609d953c2d9c7a302204d0 + d46d5b9980f0635c0b5a532bc674aa79626ca6a3 diff --git a/eng/Versions.props b/eng/Versions.props index 60aa1eeac071..5bc002f36fc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 0.2.0 - 6.0.317-servicing.23415.42 - 6.0.317-servicing.23415.42 + 6.0.317-servicing.23415.55 + 6.0.317-servicing.23415.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 59f938949d658dce176aa88d81c2482539ea43c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 18:51:57 +0000 Subject: [PATCH 1011/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23416.21 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.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++---- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++-------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index c537de64273c..61be111e9dc6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + @@ -41,16 +41,16 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05893bc10af6..e3e33729bf44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + d13a7c399c119654dfc02eac26c4b31ab16a5cfe - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + d13a7c399c119654dfc02eac26c4b31ab16a5cfe - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + d13a7c399c119654dfc02eac26c4b31ab16a5cfe https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + d13a7c399c119654dfc02eac26c4b31ab16a5cfe - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c01790a7867594b5690846097ee6132e8ab43730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a2b41011e7c7aeab6e671e50888686b4ded9b437 + 9eb5f6c42ff0c1c7a9dd98484521ec68a5080bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a2b41011e7c7aeab6e671e50888686b4ded9b437 + 9eb5f6c42ff0c1c7a9dd98484521ec68a5080bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0e63a4c51e83395143e12eb3df9d1de0081905f8 + 8e49f7f69149415593f0da365cae4ffdecb07c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ccb899fabb951da0ce4ada295ab2783170aacef8 + 7b82fc319b73beb7dd40ff77bd4c9403711b35a7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 362ce3c9bc45..54b7f57fba4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23409.7 + 6.0.22-servicing.23415.9 - 6.0.22-servicing.23409.17 + 6.0.22-servicing.23415.8 @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 0.2.0 - 6.0.414-servicing.23415.54 - 6.0.414-servicing.23415.54 + 6.0.414-servicing.23416.21 + 6.0.414-servicing.23416.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23415.3 - 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.11 + 6.0.22-servicing.23415.11 6.0.22 6.0.22 6.0.22 @@ -78,8 +78,8 @@ - 6.0.22-servicing.23410.4 - 6.0.22-servicing.23410.4 + 6.0.22-servicing.23415.6 + 6.0.22-servicing.23415.6 6.0.22 6.0.22 From 72d2deba7eb1a864c64096b531804b3a5bb242cc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 21:27:38 +0000 Subject: [PATCH 1012/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23416.39 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.21 -> To Version 6.0.22 (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 61be111e9dc6..434639dcd15f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3e33729bf44..1da055bfe9fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c01790a7867594b5690846097ee6132e8ab43730 + acea295c10b625d213c7e8abeab109e73c9d3cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c01790a7867594b5690846097ee6132e8ab43730 + acea295c10b625d213c7e8abeab109e73c9d3cac https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c01790a7867594b5690846097ee6132e8ab43730 + acea295c10b625d213c7e8abeab109e73c9d3cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9eb5f6c42ff0c1c7a9dd98484521ec68a5080bc6 + 18cfeb734a1799183382e0c264d748cd71c9cdc5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9eb5f6c42ff0c1c7a9dd98484521ec68a5080bc6 + 18cfeb734a1799183382e0c264d748cd71c9cdc5 diff --git a/eng/Versions.props b/eng/Versions.props index 54b7f57fba4d..6c627b3e6d9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23416.21 - 6.0.414-servicing.23416.21 + 6.0.414-servicing.23416.39 + 6.0.414-servicing.23416.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 44c6374ceef623446e16cddad997a071b18a2eb0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 22:28:31 +0000 Subject: [PATCH 1013/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.49 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23416.49 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.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- 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 434639dcd15f..3a4103200e1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1da055bfe9fa..1c26110b6027 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d13a7c399c119654dfc02eac26c4b31ab16a5cfe + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d13a7c399c119654dfc02eac26c4b31ab16a5cfe + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d13a7c399c119654dfc02eac26c4b31ab16a5cfe + 22cc81b45d1c04f1bf12a6acda58e341704a2858 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d13a7c399c119654dfc02eac26c4b31ab16a5cfe + 22cc81b45d1c04f1bf12a6acda58e341704a2858 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating acea295c10b625d213c7e8abeab109e73c9d3cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18cfeb734a1799183382e0c264d748cd71c9cdc5 + d055edde5a61e6d7bad86a41ada7a7b2779f5891 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18cfeb734a1799183382e0c264d748cd71c9cdc5 + d055edde5a61e6d7bad86a41ada7a7b2779f5891 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8e49f7f69149415593f0da365cae4ffdecb07c22 + 0db2312765488a8a77ba6cef692fa53c636a47e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7b82fc319b73beb7dd40ff77bd4c9403711b35a7 + 6e6b474ef5222e55160a289e666bc156f4718f66 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6c627b3e6d9e..27b45b91b7bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23415.9 + 6.0.22-servicing.23416.4 - 6.0.22-servicing.23415.8 + 6.0.22-servicing.23416.8 @@ -56,8 +56,8 @@ - 6.0.414-servicing.23416.39 - 6.0.414-servicing.23416.39 + 6.0.414-servicing.23416.49 + 6.0.414-servicing.23416.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.22-servicing.23415.6 - 6.0.22-servicing.23415.6 + 6.0.22-servicing.23416.7 + 6.0.22-servicing.23416.7 6.0.22 6.0.22 From 2cfcee6fcad216c8fbd654858b776c51dbbf07bb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:23:22 +0000 Subject: [PATCH 1014/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.48 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23415.55 -> To Version 6.0.317-servicing.23416.48 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.22 -> To Version 6.0.22 (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 4138eba4e302..45ce906adc8d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21c833ce48d7..4cbf0f69c1e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + 22cc81b45d1c04f1bf12a6acda58e341704a2858 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 + c132c1c5651cb4b2e83a539e2de599d549f24f52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 + c132c1c5651cb4b2e83a539e2de599d549f24f52 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 + c132c1c5651cb4b2e83a539e2de599d549f24f52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d46d5b9980f0635c0b5a532bc674aa79626ca6a3 + 09ea5708c6f6e29fe6db2e24a45665cdaca90e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d46d5b9980f0635c0b5a532bc674aa79626ca6a3 + 09ea5708c6f6e29fe6db2e24a45665cdaca90e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0e63a4c51e83395143e12eb3df9d1de0081905f8 + 0db2312765488a8a77ba6cef692fa53c636a47e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ccb899fabb951da0ce4ada295ab2783170aacef8 + 6e6b474ef5222e55160a289e666bc156f4718f66 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5bc002f36fc4..4f00b6c2ccf1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23409.7 + 6.0.22-servicing.23416.4 - 6.0.22-servicing.23409.17 + 6.0.22-servicing.23416.8 @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 0.2.0 - 6.0.317-servicing.23415.55 - 6.0.317-servicing.23415.55 + 6.0.317-servicing.23416.48 + 6.0.317-servicing.23416.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23415.3 - 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.11 + 6.0.22-servicing.23415.11 6.0.22 6.0.22 6.0.22 @@ -78,8 +78,8 @@ - 6.0.22-servicing.23410.4 - 6.0.22-servicing.23410.4 + 6.0.22-servicing.23416.7 + 6.0.22-servicing.23416.7 6.0.22 6.0.22 From 084700ab5c8cbe7e2a66cb328f14979e55bd1ac3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 15:53:19 +0000 Subject: [PATCH 1015/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23416.48 -> To Version 6.0.317-servicing.23425.24 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.22 -> To Version 6.0.22 (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 45ce906adc8d..e250238a3d19 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cbf0f69c1e4..1f5ca2132bae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c132c1c5651cb4b2e83a539e2de599d549f24f52 + 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c132c1c5651cb4b2e83a539e2de599d549f24f52 + 1f521522b17430e3760fd09760e77822b0bd891b https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c132c1c5651cb4b2e83a539e2de599d549f24f52 + 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09ea5708c6f6e29fe6db2e24a45665cdaca90e9c + da716438f260441518b4f7d9962ced9814769669 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09ea5708c6f6e29fe6db2e24a45665cdaca90e9c + da716438f260441518b4f7d9962ced9814769669 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0db2312765488a8a77ba6cef692fa53c636a47e9 + 53190af510e57c1c146bd8a23725509771a42ae0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6e6b474ef5222e55160a289e666bc156f4718f66 + f501934867fd4723518c1c7b03c6033c2e52ecad https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4f00b6c2ccf1..107032483634 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23416.4 + 6.0.22-servicing.23424.7 - 6.0.22-servicing.23416.8 + 6.0.22-servicing.23425.2 @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 0.2.0 - 6.0.317-servicing.23416.48 - 6.0.317-servicing.23416.48 + 6.0.317-servicing.23425.24 + 6.0.317-servicing.23425.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23415.11 - 6.0.22-servicing.23415.11 + 6.0.22-servicing.23424.25 + 6.0.22-servicing.23424.25 6.0.22 6.0.22 6.0.22 @@ -78,8 +78,8 @@ - 6.0.22-servicing.23416.7 - 6.0.22-servicing.23416.7 + 6.0.22-servicing.23425.2 + 6.0.22-servicing.23425.2 6.0.22 6.0.22 From 7806d7511ad97589e42ad415e1d740131fc451a1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 18:40:03 +0000 Subject: [PATCH 1016/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.32 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23416.49 -> To Version 6.0.414-servicing.23425.32 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.22 -> To Version 6.0.22 (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 3a4103200e1f..19715c85a36c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c26110b6027..2dbb1a3e0f5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - acea295c10b625d213c7e8abeab109e73c9d3cac + ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - acea295c10b625d213c7e8abeab109e73c9d3cac + ce2a08ace580a06ac3ea0291222f5e550c9f32b4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - acea295c10b625d213c7e8abeab109e73c9d3cac + ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d055edde5a61e6d7bad86a41ada7a7b2779f5891 + e15f4d6367b5030f0ae7f604e8f50bdc63c534a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d055edde5a61e6d7bad86a41ada7a7b2779f5891 + e15f4d6367b5030f0ae7f604e8f50bdc63c534a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0db2312765488a8a77ba6cef692fa53c636a47e9 + 53190af510e57c1c146bd8a23725509771a42ae0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6e6b474ef5222e55160a289e666bc156f4718f66 + f501934867fd4723518c1c7b03c6033c2e52ecad https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 27b45b91b7bb..4ff72a28c2e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23416.4 + 6.0.22-servicing.23424.7 - 6.0.22-servicing.23416.8 + 6.0.22-servicing.23425.2 @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 0.2.0 - 6.0.414-servicing.23416.49 - 6.0.414-servicing.23416.49 + 6.0.414-servicing.23425.32 + 6.0.414-servicing.23425.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23415.11 - 6.0.22-servicing.23415.11 + 6.0.22-servicing.23424.25 + 6.0.22-servicing.23424.25 6.0.22 6.0.22 6.0.22 @@ -78,8 +78,8 @@ - 6.0.22-servicing.23416.7 - 6.0.22-servicing.23416.7 + 6.0.22-servicing.23425.2 + 6.0.22-servicing.23425.2 6.0.22 6.0.22 From 47d41a3d1a0b6e4fe7c5573749a3d7738c1f537c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:26:54 -0700 Subject: [PATCH 1017/1244] Update branding to 6.0.318 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index acfa240d83dd..e74a2d23fd25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 17 + 18 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c0954c6acae2cc7ef58ad877382e593deaf1659f Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:26:58 -0700 Subject: [PATCH 1018/1244] Update branding to 6.0.415 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 10e567eb828e..583c355f0165 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 14 + 15 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 2a16f1dc25a48f15ac9c12e162efba05189a0cad Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Sep 2023 06:38:35 +0000 Subject: [PATCH 1019/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230903.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23425.32 -> To Version 6.0.415-servicing.23453.14 --- 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 19715c85a36c..93ca57aa00b9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -41,15 +49,23 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dbb1a3e0f5b..943621e2c12f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e15f4d6367b5030f0ae7f604e8f50bdc63c534a4 + 773c8fa80b99eb0c34ea2fef6f62b7b6c9572e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e15f4d6367b5030f0ae7f604e8f50bdc63c534a4 + 773c8fa80b99eb0c34ea2fef6f62b7b6c9572e16 diff --git a/eng/Versions.props b/eng/Versions.props index ff1a589eeaa1..6b98cb91a0b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23425.32 - 6.0.414-servicing.23425.32 + 6.0.415-servicing.23453.14 + 6.0.415-servicing.23453.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6807af5fa294b3bf54bb69d11109e9708f731802 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Sep 2023 06:38:49 +0000 Subject: [PATCH 1020/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230903.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23425.24 -> To Version 6.0.318-servicing.23453.13 --- 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 e250238a3d19..5ab3f8a77291 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -41,14 +49,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f5ca2132bae..0b56af244541 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da716438f260441518b4f7d9962ced9814769669 + 9acb30f9c8cdf9cdaeb015bcd3060ae5f47593d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da716438f260441518b4f7d9962ced9814769669 + 9acb30f9c8cdf9cdaeb015bcd3060ae5f47593d7 diff --git a/eng/Versions.props b/eng/Versions.props index c09ac1668ae1..382b65062f42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23425.24 - 6.0.317-servicing.23425.24 + 6.0.318-servicing.23453.13 + 6.0.318-servicing.23453.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8e50270c0263caf58a2ddbfb433d79bd13269608 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 5 Sep 2023 22:18:53 +0000 Subject: [PATCH 1021/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230905.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23425.32 -> To Version 6.0.415-servicing.23455.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 943621e2c12f..e049614819dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 773c8fa80b99eb0c34ea2fef6f62b7b6c9572e16 + 28c87748d7a868cf2c76751dff51c86986daa119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 773c8fa80b99eb0c34ea2fef6f62b7b6c9572e16 + 28c87748d7a868cf2c76751dff51c86986daa119 diff --git a/eng/Versions.props b/eng/Versions.props index 6b98cb91a0b3..0626526a0146 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23453.14 - 6.0.415-servicing.23453.14 + 6.0.415-servicing.23455.22 + 6.0.415-servicing.23455.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 73452f5f4a13217b91365404a1678666468819e5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Sep 2023 22:08:31 +0000 Subject: [PATCH 1022/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230912.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23425.32 -> To Version 6.0.415-servicing.23462.23 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 93ca57aa00b9..44835ce43ef1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,6 @@ - - - @@ -54,9 +51,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e049614819dd..34c1303e2a6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 28c87748d7a868cf2c76751dff51c86986daa119 + 8e1ee785d23839ac8aaa6342c18b3e54dadfe455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 28c87748d7a868cf2c76751dff51c86986daa119 + 8e1ee785d23839ac8aaa6342c18b3e54dadfe455 diff --git a/eng/Versions.props b/eng/Versions.props index 0626526a0146..6e3c23478473 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23455.22 - 6.0.415-servicing.23455.22 + 6.0.415-servicing.23462.23 + 6.0.415-servicing.23462.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6264b298a6d14bf72f590d440ec049b6d21c9197 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 02:54:58 +0000 Subject: [PATCH 1023/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230912.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23453.13 -> To Version 6.0.318-servicing.23462.21 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ab3f8a77291..0aa32e6a4ff3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,6 @@ - - - @@ -54,9 +51,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b56af244541..753126b6fc0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9acb30f9c8cdf9cdaeb015bcd3060ae5f47593d7 + bde28e9622b697cba0e61f43849b5de4f0e98347 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9acb30f9c8cdf9cdaeb015bcd3060ae5f47593d7 + bde28e9622b697cba0e61f43849b5de4f0e98347 diff --git a/eng/Versions.props b/eng/Versions.props index 382b65062f42..8e263f8b691d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23453.13 - 6.0.318-servicing.23453.13 + 6.0.318-servicing.23462.21 + 6.0.318-servicing.23462.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15eea5a29ab3cc5df81f3ed7d7f25c3f95064d15 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 03:43:17 +0000 Subject: [PATCH 1024/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.46 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23463.46 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.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 26 ++++--------- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44835ce43ef1..6a25c9a80260 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,20 @@ - - - + + - - - + - - - + @@ -46,21 +41,16 @@ - - - + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34c1303e2a6a..06f1f3e462e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + cfe8d97fc70cdbd7558f051c9223ca89be77df54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + cfe8d97fc70cdbd7558f051c9223ca89be77df54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + cfe8d97fc70cdbd7558f051c9223ca89be77df54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + cfe8d97fc70cdbd7558f051c9223ca89be77df54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce2a08ace580a06ac3ea0291222f5e550c9f32b4 + ba8fbae6f29754311fcf890aad8bb00820c3b65e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce2a08ace580a06ac3ea0291222f5e550c9f32b4 + ba8fbae6f29754311fcf890aad8bb00820c3b65e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce2a08ace580a06ac3ea0291222f5e550c9f32b4 + ba8fbae6f29754311fcf890aad8bb00820c3b65e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1ee785d23839ac8aaa6342c18b3e54dadfe455 + c9240dd9140b5117632d40de3f3cf980ff83c6ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1ee785d23839ac8aaa6342c18b3e54dadfe455 + c9240dd9140b5117632d40de3f3cf980ff83c6ea diff --git a/eng/Versions.props b/eng/Versions.props index 6e3c23478473..a7d42034498e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.414 + 6.0.415 @@ -44,20 +44,20 @@ - 6.0.22 - 6.0.22 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 0.2.0 - 6.0.415-servicing.23462.23 - 6.0.415-servicing.23462.23 + 6.0.415-servicing.23463.46 + 6.0.415-servicing.23463.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.22-servicing.23424.25 - 6.0.22-servicing.23424.25 - 6.0.22 - 6.0.22 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23463.4 + 6.0.23-servicing.23463.4 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 - 6.0.22-servicing.23425.2 - 6.0.22-servicing.23425.2 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23462.4 + 6.0.23-servicing.23462.4 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.414 + 6.0.415 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 9ab857dce44ebdd4e8dac1d3dff49589e9424e29 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 07:42:20 +0000 Subject: [PATCH 1025/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.60 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23463.60 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,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6a25c9a80260..42aed78b740b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06f1f3e462e7..b9d845f882c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfe8d97fc70cdbd7558f051c9223ca89be77df54 + df6cc30b54e470fdfee7d71e714f7f1432ace282 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfe8d97fc70cdbd7558f051c9223ca89be77df54 + df6cc30b54e470fdfee7d71e714f7f1432ace282 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfe8d97fc70cdbd7558f051c9223ca89be77df54 + df6cc30b54e470fdfee7d71e714f7f1432ace282 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfe8d97fc70cdbd7558f051c9223ca89be77df54 + df6cc30b54e470fdfee7d71e714f7f1432ace282 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ba8fbae6f29754311fcf890aad8bb00820c3b65e + 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ba8fbae6f29754311fcf890aad8bb00820c3b65e + 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ba8fbae6f29754311fcf890aad8bb00820c3b65e + 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9240dd9140b5117632d40de3f3cf980ff83c6ea + 4f50f5dd1cc48971bca7be3d95195a8e6e32e97f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9240dd9140b5117632d40de3f3cf980ff83c6ea + 4f50f5dd1cc48971bca7be3d95195a8e6e32e97f https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 53190af510e57c1c146bd8a23725509771a42ae0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f501934867fd4723518c1c7b03c6033c2e52ecad + a6196493264b681cd16a58b74d3da84811386fa9 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a7d42034498e..15bf289fe4ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.22-servicing.23425.2 + 6.0.23-servicing.23431.6 @@ -56,8 +56,8 @@ - 6.0.415-servicing.23463.46 - 6.0.415-servicing.23463.46 + 6.0.415-servicing.23463.60 + 6.0.415-servicing.23463.60 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.23-servicing.23462.4 - 6.0.23-servicing.23462.4 + 6.0.23-servicing.23463.2 + 6.0.23-servicing.23463.2 6.0.23 6.0.23 From 0ed8d7158da8b13d00756a37c1dd29dbe34bf93c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 17:35:45 +0000 Subject: [PATCH 1026/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23464.19 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.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- 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 42aed78b740b..51e6e1dd2525 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9d845f882c4..18a39cefc088 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - df6cc30b54e470fdfee7d71e714f7f1432ace282 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - df6cc30b54e470fdfee7d71e714f7f1432ace282 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - df6cc30b54e470fdfee7d71e714f7f1432ace282 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - df6cc30b54e470fdfee7d71e714f7f1432ace282 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f50f5dd1cc48971bca7be3d95195a8e6e32e97f + 0bb452bba5d0d1a2378193fe763df581dc76339c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f50f5dd1cc48971bca7be3d95195a8e6e32e97f + 0bb452bba5d0d1a2378193fe763df581dc76339c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53190af510e57c1c146bd8a23725509771a42ae0 + 4c9c993698c298801739cd2dc25efa7ffe700bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a6196493264b681cd16a58b74d3da84811386fa9 + 823450756bc26a13c44a96ea190c46a77c526e04 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 15bf289fe4ec..9e34a774cb74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23424.7 + 6.0.23-servicing.23463.14 - 6.0.23-servicing.23431.6 + 6.0.23-servicing.23463.7 @@ -56,8 +56,8 @@ - 6.0.415-servicing.23463.60 - 6.0.415-servicing.23463.60 + 6.0.415-servicing.23464.19 + 6.0.415-servicing.23464.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.23-servicing.23463.2 - 6.0.23-servicing.23463.2 + 6.0.23-servicing.23463.6 + 6.0.23-servicing.23463.6 6.0.23 6.0.23 From 5e9c53ca9843e83de00382b2ef3919e5feb162c8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:51:18 +0000 Subject: [PATCH 1027/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23464.25 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.22 -> To Version 6.0.23 (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 18a39cefc088..9e6b3d96f7f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bb452bba5d0d1a2378193fe763df581dc76339c + 338ab1c7fe914679dbaf78e77bb3afd2e95ee977 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bb452bba5d0d1a2378193fe763df581dc76339c + 338ab1c7fe914679dbaf78e77bb3afd2e95ee977 diff --git a/eng/Versions.props b/eng/Versions.props index 9e34a774cb74..35c9af552949 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23464.19 - 6.0.415-servicing.23464.19 + 6.0.415-servicing.23464.25 + 6.0.415-servicing.23464.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b44c73fce852268e0e627739c9fc6842c518cf24 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:01:17 +0000 Subject: [PATCH 1028/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.45 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23462.21 -> To Version 6.0.318-servicing.23463.45 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0aa32e6a4ff3..be2607241a6e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -46,9 +43,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 753126b6fc0c..88d054e0fa59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bde28e9622b697cba0e61f43849b5de4f0e98347 + 7e6a12638532bd726caa01aed96158dd470bc538 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bde28e9622b697cba0e61f43849b5de4f0e98347 + 7e6a12638532bd726caa01aed96158dd470bc538 diff --git a/eng/Versions.props b/eng/Versions.props index 8e263f8b691d..e78f5d7886c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23462.21 - 6.0.318-servicing.23462.21 + 6.0.318-servicing.23463.45 + 6.0.318-servicing.23463.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4c490d9a0d88cef00ad97433687236d4c28b0afc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:01:27 +0000 Subject: [PATCH 1029/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.61 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23463.45 -> To Version 6.0.318-servicing.23463.61 --- 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 88d054e0fa59..0c105831fbda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7e6a12638532bd726caa01aed96158dd470bc538 + 9226ebcce20dfffd1593fbe19cef750b6ba7e475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7e6a12638532bd726caa01aed96158dd470bc538 + 9226ebcce20dfffd1593fbe19cef750b6ba7e475 diff --git a/eng/Versions.props b/eng/Versions.props index e78f5d7886c1..ceecff1e6736 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23463.45 - 6.0.318-servicing.23463.45 + 6.0.318-servicing.23463.61 + 6.0.318-servicing.23463.61 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0ed281191dbbd082e199e4fcc50ecfe587484944 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:01:50 +0000 Subject: [PATCH 1030/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23463.61 -> To Version 6.0.318-servicing.23464.18 --- 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 0c105831fbda..dee72f8fa533 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9226ebcce20dfffd1593fbe19cef750b6ba7e475 + 52033f2cb4eb64e2d12a8aa44d0d711d9129b161 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9226ebcce20dfffd1593fbe19cef750b6ba7e475 + 52033f2cb4eb64e2d12a8aa44d0d711d9129b161 diff --git a/eng/Versions.props b/eng/Versions.props index ceecff1e6736..f5d9ef0eb433 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23463.61 - 6.0.318-servicing.23463.61 + 6.0.318-servicing.23464.18 + 6.0.318-servicing.23464.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e162d9d227b823e5839be61f726faada708f6ef Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:01:59 +0000 Subject: [PATCH 1031/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23464.18 -> To Version 6.0.318-servicing.23464.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 dee72f8fa533..bb8e425deadf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 52033f2cb4eb64e2d12a8aa44d0d711d9129b161 + c67a7250452612429c36b96267a51b42c1c439e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 52033f2cb4eb64e2d12a8aa44d0d711d9129b161 + c67a7250452612429c36b96267a51b42c1c439e4 diff --git a/eng/Versions.props b/eng/Versions.props index f5d9ef0eb433..f7041417660d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23464.18 - 6.0.318-servicing.23464.18 + 6.0.318-servicing.23464.26 + 6.0.318-servicing.23464.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1c181baebd833c5bf9e5955563d5c72e5fcb2eaf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:02:17 +0000 Subject: [PATCH 1032/1244] 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.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++++------ eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index be2607241a6e..6c6b54ba2b52 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,20 @@ + + - - - + - - - + @@ -43,17 +41,15 @@ + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb8e425deadf..6092a1ba6f23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 https://github.com/dotnet/test-templates @@ -90,18 +90,18 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f521522b17430e3760fd09760e77822b0bd891b + cc63749868db135f5a7998ca9c07e57a800692bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f521522b17430e3760fd09760e77822b0bd891b + cc63749868db135f5a7998ca9c07e57a800692bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f521522b17430e3760fd09760e77822b0bd891b + cc63749868db135f5a7998ca9c07e57a800692bc https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ c67a7250452612429c36b96267a51b42c1c439e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53190af510e57c1c146bd8a23725509771a42ae0 + 4c9c993698c298801739cd2dc25efa7ffe700bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f501934867fd4723518c1c7b03c6033c2e52ecad + 823450756bc26a13c44a96ea190c46a77c526e04 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f7041417660d..5e1564329d95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.22-servicing.23424.7 + 6.0.23-servicing.23463.14 - 6.0.22-servicing.23425.2 + 6.0.23-servicing.23463.7 - 6.0.317 + 6.0.318 @@ -44,12 +44,12 @@ - 6.0.22 - 6.0.22 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 0.2.0 @@ -68,20 +68,20 @@ - 6.0.22-servicing.23424.25 - 6.0.22-servicing.23424.25 - 6.0.22 - 6.0.22 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23463.4 + 6.0.23-servicing.23463.4 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 - 6.0.22-servicing.23425.2 - 6.0.22-servicing.23425.2 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23463.6 + 6.0.23-servicing.23463.6 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.317 + 6.0.318 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 8b382fe097c29350d2c611d67827ee896bee10e2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Sep 2023 18:28:18 +0000 Subject: [PATCH 1033/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23464.25 -> To Version 6.0.415-servicing.23469.18 --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 51e6e1dd2525..136aa9b39fd4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,12 +16,15 @@ + + + @@ -41,15 +45,19 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e6b3d96f7f7..9af9ba25cfca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 338ab1c7fe914679dbaf78e77bb3afd2e95ee977 + ac1b8a8f81ddb3ad0a9274f520f88071cde80cdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 338ab1c7fe914679dbaf78e77bb3afd2e95ee977 + ac1b8a8f81ddb3ad0a9274f520f88071cde80cdf diff --git a/eng/Versions.props b/eng/Versions.props index 35c9af552949..92f74a94ae06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23464.25 - 6.0.415-servicing.23464.25 + 6.0.415-servicing.23469.18 + 6.0.415-servicing.23469.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6e0cd88c50bf40d9843c899a57feda92f6be52cb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Sep 2023 18:28:33 +0000 Subject: [PATCH 1034/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23464.26 -> To Version 6.0.318-servicing.23469.15 --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6c6b54ba2b52..bf0ae613fdd0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,12 +16,15 @@ + + + @@ -41,14 +45,18 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6092a1ba6f23..2812d6ba0d5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating cc63749868db135f5a7998ca9c07e57a800692bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c67a7250452612429c36b96267a51b42c1c439e4 + d1e4f2398a36bff5b0ff25cf8bf0d9745b8dd356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c67a7250452612429c36b96267a51b42c1c439e4 + d1e4f2398a36bff5b0ff25cf8bf0d9745b8dd356 diff --git a/eng/Versions.props b/eng/Versions.props index 5e1564329d95..558257ec154e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23464.26 - 6.0.318-servicing.23464.26 + 6.0.318-servicing.23469.15 + 6.0.318-servicing.23469.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 03c33a186a1ff4982c846da5c3959661227e07dc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 00:05:59 +0000 Subject: [PATCH 1035/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.35 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.415-servicing.23477.35 Dependency coherency updates 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 From Version 6.0.21-servicing.23363.11 -> To Version 6.0.23-servicing.23475.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++----------------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 32 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index f27f973a5773..99b3e6dd76ab 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,17 @@ - - - + - - - - - - @@ -46,21 +38,13 @@ - - - + - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c3d54c5e4bd..f67f720d045b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 3c299ae525000e4dd138b22c0f549110625876ed - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 171bf8e96b7a11471a40fcd6b0376b435e895de8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 171bf8e96b7a11471a40fcd6b0376b435e895de8 diff --git a/eng/Versions.props b/eng/Versions.props index 583c355f0165..5040b1d4c71c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.413-servicing.23367.15 - 6.0.413-servicing.23367.15 + 6.0.415-servicing.23477.35 + 6.0.415-servicing.23477.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23475.15 + 6.0.23-servicing.23475.15 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 From 76098239700644026ba4f70272223dca59719c1b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 00:06:19 +0000 Subject: [PATCH 1036/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.318-servicing.23477.33 Dependency coherency updates 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 From Version 6.0.21-servicing.23363.11 -> To Version 6.0.23-servicing.23475.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 32 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 237478e93ac2..8203ce00b0b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,17 @@ - - + - - @@ -41,15 +38,12 @@ - - + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62db8623ab0f..c1eb9571daf1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 3c299ae525000e4dd138b22c0f549110625876ed - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68456cae299435babf6fe194ec79e305275985f9 + c275f388513a7ca17defaea62bb9ac8a275a59d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68456cae299435babf6fe194ec79e305275985f9 + c275f388513a7ca17defaea62bb9ac8a275a59d7 diff --git a/eng/Versions.props b/eng/Versions.props index e74a2d23fd25..68eec28c905d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.316-servicing.23367.14 - 6.0.316-servicing.23367.14 + 6.0.318-servicing.23477.33 + 6.0.318-servicing.23477.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23475.15 + 6.0.23-servicing.23475.15 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 From 22dd334fe1c5aee46acec0c75c606f21a73a8ac6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:08:48 +0000 Subject: [PATCH 1037/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.33 -> To Version 6.0.318-servicing.23477.41 --- 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 c1eb9571daf1..5ede60723652 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c275f388513a7ca17defaea62bb9ac8a275a59d7 + 65842b2844d354fbda32a61a5f974a7df74dd4ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c275f388513a7ca17defaea62bb9ac8a275a59d7 + 65842b2844d354fbda32a61a5f974a7df74dd4ae diff --git a/eng/Versions.props b/eng/Versions.props index 68eec28c905d..bb3592c897e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23477.33 - 6.0.318-servicing.23477.33 + 6.0.318-servicing.23477.41 + 6.0.318-servicing.23477.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48ec5bfab962997cee4fbaf6ae41d1950c56e0fe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:08:57 +0000 Subject: [PATCH 1038/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.53 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.41 -> To Version 6.0.318-servicing.23477.53 --- 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 5ede60723652..510204ec61e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 65842b2844d354fbda32a61a5f974a7df74dd4ae + cccbf1c1f105af16ad122b53c6d35702e41b55e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 65842b2844d354fbda32a61a5f974a7df74dd4ae + cccbf1c1f105af16ad122b53c6d35702e41b55e4 diff --git a/eng/Versions.props b/eng/Versions.props index bb3592c897e4..c433b43a29e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23477.41 - 6.0.318-servicing.23477.41 + 6.0.318-servicing.23477.53 + 6.0.318-servicing.23477.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1be7383da96fa85394061f5fb7915ea896dfa567 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:09:05 +0000 Subject: [PATCH 1039/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.57 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.53 -> To Version 6.0.318-servicing.23477.57 --- 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 510204ec61e3..cf878fa54c40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cccbf1c1f105af16ad122b53c6d35702e41b55e4 + c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cccbf1c1f105af16ad122b53c6d35702e41b55e4 + c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 diff --git a/eng/Versions.props b/eng/Versions.props index c433b43a29e0..ccdad7c14ed8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23477.53 - 6.0.318-servicing.23477.53 + 6.0.318-servicing.23477.57 + 6.0.318-servicing.23477.57 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f079309f9336248845ca2bfdfa65910cff1a2a8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:09:12 +0000 Subject: [PATCH 1040/1244] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++++ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 50 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8203ce00b0b4..8855eb812e7f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -16,8 +17,10 @@ + + @@ -38,12 +41,15 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf878fa54c40..b91e3ccdb471 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 https://github.com/dotnet/test-templates @@ -90,18 +90,18 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + a71fcc8c6464214b05c6bbadd5b7385fb88f30fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + a71fcc8c6464214b05c6bbadd5b7385fb88f30fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + a71fcc8c6464214b05c6bbadd5b7385fb88f30fe https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + 5bef1839b6b4a882df7813165abc368f070659f0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ccdad7c14ed8..af7e134fab03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.21-servicing.23364.6 + 6.0.23-servicing.23477.14 - 6.0.21-servicing.23364.5 + 6.0.23-servicing.23477.3 - 6.0.316 + 6.0.318 @@ -44,12 +44,12 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 0.2.0 @@ -78,10 +78,10 @@ - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23477.7 + 6.0.23-servicing.23477.7 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.316 + 6.0.318 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From d1579c4f20e5f83e8a5a61dbd08b958a8ac7a0d2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:19 +0000 Subject: [PATCH 1041/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.42 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.35 -> To Version 6.0.415-servicing.23477.42 --- 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 f67f720d045b..4b55484dc882 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 171bf8e96b7a11471a40fcd6b0376b435e895de8 + dabc0c64866617f84f21cdb5d87db6a50e4e5144 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 171bf8e96b7a11471a40fcd6b0376b435e895de8 + dabc0c64866617f84f21cdb5d87db6a50e4e5144 diff --git a/eng/Versions.props b/eng/Versions.props index 5040b1d4c71c..2c7878bd4df7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23477.35 - 6.0.415-servicing.23477.35 + 6.0.415-servicing.23477.42 + 6.0.415-servicing.23477.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7ca72019f042f532536608a27e9e558a30122eba Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:27 +0000 Subject: [PATCH 1042/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.52 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.42 -> To Version 6.0.415-servicing.23477.52 --- 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 4b55484dc882..8ca09bc8aa3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dabc0c64866617f84f21cdb5d87db6a50e4e5144 + 64040b68463b7933255af3d3e2193586fe259d98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dabc0c64866617f84f21cdb5d87db6a50e4e5144 + 64040b68463b7933255af3d3e2193586fe259d98 diff --git a/eng/Versions.props b/eng/Versions.props index 2c7878bd4df7..49d76812f58d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23477.42 - 6.0.415-servicing.23477.42 + 6.0.415-servicing.23477.52 + 6.0.415-servicing.23477.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2191d456f60e9afb47945a2fa2b4acbc27824a8f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:34 +0000 Subject: [PATCH 1043/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.56 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.52 -> To Version 6.0.415-servicing.23477.56 --- 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 8ca09bc8aa3f..f82d016f4605 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 64040b68463b7933255af3d3e2193586fe259d98 + baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 64040b68463b7933255af3d3e2193586fe259d98 + baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 diff --git a/eng/Versions.props b/eng/Versions.props index 49d76812f58d..dca8bdc9e7b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23477.52 - 6.0.415-servicing.23477.52 + 6.0.415-servicing.23477.56 + 6.0.415-servicing.23477.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84b8c178115a1afda0a1a364792751987fcc14c8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:42 +0000 Subject: [PATCH 1044/1244] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++++ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 50 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99b3e6dd76ab..b92191712e4b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -16,8 +17,10 @@ + + @@ -38,13 +41,16 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f82d016f4605..f7baaa28093b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 https://github.com/dotnet/test-templates @@ -90,18 +90,18 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + 5bef1839b6b4a882df7813165abc368f070659f0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dca8bdc9e7b8..ed174f841a99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.21-servicing.23364.6 + 6.0.23-servicing.23477.14 - 6.0.21-servicing.23364.5 + 6.0.23-servicing.23477.3 - 6.0.413 + 6.0.415 @@ -44,12 +44,12 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 0.2.0 @@ -78,10 +78,10 @@ - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23477.7 + 6.0.23-servicing.23477.7 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.413 + 6.0.415 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From a15f83f24a4b485de776e9564075d6fe7cad1b9a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:03:51 +0000 Subject: [PATCH 1045/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.69 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.57 -> To Version 6.0.318-servicing.23479.69 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,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,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.23 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++------ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8855eb812e7f..64a1657f121d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b91e3ccdb471..d79f3bb69a84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,21 +3,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -25,7 +25,7 @@ https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a71fcc8c6464214b05c6bbadd5b7385fb88f30fe + c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a71fcc8c6464214b05c6bbadd5b7385fb88f30fe + c57972a193acf770588f8e8ef64cec082b27800c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a71fcc8c6464214b05c6bbadd5b7385fb88f30fe + c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 + 9f5cb3400f5877845decdddd2c17d57cf77f2202 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 + 9f5cb3400f5877845decdddd2c17d57cf77f2202 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 + 5589f30c2c75e37b50934791b7f98e26973b03c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5bef1839b6b4a882df7813165abc368f070659f0 + 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index af7e134fab03..f653777896d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23477.14 + 6.0.23-servicing.23479.10 - 6.0.23-servicing.23477.3 + 6.0.23-servicing.23479.5 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 0.2.0 - 6.0.318-servicing.23477.57 - 6.0.318-servicing.23477.57 + 6.0.318-servicing.23479.69 + 6.0.318-servicing.23479.69 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23475.15 - 6.0.23-servicing.23475.15 + 6.0.23-servicing.23479.5 + 6.0.23-servicing.23479.5 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23477.7 - 6.0.23-servicing.23477.7 + 6.0.23-servicing.23479.7 + 6.0.23-servicing.23479.7 6.0.23 6.0.23 From 7e2be1f5074f3df4b492d2f08181a23d041b4c68 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:04:00 +0000 Subject: [PATCH 1046/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.70 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.56 -> To Version 6.0.415-servicing.23479.70 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,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,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.23 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++------ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index b92191712e4b..a14489bf7eab 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7baaa28093b..2c06860d82da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,21 +3,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -25,7 +25,7 @@ https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 + 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 + 1b2b001a14ddb53823315e675b8d2936c9965918 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 + 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 + 41584f8690a6d383db4c980ff4279dada7d1dd0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 + 41584f8690a6d383db4c980ff4279dada7d1dd0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 + 5589f30c2c75e37b50934791b7f98e26973b03c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5bef1839b6b4a882df7813165abc368f070659f0 + 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ed174f841a99..77d04c9bfe07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23477.14 + 6.0.23-servicing.23479.10 - 6.0.23-servicing.23477.3 + 6.0.23-servicing.23479.5 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 0.2.0 - 6.0.415-servicing.23477.56 - 6.0.415-servicing.23477.56 + 6.0.415-servicing.23479.70 + 6.0.415-servicing.23479.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23475.15 - 6.0.23-servicing.23475.15 + 6.0.23-servicing.23479.5 + 6.0.23-servicing.23479.5 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23477.7 - 6.0.23-servicing.23477.7 + 6.0.23-servicing.23479.7 + 6.0.23-servicing.23479.7 6.0.23 6.0.23 From dffc87a32c4cb34338e5eff2e05ef1f6ef26df36 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:03 +0000 Subject: [PATCH 1047/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.70 -> To Version 6.0.415-servicing.23479.30 --- 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 2c06860d82da..c727f2dcc2be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + 29bac7a5cef32b4fdd69a79799040347ab4c62fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + 29bac7a5cef32b4fdd69a79799040347ab4c62fc diff --git a/eng/Versions.props b/eng/Versions.props index 77d04c9bfe07..94567f8c9d98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.70 - 6.0.415-servicing.23479.70 + 6.0.415-servicing.23479.30 + 6.0.415-servicing.23479.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 187b820af2fb72e8fc52a6c08fe47ae2b9896f60 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:04 +0000 Subject: [PATCH 1048/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.28 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.69 -> To Version 6.0.318-servicing.23479.28 --- 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 d79f3bb69a84..bfde77346b21 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f5cb3400f5877845decdddd2c17d57cf77f2202 + 16495d6f58f9d2d6bd9557c66b7d316c53716c7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f5cb3400f5877845decdddd2c17d57cf77f2202 + 16495d6f58f9d2d6bd9557c66b7d316c53716c7e diff --git a/eng/Versions.props b/eng/Versions.props index f653777896d2..167a78ad8439 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.69 - 6.0.318-servicing.23479.69 + 6.0.318-servicing.23479.28 + 6.0.318-servicing.23479.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 76985f56fb3dba1609c07f38a96da85069959957 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:10 +0000 Subject: [PATCH 1049/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.30 -> To Version 6.0.415-servicing.23479.40 --- 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 c727f2dcc2be..9e254f0b3488 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29bac7a5cef32b4fdd69a79799040347ab4c62fc + 798f74fcb6e86c328f6c55cb96907752e0164611 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29bac7a5cef32b4fdd69a79799040347ab4c62fc + 798f74fcb6e86c328f6c55cb96907752e0164611 diff --git a/eng/Versions.props b/eng/Versions.props index 94567f8c9d98..f8f42a4149c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.30 - 6.0.415-servicing.23479.30 + 6.0.415-servicing.23479.40 + 6.0.415-servicing.23479.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ae70e87b345305f93583de3ce2aa60ddc9a84c3c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:11 +0000 Subject: [PATCH 1050/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.38 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.28 -> To Version 6.0.318-servicing.23479.38 --- 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 bfde77346b21..cf99c59384eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 16495d6f58f9d2d6bd9557c66b7d316c53716c7e + b0bd2676d5b0079cd4382d62ebf95d6532b4d168 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 16495d6f58f9d2d6bd9557c66b7d316c53716c7e + b0bd2676d5b0079cd4382d62ebf95d6532b4d168 diff --git a/eng/Versions.props b/eng/Versions.props index 167a78ad8439..3892fbbd0a58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.28 - 6.0.318-servicing.23479.28 + 6.0.318-servicing.23479.38 + 6.0.318-servicing.23479.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f68ad03f61c60c15f139226c4aae0119b7d35e60 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:17 +0000 Subject: [PATCH 1051/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.47 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.40 -> To Version 6.0.415-servicing.23479.47 --- 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 9e254f0b3488..aa6ea5906e9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 798f74fcb6e86c328f6c55cb96907752e0164611 + 1767ce68cb9f27c42d55f34d6f0901153f29d5ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 798f74fcb6e86c328f6c55cb96907752e0164611 + 1767ce68cb9f27c42d55f34d6f0901153f29d5ee diff --git a/eng/Versions.props b/eng/Versions.props index f8f42a4149c2..c56f8747ddfb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.40 - 6.0.415-servicing.23479.40 + 6.0.415-servicing.23479.47 + 6.0.415-servicing.23479.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 364dc4c268098f6b1756acb9d252fc05ef8ea4d4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:19 +0000 Subject: [PATCH 1052/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.46 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.38 -> To Version 6.0.318-servicing.23479.46 --- 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 cf99c59384eb..12f20cd4afeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0bd2676d5b0079cd4382d62ebf95d6532b4d168 + e29368ee2d5f2b5a0bbdbda6374d7a1cf6775b18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0bd2676d5b0079cd4382d62ebf95d6532b4d168 + e29368ee2d5f2b5a0bbdbda6374d7a1cf6775b18 diff --git a/eng/Versions.props b/eng/Versions.props index 3892fbbd0a58..d73c574b78a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.38 - 6.0.318-servicing.23479.38 + 6.0.318-servicing.23479.46 + 6.0.318-servicing.23479.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 68bd681d7c03f3c7c61c66ebc18bb4c8539d11d0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:24 +0000 Subject: [PATCH 1053/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.56 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.47 -> To Version 6.0.415-servicing.23479.56 --- 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 aa6ea5906e9b..dc6793b959cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1767ce68cb9f27c42d55f34d6f0901153f29d5ee + 6e7f11dfd675ac9a715426914d081d0522bf325c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1767ce68cb9f27c42d55f34d6f0901153f29d5ee + 6e7f11dfd675ac9a715426914d081d0522bf325c diff --git a/eng/Versions.props b/eng/Versions.props index c56f8747ddfb..6e00936c8503 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.47 - 6.0.415-servicing.23479.47 + 6.0.415-servicing.23479.56 + 6.0.415-servicing.23479.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 27d1988d9b494a43620f4e3b6b9d6f33fe249a26 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:27 +0000 Subject: [PATCH 1054/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.55 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.46 -> To Version 6.0.318-servicing.23479.55 --- 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 12f20cd4afeb..6dc7d39e92ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e29368ee2d5f2b5a0bbdbda6374d7a1cf6775b18 + 556a86c4113dc00918dc5f5af33c8947f9ec63ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e29368ee2d5f2b5a0bbdbda6374d7a1cf6775b18 + 556a86c4113dc00918dc5f5af33c8947f9ec63ff diff --git a/eng/Versions.props b/eng/Versions.props index d73c574b78a8..932a00ae508e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.46 - 6.0.318-servicing.23479.46 + 6.0.318-servicing.23479.55 + 6.0.318-servicing.23479.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d93ea239eefc0c499f3e92060ac88bbb121df4ed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:31 +0000 Subject: [PATCH 1055/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.70 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.56 -> To Version 6.0.415-servicing.23479.70 --- 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 dc6793b959cd..2c06860d82da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7f11dfd675ac9a715426914d081d0522bf325c + 41584f8690a6d383db4c980ff4279dada7d1dd0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7f11dfd675ac9a715426914d081d0522bf325c + 41584f8690a6d383db4c980ff4279dada7d1dd0a diff --git a/eng/Versions.props b/eng/Versions.props index 6e00936c8503..77d04c9bfe07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.56 - 6.0.415-servicing.23479.56 + 6.0.415-servicing.23479.70 + 6.0.415-servicing.23479.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 00e0950ae1b407ea194fafc0b76266e0df3d2f78 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:35 +0000 Subject: [PATCH 1056/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.69 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.55 -> To Version 6.0.318-servicing.23479.69 --- 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 6dc7d39e92ce..d79f3bb69a84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 556a86c4113dc00918dc5f5af33c8947f9ec63ff + 9f5cb3400f5877845decdddd2c17d57cf77f2202 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 556a86c4113dc00918dc5f5af33c8947f9ec63ff + 9f5cb3400f5877845decdddd2c17d57cf77f2202 diff --git a/eng/Versions.props b/eng/Versions.props index 932a00ae508e..f653777896d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.55 - 6.0.318-servicing.23479.55 + 6.0.318-servicing.23479.69 + 6.0.318-servicing.23479.69 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 462a63808716c6525ede956568cdd8df6d25f575 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 30 Sep 2023 17:58:22 +0000 Subject: [PATCH 1057/1244] Merged PR 34149: [internal/release/frameshift/6.0.4xx] 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.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.415 to 6.0.415 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.415-rtm.23479.11 to 6.0.415-rtm.23480.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.415 to 6.0.415 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.23-servicing.23479.10 to 6.0.23-servicing.23480.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.P... --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------ 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index a14489bf7eab..23ad3ebc89e8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c06860d82da..e4e4285671d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1b2b001a14ddb53823315e675b8d2936c9965918 + c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1b2b001a14ddb53823315e675b8d2936c9965918 + c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1b2b001a14ddb53823315e675b8d2936c9965918 + c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5589f30c2c75e37b50934791b7f98e26973b03c4 + a8ba4b39b59ca421254550010de48b33d7c7b57d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec + 2b6f0273734c631e1ecc8c503836d4fab840065b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 77d04c9bfe07..fae520d6b853 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23479.10 + 6.0.23-servicing.23480.3 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 0.2.0 - 6.0.415-servicing.23479.70 - 6.0.415-servicing.23479.70 + 6.0.415-servicing.23480.28 + 6.0.415-servicing.23480.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23479.5 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23479.7 - 6.0.23-servicing.23479.7 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 From df92e2d472598c60ecd99f7094f3ee05012a66bc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 30 Sep 2023 18:06:47 +0000 Subject: [PATCH 1058/1244] Merged PR 34152: [internal/release/frameshift/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.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.318 to 6.0.318 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.318-servicing.23479.12 to 6.0.318-servicing.23480.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.318 to 6.0.318 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.23-servicing.23479.10 to 6.0.23-servicing.23480.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.... --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------ 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 64a1657f121d..c8e5ee130a13 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d79f3bb69a84..f0ac19843222 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c57972a193acf770588f8e8ef64cec082b27800c + 81b4aff895d7eaab61aa000a696f7bc79fc49b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c57972a193acf770588f8e8ef64cec082b27800c + 81b4aff895d7eaab61aa000a696f7bc79fc49b70 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c57972a193acf770588f8e8ef64cec082b27800c + 81b4aff895d7eaab61aa000a696f7bc79fc49b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f5cb3400f5877845decdddd2c17d57cf77f2202 + 080adee382cb58e12355903e015f96891d78dad4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f5cb3400f5877845decdddd2c17d57cf77f2202 + 080adee382cb58e12355903e015f96891d78dad4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5589f30c2c75e37b50934791b7f98e26973b03c4 + a8ba4b39b59ca421254550010de48b33d7c7b57d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec + 2b6f0273734c631e1ecc8c503836d4fab840065b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f653777896d2..053fce3fc34a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23479.10 + 6.0.23-servicing.23480.3 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 0.2.0 - 6.0.318-servicing.23479.69 - 6.0.318-servicing.23479.69 + 6.0.318-servicing.23480.29 + 6.0.318-servicing.23480.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23479.5 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23479.7 - 6.0.23-servicing.23479.7 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 From 6963d2d1e0eb7c42b773f62b1d34fe34a7182d17 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:15:18 +0000 Subject: [PATCH 1059/1244] Merged PR 34160: [internal/release/frameshift/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:972ce726-6675-4ba6-cadf-08dbbf3cebf2) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 972ce726-6675-4ba6-cadf-08dbbf3cebf2 - **Build**: 20230930.38 - **Date Produced**: October 1, 2023 1:52:12 AM UTC - **Commit**: bb5ae4829da51d315033bedb73116477b0390cd3 - **Branch**: refs/heads/internal/release/frameshift/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.415-servicing.23480.28 to 6.0.415-servicing.23480.38][1] - **Microsoft.NET.Sdk**: [from 6.0.415-servicing.23480.28 to 6.0.415-servicing.23480.38][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCfe3cff583e&targetVersion=GCbb5ae4829d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:972ce726-6675-4ba6-cadf-08dbbf3cebf2) --- 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 e4e4285671d2..05566786f4be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 + bb5ae4829da51d315033bedb73116477b0390cd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 + bb5ae4829da51d315033bedb73116477b0390cd3 diff --git a/eng/Versions.props b/eng/Versions.props index fae520d6b853..ef5eb1b77b90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23480.28 - 6.0.415-servicing.23480.28 + 6.0.415-servicing.23480.38 + 6.0.415-servicing.23480.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bcbed60f06e45836728bb36dbb2ddfc52572b787 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:15:28 +0000 Subject: [PATCH 1060/1244] Merged PR 34162: [internal/release/frameshift/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:faa69491-4c9a-4477-752f-08dbbf92e774) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: faa69491-4c9a-4477-752f-08dbbf92e774 - **Build**: 20230930.39 - **Date Produced**: October 1, 2023 1:52:26 AM UTC - **Commit**: 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 - **Branch**: refs/heads/internal/release/frameshift/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.318-servicing.23480.29 to 6.0.318-servicing.23480.39][1] - **Microsoft.NET.Sdk**: [from 6.0.318-servicing.23480.29 to 6.0.318-servicing.23480.39][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC080adee382&targetVersion=GC40c58ac25e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:faa69491-4c9a-4477-752f-08dbbf92e774) --- 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 f0ac19843222..0c2c995c7d10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 81b4aff895d7eaab61aa000a696f7bc79fc49b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 080adee382cb58e12355903e015f96891d78dad4 + 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 080adee382cb58e12355903e015f96891d78dad4 + 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 diff --git a/eng/Versions.props b/eng/Versions.props index 053fce3fc34a..90e7220b7abd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23480.29 - 6.0.318-servicing.23480.29 + 6.0.318-servicing.23480.39 + 6.0.318-servicing.23480.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8bc78a3797571a573b60b68394441ae5b5d49ed6 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:39 -0700 Subject: [PATCH 1061/1244] Update branding to 6.0.319 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c09ac1668ae1..c3fbc4677622 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 18 + 19 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From b29045dcd48dbbf1944d5de492a12245900ea5f1 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:44 -0700 Subject: [PATCH 1062/1244] Update branding to 6.0.416 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ff1a589eeaa1..8652359008b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 15 + 16 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From f756140b8eee50f121c7bf0644a5bc749c690c57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:25:14 +0000 Subject: [PATCH 1063/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#17516) [release/6.0.4xx] Update dependencies from dotnet/arcade --- NuGet.config | 20 ++++++++- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 2 +- eng/common/retain-build.ps1 | 45 +++++++++++++++++++++ eng/common/templates/steps/retain-build.yml | 28 +++++++++++++ global.json | 6 +-- 6 files changed, 101 insertions(+), 12 deletions(-) create mode 100644 eng/common/retain-build.ps1 create mode 100644 eng/common/templates/steps/retain-build.yml diff --git a/NuGet.config b/NuGet.config index 23ad3ebc89e8..9401b3f646e0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -15,12 +14,21 @@ + + + + + + + + + @@ -41,15 +49,23 @@ - + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05566786f4be..688060474822 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f4ece0e9283d..fac630493c97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23408.5 + 6.0.0-beta.23511.8 diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1 new file mode 100644 index 000000000000..e7ba975adeb6 --- /dev/null +++ b/eng/common/retain-build.ps1 @@ -0,0 +1,45 @@ + +Param( +[Parameter(Mandatory=$true)][int] $buildId, +[Parameter(Mandatory=$true)][string] $azdoOrgUri, +[Parameter(Mandatory=$true)][string] $azdoProject, +[Parameter(Mandatory=$true)][string] $token +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +function Get-AzDOHeaders( + [string] $token) +{ + $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}")) + $headers = @{"Authorization"="Basic $base64AuthInfo"} + return $headers +} + +function Update-BuildRetention( + [string] $azdoOrgUri, + [string] $azdoProject, + [int] $buildId, + [string] $token) +{ + $headers = Get-AzDOHeaders -token $token + $requestBody = "{ + `"keepForever`": `"true`" + }" + + $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0" + write-Host "Attempting to retain build using the following URI: ${requestUri} ..." + + try { + Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json" + Write-Host "Updated retention settings for build ${buildId}." + } + catch { + Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" + exit 1 + } +} + +Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token +exit 0 diff --git a/eng/common/templates/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml new file mode 100644 index 000000000000..83d97a26a01f --- /dev/null +++ b/eng/common/templates/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/global.json b/global.json index 327cfe0275d9..eeff7fa000b4 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.121", + "dotnet": "6.0.123", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23511.8" } } From 840b7beac01c3376738e4da921a8064e2afee502 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Oct 2023 20:17:59 +0000 Subject: [PATCH 1064/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231013.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23480.39 -> To Version 6.0.319-servicing.23513.16 --- NuGet.config | 8 -------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index c8e5ee130a13..2cf5556c3e9c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c2c995c7d10..df851c72d19e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 81b4aff895d7eaab61aa000a696f7bc79fc49b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 + 70f5e33478a0cc2ae99c727511247cc74e408544 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 + 70f5e33478a0cc2ae99c727511247cc74e408544 diff --git a/eng/Versions.props b/eng/Versions.props index e5ac3afbe076..7a04c643a166 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23480.39 - 6.0.318-servicing.23480.39 + 6.0.319-servicing.23513.16 + 6.0.319-servicing.23513.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b8ce6a3057fc379935649aaa1b62b250632f91f8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Oct 2023 20:19:04 +0000 Subject: [PATCH 1065/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231013.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23480.38 -> To Version 6.0.416-servicing.23513.17 --- NuGet.config | 24 ------------------------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9401b3f646e0..03d3587a670c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,22 +13,10 @@ - - - - - - - - - - - - @@ -51,22 +39,10 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 688060474822..b54aec9a8177 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb5ae4829da51d315033bedb73116477b0390cd3 + 1b0c19415d2cc4637c04d49b4c23379da28682e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb5ae4829da51d315033bedb73116477b0390cd3 + 1b0c19415d2cc4637c04d49b4c23379da28682e9 diff --git a/eng/Versions.props b/eng/Versions.props index fac630493c97..c91639786fe7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23480.38 - 6.0.415-servicing.23480.38 + 6.0.416-servicing.23513.17 + 6.0.416-servicing.23513.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 950032c4d9f3e431ccd7b83093ad994c569c63d2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Oct 2023 23:30:50 +0000 Subject: [PATCH 1066/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231016.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.416-servicing.23513.17 -> To Version 6.0.416-servicing.23516.24 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.23 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03d3587a670c..53591c247fe8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,12 +41,16 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b54aec9a8177..6a1d0831c8dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 + 520dd9c4ea44753c16fc626380009570ff53b278 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 + 520dd9c4ea44753c16fc626380009570ff53b278 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 + 520dd9c4ea44753c16fc626380009570ff53b278 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b0c19415d2cc4637c04d49b4c23379da28682e9 + 4f02fd3d297b48ce03104a1b58e704a60a82c6c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b0c19415d2cc4637c04d49b4c23379da28682e9 + 4f02fd3d297b48ce03104a1b58e704a60a82c6c9 diff --git a/eng/Versions.props b/eng/Versions.props index 3b9e698d227c..a9cd00b3b30c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.415 + 6.0.416 @@ -44,20 +44,20 @@ - 6.0.23 - 6.0.23 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 + 6.0.24 + 6.0.24 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 0.2.0 - 6.0.416-servicing.23513.17 - 6.0.416-servicing.23513.17 + 6.0.416-servicing.23516.24 + 6.0.416-servicing.23516.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.23-servicing.23480.2 - 6.0.23-servicing.23480.2 - 6.0.23 - 6.0.23 - 6.0.23 - 6.0.23 + 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.12 + 6.0.24 + 6.0.24 + 6.0.24 + 6.0.24 2.1.0 - 6.0.23-servicing.23480.2 - 6.0.23-servicing.23480.2 - 6.0.23 - 6.0.23 + 6.0.24-servicing.23513.4 + 6.0.24-servicing.23513.4 + 6.0.24 + 6.0.24 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.415 + 6.0.416 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From eb37878032dc22e56ce8108d343ecffe07fbf842 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Oct 2023 23:32:10 +0000 Subject: [PATCH 1067/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231016.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23513.16 -> To Version 6.0.319-servicing.23516.23 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.23 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cf5556c3e9c..61c4019bfb40 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,11 +41,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df851c72d19e..e651222058da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81b4aff895d7eaab61aa000a696f7bc79fc49b70 + 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81b4aff895d7eaab61aa000a696f7bc79fc49b70 + 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81b4aff895d7eaab61aa000a696f7bc79fc49b70 + 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70f5e33478a0cc2ae99c727511247cc74e408544 + e76a4b93ff235181ccf4ed1e52a256a16e2e576e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70f5e33478a0cc2ae99c727511247cc74e408544 + e76a4b93ff235181ccf4ed1e52a256a16e2e576e diff --git a/eng/Versions.props b/eng/Versions.props index 7a04c643a166..ddd5ddbd0e5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.318 + 6.0.319 @@ -44,20 +44,20 @@ - 6.0.23 - 6.0.23 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 + 6.0.24 + 6.0.24 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 0.2.0 - 6.0.319-servicing.23513.16 - 6.0.319-servicing.23513.16 + 6.0.319-servicing.23516.23 + 6.0.319-servicing.23516.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.23-servicing.23480.2 - 6.0.23-servicing.23480.2 - 6.0.23 - 6.0.23 - 6.0.23 - 6.0.23 + 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.12 + 6.0.24 + 6.0.24 + 6.0.24 + 6.0.24 2.1.0 - 6.0.23-servicing.23480.2 - 6.0.23-servicing.23480.2 - 6.0.23 - 6.0.23 + 6.0.24-servicing.23513.4 + 6.0.24-servicing.23513.4 + 6.0.24 + 6.0.24 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.318 + 6.0.319 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From a7e0e0daac5311c134955e8205d31f7b37079b0b Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 17 Oct 2023 11:24:02 -0700 Subject: [PATCH 1068/1244] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fb41f0badd6f..57a4b6415199 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 From 5b5d340010ffee9d33d876d4315ab0b59177a0f7 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 17 Oct 2023 11:25:03 -0700 Subject: [PATCH 1069/1244] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fb41f0badd6f..57a4b6415199 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 From e1a3176c64e0ccfad779d27a7c3bb71f408544d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Oct 2023 23:08:30 +0000 Subject: [PATCH 1070/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23516.23 -> To Version 6.0.319-servicing.23517.22 Dependency coherency updates 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 From Version 6.0.24-servicing.23516.12 -> To Version 6.0.24-servicing.23516.31 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 61c4019bfb40..a92c5c68cdcc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,12 +41,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e651222058da..c2a0aef57a1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 + 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 + 519f9badec1482e692fe0008611e4da847ad3b16 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 + 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e76a4b93ff235181ccf4ed1e52a256a16e2e576e + c11217ab79113ced4cab9bf694abd9abac5116d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e76a4b93ff235181ccf4ed1e52a256a16e2e576e + c11217ab79113ced4cab9bf694abd9abac5116d1 diff --git a/eng/Versions.props b/eng/Versions.props index ddd5ddbd0e5d..8427352b2c47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 0.2.0 - 6.0.319-servicing.23516.23 - 6.0.319-servicing.23516.23 + 6.0.319-servicing.23517.22 + 6.0.319-servicing.23517.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.24-servicing.23516.12 - 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.31 + 6.0.24-servicing.23516.31 6.0.24 6.0.24 6.0.24 From 74953cad9260d2bdc2732a314191c2b80d9fe0d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Oct 2023 23:51:30 +0000 Subject: [PATCH 1071/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.46 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.416-servicing.23516.24 -> To Version 6.0.416-servicing.23517.46 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.24 -> To Version 6.0.24 (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 53591c247fe8..135568420b56 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a1d0831c8dc..bb6f487b8ae8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 520dd9c4ea44753c16fc626380009570ff53b278 + 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 520dd9c4ea44753c16fc626380009570ff53b278 + 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 520dd9c4ea44753c16fc626380009570ff53b278 + 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f02fd3d297b48ce03104a1b58e704a60a82c6c9 + 946bd1a99dfca001c7799ac1d54eb1011725459c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f02fd3d297b48ce03104a1b58e704a60a82c6c9 + 946bd1a99dfca001c7799ac1d54eb1011725459c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a8ba4b39b59ca421254550010de48b33d7c7b57d + c1396d66ff3d595b912cd5f96d6f4651427ecfcd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2b6f0273734c631e1ecc8c503836d4fab840065b + 54f99d916b6630956d732099722d5e4dbfcd2825 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a9cd00b3b30c..71976afad131 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23480.3 + 6.0.24-servicing.23513.4 - 6.0.23-servicing.23480.2 + 6.0.24-servicing.23516.7 @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 0.2.0 - 6.0.416-servicing.23516.24 - 6.0.416-servicing.23516.24 + 6.0.416-servicing.23517.46 + 6.0.416-servicing.23517.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.24-servicing.23516.12 - 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.31 + 6.0.24-servicing.23516.31 6.0.24 6.0.24 6.0.24 @@ -78,8 +78,8 @@ - 6.0.24-servicing.23513.4 - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 6.0.24 6.0.24 From 3b8e5ee01323f3d60c486e523d68f56a04304932 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:30:08 -0700 Subject: [PATCH 1072/1244] Update branding to 6.0.320 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e5ac3afbe076..709738fc715a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 19 + 20 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 40538ec51933b0f2c89113aab1f8a1440f6f2262 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:30:13 -0700 Subject: [PATCH 1073/1244] Update branding to 6.0.417 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d6f2ec0e67e6..dc111971fcf3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 16 + 17 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From eea5af01f102809b4b972832fea50dfc14dac908 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 00:40:24 +0000 Subject: [PATCH 1074/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.28 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.416-servicing.23516.24 -> To Version 6.0.417-servicing.23518.28 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.24 -> To Version 6.0.24 (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 bb6f487b8ae8..32343ceae574 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 946bd1a99dfca001c7799ac1d54eb1011725459c + d36f8a9539fc68ca3c9e0f4b706790fbbfd8fa46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 946bd1a99dfca001c7799ac1d54eb1011725459c + d36f8a9539fc68ca3c9e0f4b706790fbbfd8fa46 diff --git a/eng/Versions.props b/eng/Versions.props index 71976afad131..1c73c116537b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.416-servicing.23517.46 - 6.0.416-servicing.23517.46 + 6.0.417-servicing.23518.28 + 6.0.417-servicing.23518.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 961033387a8f5eaab42005dfd4365904d1e99b37 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:02:21 +0000 Subject: [PATCH 1075/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.45 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23517.22 -> To Version 6.0.319-servicing.23517.45 --- 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 c2a0aef57a1f..1c8a6f1d42a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c11217ab79113ced4cab9bf694abd9abac5116d1 + 4117aa6ac88d4890e3fe498c9f33896871c1c434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c11217ab79113ced4cab9bf694abd9abac5116d1 + 4117aa6ac88d4890e3fe498c9f33896871c1c434 diff --git a/eng/Versions.props b/eng/Versions.props index b7277bccd0b5..8b75d729f827 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.319-servicing.23517.22 - 6.0.319-servicing.23517.22 + 6.0.319-servicing.23517.45 + 6.0.319-servicing.23517.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8cb7c225a30703ed688059c7e7faa2fcf9d8bc66 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:02:28 +0000 Subject: [PATCH 1076/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23517.45 -> To Version 6.0.320-servicing.23518.27 --- 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 1c8a6f1d42a8..99c6385fb087 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4117aa6ac88d4890e3fe498c9f33896871c1c434 + 67fb1e64b6d4a7fe38735418cfd7fe068e986713 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4117aa6ac88d4890e3fe498c9f33896871c1c434 + 67fb1e64b6d4a7fe38735418cfd7fe068e986713 diff --git a/eng/Versions.props b/eng/Versions.props index 8b75d729f827..916dd48beb24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.319-servicing.23517.45 - 6.0.319-servicing.23517.45 + 6.0.320-servicing.23518.27 + 6.0.320-servicing.23518.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7111d581d4a0b027e21af10147d50380602494d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:02:36 +0000 Subject: [PATCH 1077/1244] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.24 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index a92c5c68cdcc..b32124a2018e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -46,10 +46,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99c6385fb087..41e09eacb3c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,16 +92,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 519f9badec1482e692fe0008611e4da847ad3b16 + fef6a134b76e2a2ff3633aa1816918a3498e15ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 519f9badec1482e692fe0008611e4da847ad3b16 + fef6a134b76e2a2ff3633aa1816918a3498e15ce https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 519f9badec1482e692fe0008611e4da847ad3b16 + fef6a134b76e2a2ff3633aa1816918a3498e15ce https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 67fb1e64b6d4a7fe38735418cfd7fe068e986713 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a8ba4b39b59ca421254550010de48b33d7c7b57d + c1396d66ff3d595b912cd5f96d6f4651427ecfcd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2b6f0273734c631e1ecc8c503836d4fab840065b + 54f99d916b6630956d732099722d5e4dbfcd2825 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 916dd48beb24..a5fcd6759ee8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23480.3 + 6.0.24-servicing.23513.4 - 6.0.23-servicing.23480.2 + 6.0.24-servicing.23516.7 @@ -78,8 +78,8 @@ - 6.0.24-servicing.23513.4 - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 6.0.24 6.0.24 From d1fcad3746cde0e82979a28f98543c8848dcc8d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 03:31:36 +0000 Subject: [PATCH 1078/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.49 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23518.28 -> To Version 6.0.417-servicing.23518.49 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.24 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index 135568420b56..edf7a1141f31 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32343ceae574..1b887c2ced02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 + 1f517c83fb26e346ded88c5f5a3efa04302b23d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 + 1f517c83fb26e346ded88c5f5a3efa04302b23d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 + 1f517c83fb26e346ded88c5f5a3efa04302b23d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d36f8a9539fc68ca3c9e0f4b706790fbbfd8fa46 + 7786a00f8f7f7bb0bbccedcb8ee7c232e7df837c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d36f8a9539fc68ca3c9e0f4b706790fbbfd8fa46 + 7786a00f8f7f7bb0bbccedcb8ee7c232e7df837c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c1396d66ff3d595b912cd5f96d6f4651427ecfcd + f74130bc3ca3b606a18011ad64ac37a7ee77d514 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 54f99d916b6630956d732099722d5e4dbfcd2825 + e1722e80b8f688100d15b4b794f17e1a1779e286 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4ef90d136307..7c2f4761a9dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23516.5 - 6.0.24-servicing.23516.7 + 6.0.24-servicing.23517.2 - 6.0.416 + 6.0.417 @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 0.2.0 - 6.0.417-servicing.23518.28 - 6.0.417-servicing.23518.28 + 6.0.417-servicing.23518.49 + 6.0.417-servicing.23518.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.24-servicing.23516.31 - 6.0.24-servicing.23516.31 + 6.0.24-servicing.23517.17 + 6.0.24-servicing.23517.17 6.0.24 6.0.24 6.0.24 @@ -78,10 +78,10 @@ - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.6 + 6.0.25-servicing.23518.6 + 6.0.25 + 6.0.25 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.416 + 6.0.417 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 6a3feb228bafed59a73b095942b4135805aaa452 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 18:41:03 +0000 Subject: [PATCH 1079/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.48 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23518.27 -> To Version 6.0.320-servicing.23518.48 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.24 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index b32124a2018e..c12543dc7280 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41e09eacb3c9..8b56c64bf069 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fef6a134b76e2a2ff3633aa1816918a3498e15ce + e92b5823af697ff169d8e4235c731dc87c84abbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fef6a134b76e2a2ff3633aa1816918a3498e15ce + e92b5823af697ff169d8e4235c731dc87c84abbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fef6a134b76e2a2ff3633aa1816918a3498e15ce + e92b5823af697ff169d8e4235c731dc87c84abbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 67fb1e64b6d4a7fe38735418cfd7fe068e986713 + 2866dbcb41a3d8ee6741cc7239cb46e8fd4b0c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 67fb1e64b6d4a7fe38735418cfd7fe068e986713 + 2866dbcb41a3d8ee6741cc7239cb46e8fd4b0c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c1396d66ff3d595b912cd5f96d6f4651427ecfcd + f74130bc3ca3b606a18011ad64ac37a7ee77d514 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 54f99d916b6630956d732099722d5e4dbfcd2825 + e1722e80b8f688100d15b4b794f17e1a1779e286 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a5fcd6759ee8..38f74fd3ab6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23516.5 - 6.0.24-servicing.23516.7 + 6.0.24-servicing.23517.2 - 6.0.319 + 6.0.320 @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 0.2.0 - 6.0.320-servicing.23518.27 - 6.0.320-servicing.23518.27 + 6.0.320-servicing.23518.48 + 6.0.320-servicing.23518.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.24-servicing.23516.31 - 6.0.24-servicing.23516.31 + 6.0.24-servicing.23517.17 + 6.0.24-servicing.23517.17 6.0.24 6.0.24 6.0.24 @@ -78,10 +78,10 @@ - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.6 + 6.0.25-servicing.23518.6 + 6.0.25 + 6.0.25 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.319 + 6.0.320 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 787886101e731065e1cb46be597775f2d8e49c51 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 19:32:14 +0000 Subject: [PATCH 1080/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23518.49 -> To Version 6.0.417-servicing.23519.21 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.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index edf7a1141f31..611eb0d5d50e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b887c2ced02..f4c97df5522d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f517c83fb26e346ded88c5f5a3efa04302b23d9 + 8e4c93344f8dd182a2b71513c4cb5b6054606afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f517c83fb26e346ded88c5f5a3efa04302b23d9 + 8e4c93344f8dd182a2b71513c4cb5b6054606afe https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f517c83fb26e346ded88c5f5a3efa04302b23d9 + 8e4c93344f8dd182a2b71513c4cb5b6054606afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7786a00f8f7f7bb0bbccedcb8ee7c232e7df837c + 360b0f2714f315e8a84f3846f541385b119f52fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7786a00f8f7f7bb0bbccedcb8ee7c232e7df837c + 360b0f2714f315e8a84f3846f541385b119f52fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f74130bc3ca3b606a18011ad64ac37a7ee77d514 + 36b5a159142e33ab521c9539cd0bc92667f4b936 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e1722e80b8f688100d15b4b794f17e1a1779e286 + 38e9bcc8ba97ba9f230975df106754d27ad98401 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7c2f4761a9dd..adcbf236bff5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23516.5 + 6.0.24-servicing.23517.8 - 6.0.24-servicing.23517.2 + 6.0.24-servicing.23517.5 @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 0.2.0 - 6.0.417-servicing.23518.49 - 6.0.417-servicing.23518.49 + 6.0.417-servicing.23519.21 + 6.0.417-servicing.23519.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,18 +68,18 @@ - 6.0.24-servicing.23517.17 - 6.0.24-servicing.23517.17 - 6.0.24 - 6.0.24 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.22 + 6.0.25-servicing.23518.22 + 6.0.25 + 6.0.25 + 6.0.25 + 6.0.25 2.1.0 - 6.0.25-servicing.23518.6 - 6.0.25-servicing.23518.6 + 6.0.25-servicing.23518.9 + 6.0.25-servicing.23518.9 6.0.25 6.0.25 From 0790110b35b0761dc815f53f34d4737adc509048 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 19:32:40 +0000 Subject: [PATCH 1081/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23518.48 -> To Version 6.0.320-servicing.23519.24 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.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index c12543dc7280..4be1091d2ffe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b56c64bf069..3942ff9b2db4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92b5823af697ff169d8e4235c731dc87c84abbb + 0eaf582ac259a2a13774e0251aaebd2b28b24e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92b5823af697ff169d8e4235c731dc87c84abbb + 0eaf582ac259a2a13774e0251aaebd2b28b24e29 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92b5823af697ff169d8e4235c731dc87c84abbb + 0eaf582ac259a2a13774e0251aaebd2b28b24e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2866dbcb41a3d8ee6741cc7239cb46e8fd4b0c57 + c0fd03dbad7ac94bc2ce037617dacaffd2b2e353 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2866dbcb41a3d8ee6741cc7239cb46e8fd4b0c57 + c0fd03dbad7ac94bc2ce037617dacaffd2b2e353 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f74130bc3ca3b606a18011ad64ac37a7ee77d514 + 36b5a159142e33ab521c9539cd0bc92667f4b936 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e1722e80b8f688100d15b4b794f17e1a1779e286 + 38e9bcc8ba97ba9f230975df106754d27ad98401 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 38f74fd3ab6b..7a7fc3dbdf55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23516.5 + 6.0.24-servicing.23517.8 - 6.0.24-servicing.23517.2 + 6.0.24-servicing.23517.5 @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 0.2.0 - 6.0.320-servicing.23518.48 - 6.0.320-servicing.23518.48 + 6.0.320-servicing.23519.24 + 6.0.320-servicing.23519.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,18 +68,18 @@ - 6.0.24-servicing.23517.17 - 6.0.24-servicing.23517.17 - 6.0.24 - 6.0.24 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.22 + 6.0.25-servicing.23518.22 + 6.0.25 + 6.0.25 + 6.0.25 + 6.0.25 2.1.0 - 6.0.25-servicing.23518.6 - 6.0.25-servicing.23518.6 + 6.0.25-servicing.23518.9 + 6.0.25-servicing.23518.9 6.0.25 6.0.25 From 1782d26b3d9c3c26826aca19ee5ec7463bff85c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 22:49:11 +0000 Subject: [PATCH 1082/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.52 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23518.49 -> To Version 6.0.417-servicing.23519.52 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.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 611eb0d5d50e..c9f6519545d5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,10 +17,10 @@ - + - + @@ -41,16 +41,16 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4c97df5522d..4693ec63f237 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8e4c93344f8dd182a2b71513c4cb5b6054606afe + ce18965fe0cdaaf3676d74620365f9c1fb124ffb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8e4c93344f8dd182a2b71513c4cb5b6054606afe + ce18965fe0cdaaf3676d74620365f9c1fb124ffb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8e4c93344f8dd182a2b71513c4cb5b6054606afe + ce18965fe0cdaaf3676d74620365f9c1fb124ffb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 360b0f2714f315e8a84f3846f541385b119f52fb + c87879bb8ea4cb9022b61c3d919cd8ddc3eeef46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 360b0f2714f315e8a84f3846f541385b119f52fb + c87879bb8ea4cb9022b61c3d919cd8ddc3eeef46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 36b5a159142e33ab521c9539cd0bc92667f4b936 + 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 38e9bcc8ba97ba9f230975df106754d27ad98401 + b0a02caf5d0dd6f56f073d6616d5a3501854f632 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index adcbf236bff5..32f07a80b6ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23517.8 + 6.0.25-servicing.23518.2 - 6.0.24-servicing.23517.5 + 6.0.25-servicing.23518.13 @@ -44,20 +44,20 @@ - 6.0.24 - 6.0.24 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 + 6.0.25 + 6.0.25 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 0.2.0 - 6.0.417-servicing.23519.21 - 6.0.417-servicing.23519.21 + 6.0.417-servicing.23519.52 + 6.0.417-servicing.23519.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.25-servicing.23518.9 - 6.0.25-servicing.23518.9 + 6.0.25-servicing.23519.5 + 6.0.25-servicing.23519.5 6.0.25 6.0.25 From 7f11ce7011af0304ba33ba6151f36e0d219f7886 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 04:53:25 +0000 Subject: [PATCH 1083/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.53 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23519.24 -> To Version 6.0.320-servicing.23519.53 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4be1091d2ffe..f3c2237e67b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,10 +17,10 @@ - + - + @@ -41,15 +41,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3942ff9b2db4..721d23658533 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0eaf582ac259a2a13774e0251aaebd2b28b24e29 + e936b09bf9de0a8473a0e8964e43da4405bcc093 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0eaf582ac259a2a13774e0251aaebd2b28b24e29 + e936b09bf9de0a8473a0e8964e43da4405bcc093 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0eaf582ac259a2a13774e0251aaebd2b28b24e29 + e936b09bf9de0a8473a0e8964e43da4405bcc093 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0fd03dbad7ac94bc2ce037617dacaffd2b2e353 + 26a6bc21dd600fcd10e9acccfaf332ae35efa381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0fd03dbad7ac94bc2ce037617dacaffd2b2e353 + 26a6bc21dd600fcd10e9acccfaf332ae35efa381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 36b5a159142e33ab521c9539cd0bc92667f4b936 + 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 38e9bcc8ba97ba9f230975df106754d27ad98401 + b0a02caf5d0dd6f56f073d6616d5a3501854f632 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7a7fc3dbdf55..0743ece5d367 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23517.8 + 6.0.25-servicing.23518.2 - 6.0.24-servicing.23517.5 + 6.0.25-servicing.23518.13 @@ -44,20 +44,20 @@ - 6.0.24 - 6.0.24 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 + 6.0.25 + 6.0.25 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 0.2.0 - 6.0.320-servicing.23519.24 - 6.0.320-servicing.23519.24 + 6.0.320-servicing.23519.53 + 6.0.320-servicing.23519.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.25-servicing.23518.9 - 6.0.25-servicing.23518.9 + 6.0.25-servicing.23519.5 + 6.0.25-servicing.23519.5 6.0.25 6.0.25 From f3deb351d704d35c301460804bdc195a5569aeca Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:45:23 +0000 Subject: [PATCH 1084/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.83 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23519.52 -> To Version 6.0.417-servicing.23519.83 Dependency coherency updates 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 From Version 6.0.25-servicing.23518.22 -> To Version 6.0.25-servicing.23519.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index c9f6519545d5..f8bae50c0163 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4693ec63f237..55e842f9ecee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ce18965fe0cdaaf3676d74620365f9c1fb124ffb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c87879bb8ea4cb9022b61c3d919cd8ddc3eeef46 + bb537eda87a605857f5ae9eebe536aecbc98408a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c87879bb8ea4cb9022b61c3d919cd8ddc3eeef46 + bb537eda87a605857f5ae9eebe536aecbc98408a diff --git a/eng/Versions.props b/eng/Versions.props index 32f07a80b6ad..ab439ad00670 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.417-servicing.23519.52 - 6.0.417-servicing.23519.52 + 6.0.417-servicing.23519.83 + 6.0.417-servicing.23519.83 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.25-servicing.23518.22 - 6.0.25-servicing.23518.22 + 6.0.25-servicing.23519.12 + 6.0.25-servicing.23519.12 6.0.25 6.0.25 6.0.25 From b1162036fbcfff63d9da8a2da50f628366707852 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:46:02 +0000 Subject: [PATCH 1085/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.82 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23519.53 -> To Version 6.0.320-servicing.23519.82 Dependency coherency updates 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 From Version 6.0.25-servicing.23518.22 -> To Version 6.0.25-servicing.23519.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index f3c2237e67b7..fbb8744ae41f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 721d23658533..03aca582f4a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e936b09bf9de0a8473a0e8964e43da4405bcc093 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 26a6bc21dd600fcd10e9acccfaf332ae35efa381 + b7366aae088d555ab08fc57e69567ccea691b4e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 26a6bc21dd600fcd10e9acccfaf332ae35efa381 + b7366aae088d555ab08fc57e69567ccea691b4e6 diff --git a/eng/Versions.props b/eng/Versions.props index 0743ece5d367..b0ef76deee51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.320-servicing.23519.53 - 6.0.320-servicing.23519.53 + 6.0.320-servicing.23519.82 + 6.0.320-servicing.23519.82 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.25-servicing.23518.22 - 6.0.25-servicing.23518.22 + 6.0.25-servicing.23519.12 + 6.0.25-servicing.23519.12 6.0.25 6.0.25 6.0.25 From 72a161b24681354cf9513bd30f79bb412e127ec0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 06:34:52 +0000 Subject: [PATCH 1086/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.91 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23519.52 -> To Version 6.0.417-servicing.23519.91 Dependency coherency updates 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 From Version 6.0.25-servicing.23518.22 -> To Version 6.0.25-servicing.23519.12 (parent: Microsoft.NET.Sdk --- 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 f8bae50c0163..6559e9d6c38b 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 55e842f9ecee..e618f067f7ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ce18965fe0cdaaf3676d74620365f9c1fb124ffb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb537eda87a605857f5ae9eebe536aecbc98408a + 052e58c70a5b81648817a701972795defff693ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb537eda87a605857f5ae9eebe536aecbc98408a + 052e58c70a5b81648817a701972795defff693ce diff --git a/eng/Versions.props b/eng/Versions.props index ab439ad00670..1455eeeaf69b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.25 6.0.25 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 0.2.0 - 6.0.417-servicing.23519.83 - 6.0.417-servicing.23519.83 + 6.0.417-servicing.23519.91 + 6.0.417-servicing.23519.91 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 309221d4a91295eb09041df117055cc5ce544109 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 06:36:27 +0000 Subject: [PATCH 1087/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.93 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23519.53 -> To Version 6.0.320-servicing.23519.93 Dependency coherency updates 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 From Version 6.0.25-servicing.23518.22 -> To Version 6.0.25-servicing.23519.12 (parent: Microsoft.NET.Sdk --- 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 fbb8744ae41f..59107e7f3514 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 03aca582f4a5..1e087399ef68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e936b09bf9de0a8473a0e8964e43da4405bcc093 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b7366aae088d555ab08fc57e69567ccea691b4e6 + 486d7ad115d528ebf6aeb5906050e85da5b58da8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b7366aae088d555ab08fc57e69567ccea691b4e6 + 486d7ad115d528ebf6aeb5906050e85da5b58da8 diff --git a/eng/Versions.props b/eng/Versions.props index b0ef76deee51..5271a0ce5a4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.25 6.0.25 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 0.2.0 - 6.0.320-servicing.23519.82 - 6.0.320-servicing.23519.82 + 6.0.320-servicing.23519.93 + 6.0.320-servicing.23519.93 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3105957ad59e6b4725d27132e32608bbcc005ae5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 20:05:15 +0000 Subject: [PATCH 1088/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23519.91 -> To Version 6.0.417-servicing.23520.19 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6559e9d6c38b..fd811c61d01a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e618f067f7ae..200fde590727 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce18965fe0cdaaf3676d74620365f9c1fb124ffb + 42ab085a51763b862990e089c4b49e881d8b4e07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce18965fe0cdaaf3676d74620365f9c1fb124ffb + 42ab085a51763b862990e089c4b49e881d8b4e07 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce18965fe0cdaaf3676d74620365f9c1fb124ffb + 42ab085a51763b862990e089c4b49e881d8b4e07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 052e58c70a5b81648817a701972795defff693ce + f858ff1c05db3bd2b40d61c221ae2dc9c0fc8efe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 052e58c70a5b81648817a701972795defff693ce + f858ff1c05db3bd2b40d61c221ae2dc9c0fc8efe - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab + d4ee94199afb6c67ed448c252a07c0747c089e41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b0a02caf5d0dd6f56f073d6616d5a3501854f632 + fcec4d8986bb8339964c429abd6e4651b968ff4f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1455eeeaf69b..e3574e768d06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23518.2 + 6.0.25-servicing.23519.16 - 6.0.25-servicing.23518.13 + 6.0.25-servicing.23519.18 @@ -56,8 +56,8 @@ - 6.0.417-servicing.23519.91 - 6.0.417-servicing.23519.91 + 6.0.417-servicing.23520.19 + 6.0.417-servicing.23520.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.25-servicing.23519.5 - 6.0.25-servicing.23519.5 + 6.0.25-servicing.23520.5 + 6.0.25-servicing.23520.5 6.0.25 6.0.25 From 52a05cf6bb4171d1c19cfd331edb15de7d55649a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 20:06:41 +0000 Subject: [PATCH 1089/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23519.93 -> To Version 6.0.320-servicing.23520.20 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59107e7f3514..d23aa41a807b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -46,10 +46,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e087399ef68..93185f7d6137 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e936b09bf9de0a8473a0e8964e43da4405bcc093 + 6e525a642fe66413e4edf553f5bbc73ea5c866e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e936b09bf9de0a8473a0e8964e43da4405bcc093 + 6e525a642fe66413e4edf553f5bbc73ea5c866e5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e936b09bf9de0a8473a0e8964e43da4405bcc093 + 6e525a642fe66413e4edf553f5bbc73ea5c866e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 486d7ad115d528ebf6aeb5906050e85da5b58da8 + aba9c2c28f7e7827da7f757669e823b3c3dc831c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 486d7ad115d528ebf6aeb5906050e85da5b58da8 + aba9c2c28f7e7827da7f757669e823b3c3dc831c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab + d4ee94199afb6c67ed448c252a07c0747c089e41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b0a02caf5d0dd6f56f073d6616d5a3501854f632 + fcec4d8986bb8339964c429abd6e4651b968ff4f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5271a0ce5a4d..3b06d84bb5f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23518.2 + 6.0.25-servicing.23519.16 - 6.0.25-servicing.23518.13 + 6.0.25-servicing.23519.18 @@ -56,8 +56,8 @@ - 6.0.320-servicing.23519.93 - 6.0.320-servicing.23519.93 + 6.0.320-servicing.23520.20 + 6.0.320-servicing.23520.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.25-servicing.23519.5 - 6.0.25-servicing.23519.5 + 6.0.25-servicing.23520.5 + 6.0.25-servicing.23520.5 6.0.25 6.0.25 From 58eb78b6a0629b7f860c1f1269a70e619bb6742a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 23 Oct 2023 11:27:48 -0700 Subject: [PATCH 1090/1244] Add coherent dependency for emsdk on runtime and run an coherency update --- NuGet.config | 8 -------- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index c8e5ee130a13..2cf5556c3e9c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c2c995c7d10..761812080d99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 52e9452f82e26f9fcae791e84c082ae22f1ef66f + 3c754f28788fae642dc307a948479204e9f7dd5a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 709738fc715a..b87703aab30c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,8 +185,8 @@ 12.3.100-rc.1.125 15.4.100-rc.1.125 6.0.4 - 6.0.4 - $(MicrosoftNETWorkloadEmscriptenManifest60200Version) + 6.0.22 + $(MicrosoftNETWorkloadEmscriptenManifest60300Version) From 4e6318f73ab3bd391e96da68f2dea8fe8fa6f6f9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 23 Oct 2023 11:53:20 -0700 Subject: [PATCH 1091/1244] Enable coherency dependency flow for emsdk --- NuGet.config | 24 ------------------------ eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9401b3f646e0..03d3587a670c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,22 +13,10 @@ - - - - - - - - - - - - @@ -51,22 +39,10 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 688060474822..a9899d9f89b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 52e9452f82e26f9fcae791e84c082ae22f1ef66f + 3c754f28788fae642dc307a948479204e9f7dd5a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index dc111971fcf3..c974377843ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,8 +185,8 @@ 12.3.303 15.4.303 6.0.5 - 6.0.4 - $(MicrosoftNETWorkloadEmscriptenManifest60200Version) + 6.0.22 + $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 61a27a32854c6b29d058095873ef0476ebbf46c5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Oct 2023 02:08:14 +0000 Subject: [PATCH 1092/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23520.19 -> To Version 6.0.417-servicing.23523.41 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.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- 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 fd811c61d01a..1f8067f097e7 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 200fde590727..e2ba4a8c9c47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 42ab085a51763b862990e089c4b49e881d8b4e07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f858ff1c05db3bd2b40d61c221ae2dc9c0fc8efe + 964a8fda7fbf584c0301cffcde43c959e0ea0275 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f858ff1c05db3bd2b40d61c221ae2dc9c0fc8efe + 964a8fda7fbf584c0301cffcde43c959e0ea0275 diff --git a/eng/Versions.props b/eng/Versions.props index e3574e768d06..242fdbe89bf9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.25 6.0.25 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 0.2.0 - 6.0.417-servicing.23520.19 - 6.0.417-servicing.23520.19 + 6.0.417-servicing.23523.41 + 6.0.417-servicing.23523.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 763e59b735f8897681261d1dd917cc543a43e84a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Oct 2023 02:09:15 +0000 Subject: [PATCH 1093/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23520.20 -> To Version 6.0.320-servicing.23523.40 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.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- 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 d23aa41a807b..df347d0f2098 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 93185f7d6137..218fc77c7e97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6e525a642fe66413e4edf553f5bbc73ea5c866e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aba9c2c28f7e7827da7f757669e823b3c3dc831c + 733590df6146364699e0d3d8d465f2f8da15b063 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aba9c2c28f7e7827da7f757669e823b3c3dc831c + 733590df6146364699e0d3d8d465f2f8da15b063 diff --git a/eng/Versions.props b/eng/Versions.props index 3b06d84bb5f1..ffc00dd66ec8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.25 6.0.25 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 0.2.0 - 6.0.320-servicing.23520.20 - 6.0.320-servicing.23520.20 + 6.0.320-servicing.23523.40 + 6.0.320-servicing.23523.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f212d116e7444d461391ef131c3a553fb505e240 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:59:11 -0800 Subject: [PATCH 1094/1244] Update branding to 6.0.321 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 709738fc715a..19776745fabc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 20 + 21 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c0dde1944c7364dfe4fa6f3642dea627f2a7ce88 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:59:15 -0800 Subject: [PATCH 1095/1244] Update branding to 6.0.418 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index dc111971fcf3..461f3a8cc99f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 17 + 18 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 193aa8f1fbfcae43126620143761dc59fb74e8fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Nov 2023 19:18:28 +0000 Subject: [PATCH 1096/1244] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.23511.8 -> To Version 6.0.0-beta.23517.3 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.22 -> To Version 6.0.25 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0 --- NuGet.config | 8 -------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/templates/jobs/source-build.yml | 2 +- global.json | 4 ++-- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1f8067f097e7..03d3587a670c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,16 +37,12 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10158d645972..492e94748e1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3c754f28788fae642dc307a948479204e9f7dd5a + d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 https://github.com/dotnet/source-build @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7814defb17ae..6407cb8439b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23511.8 + 6.0.0-beta.23517.3 @@ -185,7 +185,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.22 + 6.0.25 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 7c240e654472..00aa98eb3bfd 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/global.json b/global.json index eeff7fa000b4..1410185dde5b 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.23511.8", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23511.8" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" } } From 5be1fe4923f9f0ca0e96ebaa27a7500f75607b6b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:47:55 +0000 Subject: [PATCH 1097/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231107.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23523.41 -> To Version 6.0.418-servicing.23557.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 492e94748e1d..458cbbf6f1ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 42ab085a51763b862990e089c4b49e881d8b4e07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 964a8fda7fbf584c0301cffcde43c959e0ea0275 + 767666138f79eee134f51f242473ec7d49c2a805 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 964a8fda7fbf584c0301cffcde43c959e0ea0275 + 767666138f79eee134f51f242473ec7d49c2a805 diff --git a/eng/Versions.props b/eng/Versions.props index 6407cb8439b1..bf0084a59bc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.417-servicing.23523.41 - 6.0.417-servicing.23523.41 + 6.0.418-servicing.23557.14 + 6.0.418-servicing.23557.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7bdadf6e35fb04aa05157fe13995de55b5c9af45 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:48:37 +0000 Subject: [PATCH 1098/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23523.41 -> To Version 6.0.418-servicing.23574.3 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03d3587a670c..1aa3642f72e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,17 @@ + + + @@ -37,10 +40,13 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 458cbbf6f1ce..e8bd7fbb31a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42ab085a51763b862990e089c4b49e881d8b4e07 + 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42ab085a51763b862990e089c4b49e881d8b4e07 + 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42ab085a51763b862990e089c4b49e881d8b4e07 + 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 767666138f79eee134f51f242473ec7d49c2a805 + 08ded598c2a2b41b45413b7462da49bdcea3c5a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 767666138f79eee134f51f242473ec7d49c2a805 + 08ded598c2a2b41b45413b7462da49bdcea3c5a0 diff --git a/eng/Versions.props b/eng/Versions.props index bf0084a59bc7..775638704aad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.417 + 6.0.418 @@ -44,20 +44,20 @@ - 6.0.25 - 6.0.25 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 + 6.0.26 + 6.0.26 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 0.2.0 - 6.0.418-servicing.23557.14 - 6.0.418-servicing.23557.14 + 6.0.418-servicing.23574.3 + 6.0.418-servicing.23574.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.25-servicing.23519.12 - 6.0.25-servicing.23519.12 - 6.0.25 - 6.0.25 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23572.29 + 6.0.26-servicing.23572.29 + 6.0.26 + 6.0.26 + 6.0.26 + 6.0.26 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.417 + 6.0.418 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7e88e103532bc6b8c82f1f56305f1ef2d3fdc4bb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:48:52 +0000 Subject: [PATCH 1099/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231107.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23523.40 -> To Version 6.0.321-servicing.23557.13 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 From Version 6.0.22 -> To Version 6.0.25 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0 --- NuGet.config | 8 -------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index df347d0f2098..2cf5556c3e9c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5513d3a8b00..8b5940b6c8b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6e525a642fe66413e4edf553f5bbc73ea5c866e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 733590df6146364699e0d3d8d465f2f8da15b063 + c07a6a58ea26fce79dad801f5fb862989cf41d1a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 733590df6146364699e0d3d8d465f2f8da15b063 + c07a6a58ea26fce79dad801f5fb862989cf41d1a @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3c754f28788fae642dc307a948479204e9f7dd5a + d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index c689826cd161..24c27b260149 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.320-servicing.23523.40 - 6.0.320-servicing.23523.40 + 6.0.321-servicing.23557.13 + 6.0.321-servicing.23557.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -185,7 +185,7 @@ 12.3.100-rc.1.125 15.4.100-rc.1.125 6.0.4 - 6.0.22 + 6.0.25 $(MicrosoftNETWorkloadEmscriptenManifest60300Version) From 0ca2699de54d6a13c02fca0d129d92c1fd3efa08 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 15:00:25 +0000 Subject: [PATCH 1100/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23557.13 -> To Version 6.0.321-servicing.23574.2 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cf5556c3e9c..88cf52afd8ac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,17 @@ + + + @@ -37,9 +40,12 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b5940b6c8b4..a6ece6385f5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e525a642fe66413e4edf553f5bbc73ea5c866e5 + 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e525a642fe66413e4edf553f5bbc73ea5c866e5 + 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e525a642fe66413e4edf553f5bbc73ea5c866e5 + 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c07a6a58ea26fce79dad801f5fb862989cf41d1a + 99f231333f8e3d364f357315d99e36473238b694 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c07a6a58ea26fce79dad801f5fb862989cf41d1a + 99f231333f8e3d364f357315d99e36473238b694 diff --git a/eng/Versions.props b/eng/Versions.props index 24c27b260149..cf7e6d2c7179 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.320 + 6.0.321 @@ -44,20 +44,20 @@ - 6.0.25 - 6.0.25 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 + 6.0.26 + 6.0.26 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 0.2.0 - 6.0.321-servicing.23557.13 - 6.0.321-servicing.23557.13 + 6.0.321-servicing.23574.2 + 6.0.321-servicing.23574.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.25-servicing.23519.12 - 6.0.25-servicing.23519.12 - 6.0.25 - 6.0.25 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23572.29 + 6.0.26-servicing.23572.29 + 6.0.26 + 6.0.26 + 6.0.26 + 6.0.26 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.320 + 6.0.321 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 17da9de8d38bd26d596f3c7548e4b79cd5178412 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 11:54:07 +0000 Subject: [PATCH 1101/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23574.2 -> To Version 6.0.321-servicing.23578.7 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.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- 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 88cf52afd8ac..dcba8ce77776 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6ece6385f5c..1a40c404e0a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 99f231333f8e3d364f357315d99e36473238b694 + 948bfb9e66e38a2e16fd7f22acf011950671745e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 99f231333f8e3d364f357315d99e36473238b694 + 948bfb9e66e38a2e16fd7f22acf011950671745e diff --git a/eng/Versions.props b/eng/Versions.props index cf7e6d2c7179..2d4d53542773 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 0.2.0 - 6.0.321-servicing.23574.2 - 6.0.321-servicing.23574.2 + 6.0.321-servicing.23578.7 + 6.0.321-servicing.23578.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ba799f743b42240b5e154a0530e3cf96e57f5185 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 20:24:06 +0000 Subject: [PATCH 1102/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23574.3 -> To Version 6.0.418-servicing.23578.17 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.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- 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 1aa3642f72e5..152173f2ac76 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8bd7fbb31a8..3085be281258 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08ded598c2a2b41b45413b7462da49bdcea3c5a0 + 304d44c93d271c5cfebb7aedf39d8c605bb4fbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08ded598c2a2b41b45413b7462da49bdcea3c5a0 + 304d44c93d271c5cfebb7aedf39d8c605bb4fbfc diff --git a/eng/Versions.props b/eng/Versions.props index 775638704aad..2da60752806f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 0.2.0 - 6.0.418-servicing.23574.3 - 6.0.418-servicing.23574.3 + 6.0.418-servicing.23578.17 + 6.0.418-servicing.23578.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 67b3fa5ba87ac794ff751ac6d612d993dd503929 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 28 Nov 2023 21:51:22 +0000 Subject: [PATCH 1103/1244] Updated .vsts-ci.yml Add PGO legs to dependencies for publish. --- .vsts-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index c6f583096e07..0b653655fca1 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -405,6 +405,8 @@ stages: - Darwin - Source_Build_Managed - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT publishUsingPipelines: true pool: ${{ if eq(variables['System.TeamProject'], 'internal') }}: From de33cd6114f0fcdd55ce56ce311d7a1ecf37ca51 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 00:31:12 +0000 Subject: [PATCH 1104/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23578.17 -> To Version 6.0.418-servicing.23578.33 --- 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 3085be281258..a4e6877c51e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 304d44c93d271c5cfebb7aedf39d8c605bb4fbfc + 09d4e77361f1baf445376cd5fbec6a4c55a1d295 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 304d44c93d271c5cfebb7aedf39d8c605bb4fbfc + 09d4e77361f1baf445376cd5fbec6a4c55a1d295 diff --git a/eng/Versions.props b/eng/Versions.props index 2da60752806f..96d0d2e3accf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23578.17 - 6.0.418-servicing.23578.17 + 6.0.418-servicing.23578.33 + 6.0.418-servicing.23578.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 457428f24c32c1c656eeba0091515e83dc8e0378 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 10:39:01 +0000 Subject: [PATCH 1105/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23578.17 -> To Version 6.0.418-servicing.23579.3 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.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- 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 152173f2ac76..26fdcf4ae978 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4e6877c51e3..98c7340e2e1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09d4e77361f1baf445376cd5fbec6a4c55a1d295 + a48336cad950691002015f4b411f77c4926c7edb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09d4e77361f1baf445376cd5fbec6a4c55a1d295 + a48336cad950691002015f4b411f77c4926c7edb diff --git a/eng/Versions.props b/eng/Versions.props index 96d0d2e3accf..08c6b98d4a18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 0.2.0 - 6.0.418-servicing.23578.33 - 6.0.418-servicing.23578.33 + 6.0.418-servicing.23579.3 + 6.0.418-servicing.23579.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f67edca3e3879fff6f1074109aa31d6208c59dbd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 12:31:51 +0000 Subject: [PATCH 1106/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.32 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23578.7 -> To Version 6.0.321-servicing.23578.32 --- 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 1a40c404e0a5..92114992ec88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 948bfb9e66e38a2e16fd7f22acf011950671745e + d6528f6c173ae76eb6584c31d14b3da885f8fc04 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 948bfb9e66e38a2e16fd7f22acf011950671745e + d6528f6c173ae76eb6584c31d14b3da885f8fc04 diff --git a/eng/Versions.props b/eng/Versions.props index 2d4d53542773..3067e7c6deb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.321-servicing.23578.7 - 6.0.321-servicing.23578.7 + 6.0.321-servicing.23578.32 + 6.0.321-servicing.23578.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c5ba2d60898886b63e6bb657f25503d24680855f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 13:57:21 +0000 Subject: [PATCH 1107/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23578.32 -> To Version 6.0.321-servicing.23579.9 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.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- 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 dcba8ce77776..db5a4ec11560 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92114992ec88..64d7e889efe4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d6528f6c173ae76eb6584c31d14b3da885f8fc04 + 176ba6c92b4d6c388a0117ae030d9b547f727c66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d6528f6c173ae76eb6584c31d14b3da885f8fc04 + 176ba6c92b4d6c388a0117ae030d9b547f727c66 diff --git a/eng/Versions.props b/eng/Versions.props index 3067e7c6deb5..301d1a62bbdb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 0.2.0 - 6.0.321-servicing.23578.32 - 6.0.321-servicing.23578.32 + 6.0.321-servicing.23579.9 + 6.0.321-servicing.23579.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f752a3091c853a2eccf6afeae6d9053ada1e385 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 19:40:30 +0000 Subject: [PATCH 1108/1244] Merged PR 35745: [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.AspNetCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (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**: 20231201.8 - **Date Produced**: December 1, 2023 7:14:50 PM UTC - **Commit**: b8d95c56bfc86959c20083313656913cbaa6eabd - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.321-servicing.23579.9 to 6.0.321-servicing.23601.8][1] - **Microsoft.NET.Sdk**: [from 6.0.321-servicing.23579.9 to 6.0.321-servicing.23601.8][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-dev-certs**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-user-secrets**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC176ba6c92b&targetVersion=GCb8d95c56bf&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCed655b4569&targetVersion=GC4ed6b143f1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 db5a4ec11560..e9eac60af4cb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64d7e889efe4..00511bda626b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 176ba6c92b4d6c388a0117ae030d9b547f727c66 + b8d95c56bfc86959c20083313656913cbaa6eabd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 176ba6c92b4d6c388a0117ae030d9b547f727c66 + b8d95c56bfc86959c20083313656913cbaa6eabd diff --git a/eng/Versions.props b/eng/Versions.props index 301d1a62bbdb..630f4c7769dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 0.2.0 - 6.0.321-servicing.23579.9 - 6.0.321-servicing.23579.9 + 6.0.321-servicing.23601.8 + 6.0.321-servicing.23601.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1d1a65cb827ab0575c62c629e9bac8f8d4e61f98 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 19:40:36 +0000 Subject: [PATCH 1109/1244] Merged PR 35746: [internal/release/6.0.4xx] 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.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20231201.9 - **Date Produced**: December 1, 2023 7:14:36 PM UTC - **Commit**: 6b027deb13b313456cf2408c0329fb74cf214223 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.418-servicing.23579.3 to 6.0.418-servicing.23601.9][1] - **Microsoft.NET.Sdk**: [from 6.0.418-servicing.23579.3 to 6.0.418-servicing.23601.9][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-dev-certs**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-user-secrets**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa48336cad9&targetVersion=GC6b027deb13&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCed655b4569&targetVersion=GC4ed6b143f1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 26fdcf4ae978..6b8d7ee77955 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98c7340e2e1e..48a8a8e7b222 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a48336cad950691002015f4b411f77c4926c7edb + 6b027deb13b313456cf2408c0329fb74cf214223 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a48336cad950691002015f4b411f77c4926c7edb + 6b027deb13b313456cf2408c0329fb74cf214223 diff --git a/eng/Versions.props b/eng/Versions.props index 08c6b98d4a18..ee8d3732dc4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 0.2.0 - 6.0.418-servicing.23579.3 - 6.0.418-servicing.23579.3 + 6.0.418-servicing.23601.9 + 6.0.418-servicing.23601.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e366881c1d5148b133e00795877fbfaedf9f385e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 1 Dec 2023 20:29:19 +0000 Subject: [PATCH 1110/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23601.8 -> To Version 6.0.321-servicing.23601.16 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.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- 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 e9eac60af4cb..98638b9ae52d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00511bda626b..62ffc36fdcf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b8d95c56bfc86959c20083313656913cbaa6eabd + 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b8d95c56bfc86959c20083313656913cbaa6eabd + 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 diff --git a/eng/Versions.props b/eng/Versions.props index 630f4c7769dd..fef08b7bdcb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 0.2.0 - 6.0.321-servicing.23601.8 - 6.0.321-servicing.23601.8 + 6.0.321-servicing.23601.16 + 6.0.321-servicing.23601.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 51ed695efb19f8535fa8b793288af8877f64dba0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 1 Dec 2023 20:30:10 +0000 Subject: [PATCH 1111/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23601.9 -> To Version 6.0.418-servicing.23601.17 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.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- 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 6b8d7ee77955..44c201c8bef0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48a8a8e7b222..7c00837f25f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b027deb13b313456cf2408c0329fb74cf214223 + 6c327a186a3c6fc3aa2a08d5900ecb1da772ee86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b027deb13b313456cf2408c0329fb74cf214223 + 6c327a186a3c6fc3aa2a08d5900ecb1da772ee86 diff --git a/eng/Versions.props b/eng/Versions.props index ee8d3732dc4f..08cd886fc9c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 0.2.0 - 6.0.418-servicing.23601.9 - 6.0.418-servicing.23601.9 + 6.0.418-servicing.23601.17 + 6.0.418-servicing.23601.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 05d232d7760c452688dc302e20b6f9da41105d9a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Dec 2023 19:27:46 +0000 Subject: [PATCH 1112/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231204.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23601.16 -> To Version 6.0.321-servicing.23604.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 98638b9ae52d..6b6abf24e6ea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,11 +16,14 @@ + + + @@ -40,14 +44,18 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62ffc36fdcf3..824d1e2fe1c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 + 1f85f2a52ec422c16c8991f6cd24124c084e87d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 + 1f85f2a52ec422c16c8991f6cd24124c084e87d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4ee94199afb6c67ed448c252a07c0747c089e41 + b4d268210a29a07ba7a3003360b2b037881880db - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcec4d8986bb8339964c429abd6e4651b968ff4f + 981ef8014ab994eb3fce88dd81b815fce930dfa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fef08b7bdcb4..c837eb64159e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23519.16 + 6.0.26-servicing.23573.4 - 6.0.25-servicing.23519.18 + 6.0.26-servicing.23573.8 @@ -56,8 +56,8 @@ - 6.0.321-servicing.23601.16 - 6.0.321-servicing.23601.16 + 6.0.321-servicing.23604.13 + 6.0.321-servicing.23604.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.25-servicing.23520.5 - 6.0.25-servicing.23520.5 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23604.3 + 6.0.26-servicing.23604.3 + 6.0.26 + 6.0.26 From 66b691b8d07133664999b49112590f0ddeb6d949 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Dec 2023 19:28:06 +0000 Subject: [PATCH 1113/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231204.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23601.17 -> To Version 6.0.418-servicing.23604.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44c201c8bef0..d4d84aab1b56 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,11 +16,14 @@ + + + @@ -40,15 +44,19 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c00837f25f5..15d012f5a61b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6c327a186a3c6fc3aa2a08d5900ecb1da772ee86 + 4513782981406737e4944e0c12ab85172bd2366f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6c327a186a3c6fc3aa2a08d5900ecb1da772ee86 + 4513782981406737e4944e0c12ab85172bd2366f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4ee94199afb6c67ed448c252a07c0747c089e41 + b4d268210a29a07ba7a3003360b2b037881880db - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcec4d8986bb8339964c429abd6e4651b968ff4f + 981ef8014ab994eb3fce88dd81b815fce930dfa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 08cd886fc9c3..9f1214fc0b7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23519.16 + 6.0.26-servicing.23573.4 - 6.0.25-servicing.23519.18 + 6.0.26-servicing.23573.8 @@ -56,8 +56,8 @@ - 6.0.418-servicing.23601.17 - 6.0.418-servicing.23601.17 + 6.0.418-servicing.23604.14 + 6.0.418-servicing.23604.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.25-servicing.23520.5 - 6.0.25-servicing.23520.5 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23604.3 + 6.0.26-servicing.23604.3 + 6.0.26 + 6.0.26 From e370c6bd8c9bd9d2957be5a164eccc4f011e6d41 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 22:26:10 +0000 Subject: [PATCH 1114/1244] Merged PR 35829: [internal/release/6.0.4xx] 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.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: from 6.0.25 to 6.0.26 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20231205.16 - **Date Produced**: December 5, 2023 10:05:15 PM UTC - **Commit**: 416a14840c7d80cbf46dc518b027bad88c3e14bf - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.418-servicing.23604.14 to 6.0.418-servicing.23605.16][1] - **Microsoft.NET.Sdk**: [from 6.0.418-servicing.23604.14 to 6.0.418-servicing.23605.16][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: [from 6.0.25 to 6.0.26][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4513782981&targetVersion=GC416a14840c&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files [3]: https://github.com/dotnet/emsdk/compare/d8bc162ccf...5ccc36f598 [DependencyUpdate]: <> (End)... --- NuGet.config | 7 +++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index d4d84aab1b56..0b41bf143608 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,12 +11,12 @@ + - - + @@ -48,8 +48,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15d012f5a61b..9cece73bc1ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4513782981406737e4944e0c12ab85172bd2366f + 416a14840c7d80cbf46dc518b027bad88c3e14bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4513782981406737e4944e0c12ab85172bd2366f + 416a14840c7d80cbf46dc518b027bad88c3e14bf @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 + 5ccc36f5985e2089f47c97a19c250e65ddefd0ba https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 9f1214fc0b7b..acba3cbf4e6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23604.14 - 6.0.418-servicing.23604.14 + 6.0.418-servicing.23605.16 + 6.0.418-servicing.23605.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.26-servicing.23572.29 - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 + 6.0.26-servicing.23605.8 6.0.26 6.0.26 6.0.26 @@ -185,7 +185,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.25 + 6.0.26 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 151c083a87082989475106b8ebb08cfca977f3aa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 22:26:57 +0000 Subject: [PATCH 1115/1244] Merged PR 35830: [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.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.300**: from 6.0.25 to 6.0.26 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [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**: 20231205.15 - **Date Produced**: December 5, 2023 10:05:22 PM UTC - **Commit**: c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.321-servicing.23604.13 to 6.0.321-servicing.23605.15][1] - **Microsoft.NET.Sdk**: [from 6.0.321-servicing.23604.13 to 6.0.321-servicing.23605.15][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.300**: [from 6.0.25 to 6.0.26][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1f85f2a52e&targetVersion=GCc22a743f3a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files [3]: https://github.com/dotnet/emsdk/compare/d8bc162ccf...5ccc36f598 [DependencyUpdate]: <> (End)... --- NuGet.config | 7 +++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6b6abf24e6ea..575275834c06 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,12 +11,12 @@ + - - + @@ -48,8 +48,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 824d1e2fe1c6..aea92804fd30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f85f2a52ec422c16c8991f6cd24124c084e87d1 + c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f85f2a52ec422c16c8991f6cd24124c084e87d1 + c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 + 5ccc36f5985e2089f47c97a19c250e65ddefd0ba https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index c837eb64159e..da8399e55ecb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.321-servicing.23604.13 - 6.0.321-servicing.23604.13 + 6.0.321-servicing.23605.15 + 6.0.321-servicing.23605.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.26-servicing.23572.29 - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 + 6.0.26-servicing.23605.8 6.0.26 6.0.26 6.0.26 @@ -185,7 +185,7 @@ 12.3.100-rc.1.125 15.4.100-rc.1.125 6.0.4 - 6.0.25 + 6.0.26 $(MicrosoftNETWorkloadEmscriptenManifest60300Version) From aa3e2f103a246defb8718640fa7b54643460f423 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 23:33:27 +0000 Subject: [PATCH 1116/1244] Merged PR 35839: [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.DotNet.Common.ItemTemplates**: from 6.0.321 to 6.0.321 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.321-servicing.23573.13 to 6.0.321-servicing.23605.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.321 to 6.0.321 (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**: 20231205.22 - **Date Produced**: December 5, 2023 11:12:12 PM UTC - **Commit**: 96ce218210ee10662e18423d95be11527ff19222 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.321-servicing.23605.15 to 6.0.321-servicing.23605.22][1] - **Microsoft.NET.Sdk**: [from 6.0.321-servicing.23605.15 to 6.0.321-servicing.23605.22][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.321 to 6.0.321][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.321-servicing.23573.13 to 6.0.321-servicing.23605.5][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.321 to 6.0.321][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc22a743f3a&targetVersion=GC96ce218210&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC6b4fc213e7&targetVersion=GC757b2e642e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 575275834c06..3eb49cca2b0b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,8 +19,7 @@ - - + @@ -50,8 +49,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aea92804fd30..b1b71e0d7740 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d + 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d + 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d + 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 + 96ce218210ee10662e18423d95be11527ff19222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 + 96ce218210ee10662e18423d95be11527ff19222 diff --git a/eng/Versions.props b/eng/Versions.props index da8399e55ecb..f4cd922099b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.321-servicing.23605.15 - 6.0.321-servicing.23605.15 + 6.0.321-servicing.23605.22 + 6.0.321-servicing.23605.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ac7a1d300a624aee41943ff8b31d7831e3410487 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 23:52:52 +0000 Subject: [PATCH 1117/1244] Merged PR 35840: [internal/release/6.0.4xx] 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.418 to 6.0.418 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.418-rtm.23573.14 to 6.0.418-rtm.23605.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.418 to 6.0.418 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20231205.25 - **Date Produced**: December 5, 2023 11:22:43 PM UTC - **Commit**: d501a7b471f83b79814d1c385eecf21a14dfb67f - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.418-servicing.23605.16 to 6.0.418-servicing.23605.25][1] - **Microsoft.NET.Sdk**: [from 6.0.418-servicing.23605.16 to 6.0.418-servicing.23605.25][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.418 to 6.0.418][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.418-rtm.23573.14 to 6.0.418-rtm.23605.6][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.418 to 6.0.418][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC416a14840c&targetVersion=GCd501a7b471&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC04cc3e115c&targetVersion=GC766ee832e4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b41bf143608..3172c2731511 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,8 +19,7 @@ - - + @@ -51,8 +50,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cece73bc1ee..22e72527378b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 + 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 + 766ee832e4d9d2d685414fceae96dca3c4e4dcbc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 + 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 416a14840c7d80cbf46dc518b027bad88c3e14bf + d501a7b471f83b79814d1c385eecf21a14dfb67f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 416a14840c7d80cbf46dc518b027bad88c3e14bf + d501a7b471f83b79814d1c385eecf21a14dfb67f diff --git a/eng/Versions.props b/eng/Versions.props index acba3cbf4e6a..5031c62ce9c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23605.16 - 6.0.418-servicing.23605.16 + 6.0.418-servicing.23605.25 + 6.0.418-servicing.23605.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a71a77b9ff73eaa90537fade61a4d2af97f918a6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 00:21:22 +0000 Subject: [PATCH 1118/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23605.22 -> To Version 6.0.321-servicing.23605.31 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.26 -> To Version 6.0.26 (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 3eb49cca2b0b..3371ee0f3ddb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -43,8 +42,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1b71e0d7740..039f6a3466f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96ce218210ee10662e18423d95be11527ff19222 + b6662b12057b934f96c560cd077a7b15b0e0c156 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96ce218210ee10662e18423d95be11527ff19222 + b6662b12057b934f96c560cd077a7b15b0e0c156 diff --git a/eng/Versions.props b/eng/Versions.props index f4cd922099b7..a6a9cf9a9ad5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 0.2.0 - 6.0.321-servicing.23605.22 - 6.0.321-servicing.23605.22 + 6.0.321-servicing.23605.31 + 6.0.321-servicing.23605.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aef6b390463d346d9480521368e04a78761fe8bd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 00:32:05 +0000 Subject: [PATCH 1119/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.25 -> To Version 6.0.418-servicing.23605.33 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.26 -> To Version 6.0.26 (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 3172c2731511..136e28698971 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -43,8 +42,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22e72527378b..06610174f199 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d501a7b471f83b79814d1c385eecf21a14dfb67f + d25cefa206ae17c16ec4746c3e7591db22e78f09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d501a7b471f83b79814d1c385eecf21a14dfb67f + d25cefa206ae17c16ec4746c3e7591db22e78f09 diff --git a/eng/Versions.props b/eng/Versions.props index 5031c62ce9c5..0cad5967e7c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 0.2.0 - 6.0.418-servicing.23605.25 - 6.0.418-servicing.23605.25 + 6.0.418-servicing.23605.33 + 6.0.418-servicing.23605.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8e5f7d62eb49b3bd82bfd818380559c9a5c7120b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 01:19:41 +0000 Subject: [PATCH 1120/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.38 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23605.31 -> To Version 6.0.321-servicing.23605.38 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- 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 3371ee0f3ddb..78b63002ea32 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 039f6a3466f5..1a2687e3eb31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6662b12057b934f96c560cd077a7b15b0e0c156 + 2f5d8604a65edf0c457ff3f600fad88b42568244 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6662b12057b934f96c560cd077a7b15b0e0c156 + 2f5d8604a65edf0c457ff3f600fad88b42568244 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4d268210a29a07ba7a3003360b2b037881880db + c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 981ef8014ab994eb3fce88dd81b815fce930dfa5 + e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a6a9cf9a9ad5..13e0ab3db8b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.26-servicing.23573.4 + 6.0.26-servicing.23605.5 - 6.0.26-servicing.23573.8 + 6.0.26-servicing.23605.3 @@ -56,8 +56,8 @@ - 6.0.321-servicing.23605.31 - 6.0.321-servicing.23605.31 + 6.0.321-servicing.23605.38 + 6.0.321-servicing.23605.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.26-servicing.23604.3 - 6.0.26-servicing.23604.3 + 6.0.26-servicing.23605.4 + 6.0.26-servicing.23605.4 6.0.26 6.0.26 From ae5a0f6777946b49c55782b6661338cc0a5420c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 01:24:01 +0000 Subject: [PATCH 1121/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.33 -> To Version 6.0.418-servicing.23605.39 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- 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 136e28698971..07d2ab1fe94c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06610174f199..5960f0e91d4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d25cefa206ae17c16ec4746c3e7591db22e78f09 + 1209a0007f12258907100d2ae06eaf8ef98c69e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d25cefa206ae17c16ec4746c3e7591db22e78f09 + 1209a0007f12258907100d2ae06eaf8ef98c69e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4d268210a29a07ba7a3003360b2b037881880db + c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 981ef8014ab994eb3fce88dd81b815fce930dfa5 + e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0cad5967e7c3..2f4872aa6aa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.26-servicing.23573.4 + 6.0.26-servicing.23605.5 - 6.0.26-servicing.23573.8 + 6.0.26-servicing.23605.3 @@ -56,8 +56,8 @@ - 6.0.418-servicing.23605.33 - 6.0.418-servicing.23605.33 + 6.0.418-servicing.23605.39 + 6.0.418-servicing.23605.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.26-servicing.23604.3 - 6.0.26-servicing.23604.3 + 6.0.26-servicing.23605.4 + 6.0.26-servicing.23605.4 6.0.26 6.0.26 From 8bb85379f184d5c4b49d5555dc18fa190f87463d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 11 Dec 2023 16:06:00 +0000 Subject: [PATCH 1122/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231211.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.39 -> To Version 6.0.418-servicing.23611.6 --- NuGet.config | 18 ++++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07d2ab1fe94c..d802adb8c11e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,30 @@ + + + + + + + + + + @@ -42,15 +52,23 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5960f0e91d4d..c66ea58ee866 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1209a0007f12258907100d2ae06eaf8ef98c69e4 + 6786cd99de264e875529374067197c15c91767bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1209a0007f12258907100d2ae06eaf8ef98c69e4 + 6786cd99de264e875529374067197c15c91767bf diff --git a/eng/Versions.props b/eng/Versions.props index 2f4872aa6aa4..11750c01aaa1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23605.39 - 6.0.418-servicing.23605.39 + 6.0.418-servicing.23611.6 + 6.0.418-servicing.23611.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b015286fbf1aa466c5ea93ddafb2641d4c6b6eac Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:51 -0800 Subject: [PATCH 1123/1244] Update branding to 6.0.322 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c689826cd161..a0544d921cad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 21 + 22 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 9c3dc27baa46731dfe71d44ebd14dac55a98036d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:55 -0800 Subject: [PATCH 1124/1244] Update branding to 6.0.419 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6407cb8439b1..50201197de13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 18 + 19 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From b8afc58d3344fb54cbd673150f2f1e0a65887ad4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Jan 2024 18:20:09 +0000 Subject: [PATCH 1125/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.39 -> To Version 6.0.419-servicing.24053.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 c66ea58ee866..f3ca7d908d64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6786cd99de264e875529374067197c15c91767bf + ba6e93d72c9e5dd2161bcaa97df6a2d2616606a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6786cd99de264e875529374067197c15c91767bf + ba6e93d72c9e5dd2161bcaa97df6a2d2616606a6 diff --git a/eng/Versions.props b/eng/Versions.props index 11750c01aaa1..eb4ddd2376df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23611.6 - 6.0.418-servicing.23611.6 + 6.0.419-servicing.24053.9 + 6.0.419-servicing.24053.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5c2dd5b5cc5243d5d2ec1b31bcfb6314351c7845 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:31:14 +0000 Subject: [PATCH 1126/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240109.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22580.2 -> To Version 6.0.0-servicing.24059.1 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07d2ab1fe94c..a286d7217c8f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,28 @@ - + + + + + + + + @@ -42,15 +49,20 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5960f0e91d4d..0478bcbf125c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/source-build-reference-packages - a93f0b1b98f48057457f9532aa3d76f1565b5182 + 6425c284100043ea5829deb255811d3487a91fb6 From 48bba8fffc8e4d4fbdbe99094458fc16fdb41dc0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 06:42:22 +0000 Subject: [PATCH 1127/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.36 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.39 -> To Version 6.0.419-servicing.24059.36 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index d802adb8c11e..a286d7217c8f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -52,9 +49,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3ca7d908d64..1793e147b854 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba6e93d72c9e5dd2161bcaa97df6a2d2616606a6 + 27f723cb002f38336f60be5644dbe9e59cb2678a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba6e93d72c9e5dd2161bcaa97df6a2d2616606a6 + 27f723cb002f38336f60be5644dbe9e59cb2678a diff --git a/eng/Versions.props b/eng/Versions.props index eb4ddd2376df..569c704322a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.419-servicing.24053.9 - 6.0.419-servicing.24053.9 + 6.0.419-servicing.24059.36 + 6.0.419-servicing.24059.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9bfe9ba33ea880945a44d06a23a54bec991f36f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:46:50 -0800 Subject: [PATCH 1128/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#18198) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 4 ++-- eng/common/templates/post-build/common-variables.yml | 2 +- eng/common/templates/post-build/post-build.yml | 2 +- global.json | 6 +++--- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0478bcbf125c..72a435584c9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c9fa2f63b748..a3aef0fc8f61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23517.3 + 6.0.0-beta.24059.3 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e7641341b..8fda30bdce2b 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 39abdbecdcf1..4e4116f1d0bf 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d957922a6..49938f0c89f7 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7764..1e779fec4dd1 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518ac58..ac9a95778fcd 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 0e10e7db69c7..01da2420df60 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -123,7 +123,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index d91bf9147116..239b17010fa7 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -53,7 +53,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication @@ -68,7 +68,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a43ca..fae340f4d20d 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -11,7 +11,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index fc022ca9b266..d49c6156bf0a 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -162,7 +162,7 @@ stages: # 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 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 diff --git a/global.json b/global.json index 1410185dde5b..8bf2c6315a9f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.123", + "dotnet": "6.0.126", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3" } } From 6405b4c3bded73455ca03f6f103b274411f19895 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:20:27 +0000 Subject: [PATCH 1129/1244] Merged PR 36616: [internal/release/6.0.4xx] 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.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.26-servicing.23605.4 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.26-servicing.23605.4 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23605.8 to 6.0.27-servicing.24066.28 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.418 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.418-rtm.23605.6 to 6.0.419-rtm.24067.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.418 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.26-servicing.23605.5 to 6.0.27-servicing.24067.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.26-servicing.23605.3 to 6.0.27-servicing.24067.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.C... --- NuGet.config | 29 ++++--------- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 44 +++++++++---------- 3 files changed, 77 insertions(+), 90 deletions(-) diff --git a/NuGet.config b/NuGet.config index a286d7217c8f..0e13fbfe72c9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,20 @@ + - - - - - - + - - - + - - - + @@ -49,21 +41,16 @@ + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a9fb7cf5c0c..2d13d9cb03ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 766ee832e4d9d2d685414fceae96dca3c4e4dcbc + 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 766ee832e4d9d2d685414fceae96dca3c4e4dcbc + 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 766ee832e4d9d2d685414fceae96dca3c4e4dcbc + 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27f723cb002f38336f60be5644dbe9e59cb2678a + ac40f93a6256add2d43ac56332518b82ac8726a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27f723cb002f38336f60be5644dbe9e59cb2678a + ac40f93a6256add2d43ac56332518b82ac8726a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b + c92bca031b633bb527ac58a44e8f0127ab8984ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 + c259e4173d70ad05737b7d838235c015fa25258b https://github.com/dotnet/fsharp @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 5ccc36f5985e2089f47c97a19c250e65ddefd0ba + 5460e2cb3721954528c452d9d32474e4c32b7141 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f8c424ff54fb..3a742389e6f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.26-servicing.23605.5 + 6.0.27-servicing.24067.5 - 6.0.26-servicing.23605.3 + 6.0.27-servicing.24067.2 - 6.0.418 + 6.0.419 @@ -44,20 +44,20 @@ - 6.0.26 - 6.0.26 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 + 6.0.27 + 6.0.27 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 0.2.0 - 6.0.419-servicing.24059.36 - 6.0.419-servicing.24059.36 + 6.0.419-servicing.24068.22 + 6.0.419-servicing.24068.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.26-servicing.23605.8 - 6.0.26-servicing.23605.8 - 6.0.26 - 6.0.26 - 6.0.26 - 6.0.26 + 6.0.27-servicing.24066.28 + 6.0.27-servicing.24066.28 + 6.0.27 + 6.0.27 + 6.0.27 + 6.0.27 2.1.0 - 6.0.26-servicing.23605.4 - 6.0.26-servicing.23605.4 - 6.0.26 - 6.0.26 + 6.0.27-servicing.24067.4 + 6.0.27-servicing.24067.4 + 6.0.27 + 6.0.27 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.418 + 6.0.419 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7cd79ed9517dcf2970054f6d7a9a78e3dedfc482 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 06:09:06 +0000 Subject: [PATCH 1130/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.70 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.419-servicing.24068.22 -> To Version 6.0.419-servicing.24068.70 Dependency coherency updates NuGet.Build.Tasks From Version 6.3.3-rc.3 -> To Version 6.3.4-rc.2 (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 2d13d9cb03ae..1cddf04185ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac40f93a6256add2d43ac56332518b82ac8726a4 + 73488a9d44f28afcde25d918c914d796be481792 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac40f93a6256add2d43ac56332518b82ac8726a4 + 73488a9d44f28afcde25d918c914d796be481792 @@ -151,7 +151,7 @@ 561848881bab01749e6d8b03be2869a18ca944f7 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted 5e444458a8c4a2dac9806fc1d387b7f157669540 diff --git a/eng/Versions.props b/eng/Versions.props index 3a742389e6f5..f224d31449de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.419-servicing.24068.22 - 6.0.419-servicing.24068.22 + 6.0.419-servicing.24068.70 + 6.0.419-servicing.24068.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2dae3fec70c788deec3f9ac96d42e335dda8522e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 21 Jan 2024 17:44:38 +0000 Subject: [PATCH 1131/1244] Merged PR 36689: [internal/release/6.0.4xx] 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.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.27-servicing.24066.28 to 6.0.27-servicing.24069.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.419 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.419-rtm.24067.1 to 6.0.419-rtm.24070.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.419 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.27-servicing.24067.5 to 6.0.27-servicing.24070.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.27-servicing.24067.2 to 6.0.27-servicing.24070.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.... --- NuGet.config | 17 ++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 60 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e13fbfe72c9..da7974fae05f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,21 @@ - + + - + - + - + @@ -41,16 +42,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cddf04185ef..cf9f76f91c52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 27362cdf91a189f091cd343b92b147b871dc6181 + 00aa120ee558ecef9e6343f7eab1811139a22463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 27362cdf91a189f091cd343b92b147b871dc6181 + 00aa120ee558ecef9e6343f7eab1811139a22463 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 27362cdf91a189f091cd343b92b147b871dc6181 + 00aa120ee558ecef9e6343f7eab1811139a22463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 73488a9d44f28afcde25d918c914d796be481792 + de27019bd5bfbe9e4c0ba2303c7dc224c210a1a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 73488a9d44f28afcde25d918c914d796be481792 + de27019bd5bfbe9e4c0ba2303c7dc224c210a1a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c92bca031b633bb527ac58a44e8f0127ab8984ac + 98b10b3aea4e37eed5ad4875cd251cc94c854c1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c259e4173d70ad05737b7d838235c015fa25258b + 12a1b47c5b9b55841e0aa39bb36c15ac05d4ce8a https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 5460e2cb3721954528c452d9d32474e4c32b7141 + a9f209f82fadb1f694ae6932f92c32918e407ded https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f224d31449de..671ee90b8da7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.27-servicing.24067.5 + 6.0.27-servicing.24070.1 - 6.0.27-servicing.24067.2 + 6.0.27-servicing.24070.3 @@ -46,18 +46,18 @@ 6.0.27 6.0.27 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 0.2.0 - 6.0.419-servicing.24068.70 - 6.0.419-servicing.24068.70 + 6.0.419-servicing.24070.9 + 6.0.419-servicing.24070.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.27-servicing.24066.28 - 6.0.27-servicing.24066.28 + 6.0.27-servicing.24069.12 + 6.0.27-servicing.24069.12 6.0.27 6.0.27 6.0.27 @@ -78,8 +78,8 @@ - 6.0.27-servicing.24067.4 - 6.0.27-servicing.24067.4 + 6.0.27-servicing.24070.4 + 6.0.27-servicing.24070.4 6.0.27 6.0.27 @@ -185,7 +185,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.26 + 6.0.27 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From a9611179dbf184d9f0c59284cf236356cd91afae Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:23:02 -0800 Subject: [PATCH 1132/1244] Update branding to 6.0.420 (#18528) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a3aef0fc8f61..e6d73f51f08f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 19 + 20 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From b30ddf54fe2452915f30c18db00c8cf22cd1b6ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 09:43:14 -0800 Subject: [PATCH 1133/1244] [release/6.0.4xx] Update to latest WiX version (#18607) Co-authored-by: Jacques Eloff --- eng/Versions.props | 5 ++++- src/redist/targets/GenerateMSIs.targets | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2c93bf532683..14bcc4e953ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,10 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 + + 3.14.0-8606.20240208.1 diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index d306f311e2bf..47aac67a4fdc 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -13,7 +13,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From 683f2541f58634bd5912c0055ba1da0c663483dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 21:23:12 +0000 Subject: [PATCH 1134/1244] Update dependencies from https://github.com/dotnet/arcade build 20240213.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24059.3 -> To Version 6.0.0-beta.24113.1 --- NuGet.config | 16 +++++++++++++-- eng/Version.Details.xml | 12 +++++------ eng/Versions.props | 2 +- eng/common/post-build/publish-using-darc.ps1 | 4 ++-- .../templates/job/publish-build-assets.yml | 10 +++++----- eng/common/templates/jobs/jobs.yml | 10 +++++----- .../templates/post-build/post-build.yml | 20 +++++++++---------- global.json | 4 ++-- 8 files changed, 45 insertions(+), 33 deletions(-) diff --git a/NuGet.config b/NuGet.config index da7974fae05f..b2706717afb5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,28 @@ - + + + + + + + + @@ -42,15 +49,20 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf9f76f91c52..0a205dc59e15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d5db6dd5d71c..4bf47577d9b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24059.3 + 6.0.0-beta.24113.1 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1e779fec4dd1..5a3a32ea8d75 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 239b17010fa7..bd3d54b760c2 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -51,7 +51,7 @@ jobs: checkDownloadedFiles: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: NuGetAuthenticate@1 @@ -74,7 +74,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -83,7 +83,7 @@ jobs: Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - + - task: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -109,7 +109,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -118,4 +118,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 9c4becbc8592..f70826518cca 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: enabled: false # Optional: Include toolset dependencies in the generated graph files includeToolset: 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: [] @@ -40,7 +40,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: @@ -68,7 +68,7 @@ jobs: ${{ parameter.key }}: ${{ parameter.value }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: - template: ../job/publish-build-assets.yml parameters: @@ -88,8 +88,8 @@ jobs: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d49c6156bf0a..5a0bb8d96d20 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -124,8 +124,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -220,9 +220,9 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true @@ -253,8 +253,8 @@ stages: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -266,10 +266,10 @@ stages: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + 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 + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/global.json b/global.json index 8bf2c6315a9f..73265b36f99f 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.24059.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24113.1" } } From 60a78318e6361a5012cd67014014af17941f8247 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 19:41:10 +0000 Subject: [PATCH 1135/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.419-servicing.24070.9 -> To Version 6.0.420-servicing.24116.12 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.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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.27 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk --- NuGet.config | 30 ++++---------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 77 insertions(+), 89 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2706717afb5..02ae05121eaf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,21 @@ + - - - + - - - + - - - + - - - + @@ -49,21 +42,16 @@ + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a205dc59e15..3a589d218ae7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 752aa75c68aad44ea864a65c034e27555e5f3333 + 4c0f7dc35580c286a77d992688e924117cb24c05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 752aa75c68aad44ea864a65c034e27555e5f3333 + 4c0f7dc35580c286a77d992688e924117cb24c05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 752aa75c68aad44ea864a65c034e27555e5f3333 + 4c0f7dc35580c286a77d992688e924117cb24c05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 752aa75c68aad44ea864a65c034e27555e5f3333 + 4c0f7dc35580c286a77d992688e924117cb24c05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80de56dadb3864aec7e8edd3ae32a23aeda08285 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80de56dadb3864aec7e8edd3ae32a23aeda08285 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80de56dadb3864aec7e8edd3ae32a23aeda08285 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80de56dadb3864aec7e8edd3ae32a23aeda08285 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80de56dadb3864aec7e8edd3ae32a23aeda08285 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80de56dadb3864aec7e8edd3ae32a23aeda08285 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 417d650029c720dbd2138bcafbb78e2e4ff31bff + 364d4a968b15639648dbd2a6388a780da1ff65cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 417d650029c720dbd2138bcafbb78e2e4ff31bff + 364d4a968b15639648dbd2a6388a780da1ff65cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 417d650029c720dbd2138bcafbb78e2e4ff31bff + 364d4a968b15639648dbd2a6388a780da1ff65cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 417d650029c720dbd2138bcafbb78e2e4ff31bff + 364d4a968b15639648dbd2a6388a780da1ff65cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 417d650029c720dbd2138bcafbb78e2e4ff31bff + 364d4a968b15639648dbd2a6388a780da1ff65cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 417d650029c720dbd2138bcafbb78e2e4ff31bff + 364d4a968b15639648dbd2a6388a780da1ff65cc https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 00aa120ee558ecef9e6343f7eab1811139a22463 + 96b2386852cd27690ca3737fe9320a764329a55a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 00aa120ee558ecef9e6343f7eab1811139a22463 + 96b2386852cd27690ca3737fe9320a764329a55a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 00aa120ee558ecef9e6343f7eab1811139a22463 + 96b2386852cd27690ca3737fe9320a764329a55a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - de27019bd5bfbe9e4c0ba2303c7dc224c210a1a0 + bc3278cbf587ce04b8ae4efd1f2c6b8ed498939c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - de27019bd5bfbe9e4c0ba2303c7dc224c210a1a0 + bc3278cbf587ce04b8ae4efd1f2c6b8ed498939c @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - a9f209f82fadb1f694ae6932f92c32918e407ded + 925c59b436d60b9cd6b5df54c3f9be13a9512c95 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f695c3266f6c..f805271202ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.419 + 6.0.420 @@ -44,44 +44,44 @@ - 6.0.27 - 6.0.27 - 6.0.27-servicing.24070.2 - 6.0.27-servicing.24070.2 - 6.0.27-servicing.24070.2 - 6.0.27-servicing.24070.2 + 6.0.28 + 6.0.28 + 6.0.28-servicing.24115.9 + 6.0.28-servicing.24115.9 + 6.0.28-servicing.24115.9 + 6.0.28-servicing.24115.9 0.2.0 - 6.0.419-servicing.24070.9 - 6.0.419-servicing.24070.9 + 6.0.420-servicing.24116.12 + 6.0.420-servicing.24116.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.11 + 6.0.12 - 6.0.27-servicing.24069.12 - 6.0.27-servicing.24069.12 - 6.0.27 - 6.0.27 - 6.0.27 - 6.0.27 + 6.0.28-servicing.24114.25 + 6.0.28-servicing.24114.25 + 6.0.28 + 6.0.28 + 6.0.28 + 6.0.28 2.1.0 - 6.0.27-servicing.24070.4 - 6.0.27-servicing.24070.4 - 6.0.27 - 6.0.27 + 6.0.28-servicing.24114.9 + 6.0.28-servicing.24114.9 + 6.0.28 + 6.0.28 @@ -118,7 +118,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.419 + 6.0.420 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -188,7 +188,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.27 + 6.0.28 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From faed4ed636dfad9965607f62dcae46ca0067eacc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 22:16:50 +0000 Subject: [PATCH 1136/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.44 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.419-servicing.24070.9 -> To Version 6.0.420-servicing.24116.44 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.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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.27 -> To Version 6.0.28 (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 3a589d218ae7..5589d8aa0631 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 96b2386852cd27690ca3737fe9320a764329a55a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc3278cbf587ce04b8ae4efd1f2c6b8ed498939c + 68e5ea09e3a88316c3bd693c3963230a27606ac3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc3278cbf587ce04b8ae4efd1f2c6b8ed498939c + 68e5ea09e3a88316c3bd693c3963230a27606ac3 diff --git a/eng/Versions.props b/eng/Versions.props index f805271202ec..b3e8e7b2dbc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.420-servicing.24116.12 - 6.0.420-servicing.24116.12 + 6.0.420-servicing.24116.44 + 6.0.420-servicing.24116.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c073ccc9441e5e15febed575ec01ef79d8fe03d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 23:03:56 +0000 Subject: [PATCH 1137/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.55 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24116.44 -> To Version 6.0.420-servicing.24116.55 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.420 -> To Version 6.0.420 (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 02ae05121eaf..9414253e5b43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5589d8aa0631..0be9135be500 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 96b2386852cd27690ca3737fe9320a764329a55a + da00162921df1124e2f17a6504b15a309bf35460 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 96b2386852cd27690ca3737fe9320a764329a55a + da00162921df1124e2f17a6504b15a309bf35460 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 96b2386852cd27690ca3737fe9320a764329a55a + da00162921df1124e2f17a6504b15a309bf35460 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e5ea09e3a88316c3bd693c3963230a27606ac3 + 83b7402a7241ed0380d5076394d1025ea33788c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e5ea09e3a88316c3bd693c3963230a27606ac3 + 83b7402a7241ed0380d5076394d1025ea33788c3 diff --git a/eng/Versions.props b/eng/Versions.props index b3e8e7b2dbc9..98cc76c84188 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.420-servicing.24116.44 - 6.0.420-servicing.24116.44 + 6.0.420-servicing.24116.55 + 6.0.420-servicing.24116.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 65df1a97b0616aad3eac8015d1faf90e139290cf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:01:27 +0000 Subject: [PATCH 1138/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.67 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24116.44 -> To Version 6.0.420-servicing.24116.67 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.28 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk --- 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 9414253e5b43..f46fe850655f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0be9135be500..f63d5f834878 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c0f7dc35580c286a77d992688e924117cb24c05 + 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c0f7dc35580c286a77d992688e924117cb24c05 + 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c0f7dc35580c286a77d992688e924117cb24c05 + 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c0f7dc35580c286a77d992688e924117cb24c05 + 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating da00162921df1124e2f17a6504b15a309bf35460 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 83b7402a7241ed0380d5076394d1025ea33788c3 + 25b33c598e608f8cfc718ed83f69b0b7ad573195 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 83b7402a7241ed0380d5076394d1025ea33788c3 + 25b33c598e608f8cfc718ed83f69b0b7ad573195 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 98b10b3aea4e37eed5ad4875cd251cc94c854c1e + d84b22e24fc7da1157057093e978186f9f1cabee - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 12a1b47c5b9b55841e0aa39bb36c15ac05d4ce8a + b55e6d18ab0ec864273891a6f0741301253aa848 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 98cc76c84188..2d3771c468b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.27-servicing.24070.1 + 6.0.28-servicing.24115.14 - 6.0.27-servicing.24070.3 + 6.0.28-servicing.24116.8 @@ -56,8 +56,8 @@ - 6.0.420-servicing.24116.55 - 6.0.420-servicing.24116.55 + 6.0.420-servicing.24116.67 + 6.0.420-servicing.24116.67 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.28-servicing.24114.9 - 6.0.28-servicing.24114.9 + 6.0.28-servicing.24116.10 + 6.0.28-servicing.24116.10 6.0.28 6.0.28 From cd7b91bc6a921f7273b6d9bba76829d9f81180a1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:41:57 +0000 Subject: [PATCH 1139/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.82 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24116.44 -> To Version 6.0.420-servicing.24116.82 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.28 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk --- 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 f46fe850655f..ef85cf3d422c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f63d5f834878..8d899531423c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 364d4a968b15639648dbd2a6388a780da1ff65cc + ce993c8c6ca3d5af8133d66d7df91056d44d5788 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 364d4a968b15639648dbd2a6388a780da1ff65cc + ce993c8c6ca3d5af8133d66d7df91056d44d5788 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 364d4a968b15639648dbd2a6388a780da1ff65cc + ce993c8c6ca3d5af8133d66d7df91056d44d5788 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 364d4a968b15639648dbd2a6388a780da1ff65cc + ce993c8c6ca3d5af8133d66d7df91056d44d5788 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 364d4a968b15639648dbd2a6388a780da1ff65cc + ce993c8c6ca3d5af8133d66d7df91056d44d5788 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 364d4a968b15639648dbd2a6388a780da1ff65cc + ce993c8c6ca3d5af8133d66d7df91056d44d5788 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating da00162921df1124e2f17a6504b15a309bf35460 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 25b33c598e608f8cfc718ed83f69b0b7ad573195 + f9b62cc6d721f1a522f930234f5658f32a7bc09f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 25b33c598e608f8cfc718ed83f69b0b7ad573195 + f9b62cc6d721f1a522f930234f5658f32a7bc09f diff --git a/eng/Versions.props b/eng/Versions.props index 2d3771c468b3..3a020031103c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.28 6.0.28 - 6.0.28-servicing.24115.9 - 6.0.28-servicing.24115.9 - 6.0.28-servicing.24115.9 - 6.0.28-servicing.24115.9 + 6.0.28-servicing.24116.17 + 6.0.28-servicing.24116.17 + 6.0.28-servicing.24116.17 + 6.0.28-servicing.24116.17 0.2.0 - 6.0.420-servicing.24116.67 - 6.0.420-servicing.24116.67 + 6.0.420-servicing.24116.82 + 6.0.420-servicing.24116.82 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 70763aae4d33bbbb5ce2b01c2cb64229adb2acb2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 01:27:57 +0000 Subject: [PATCH 1140/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.91 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24116.82 -> To Version 6.0.420-servicing.24116.91 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.28 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk --- 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 ef85cf3d422c..86ae017d6661 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d899531423c..7ed9892a0ee6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 + ef9b1726104aebb05c22498486cd6f4c1c3313b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 + ef9b1726104aebb05c22498486cd6f4c1c3313b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 + ef9b1726104aebb05c22498486cd6f4c1c3313b7 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 + ef9b1726104aebb05c22498486cd6f4c1c3313b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating da00162921df1124e2f17a6504b15a309bf35460 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f9b62cc6d721f1a522f930234f5658f32a7bc09f + 2248f8cfdce54f62fde2b9bcf56fe690af7ae5a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f9b62cc6d721f1a522f930234f5658f32a7bc09f + 2248f8cfdce54f62fde2b9bcf56fe690af7ae5a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d84b22e24fc7da1157057093e978186f9f1cabee + 418b2633a2b67a2a1a61b1481a79f53eaa60a237 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b55e6d18ab0ec864273891a6f0741301253aa848 + 51556c9bd2c6057c7bd3a5999e20c4012aa253df https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3a020031103c..4123f6202d3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.28-servicing.24115.14 + 6.0.28-servicing.24116.7 - 6.0.28-servicing.24116.8 + 6.0.28-servicing.24116.14 @@ -56,8 +56,8 @@ - 6.0.420-servicing.24116.82 - 6.0.420-servicing.24116.82 + 6.0.420-servicing.24116.91 + 6.0.420-servicing.24116.91 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.28-servicing.24116.10 - 6.0.28-servicing.24116.10 + 6.0.28-servicing.24116.13 + 6.0.28-servicing.24116.13 6.0.28 6.0.28 From f10228391844c7ba77af4afa2128bc14b77532b4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 21 Feb 2024 02:00:49 +0000 Subject: [PATCH 1141/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240220.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24116.91 -> To Version 6.0.420-servicing.24120.17 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.28 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 86ae017d6661..269ad17f99b1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ed9892a0ee6..7e3ef61e3ccb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ef9b1726104aebb05c22498486cd6f4c1c3313b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating da00162921df1124e2f17a6504b15a309bf35460 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2248f8cfdce54f62fde2b9bcf56fe690af7ae5a2 + 6ccd32f12db9321477c4b8658eaa3a44681b6740 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2248f8cfdce54f62fde2b9bcf56fe690af7ae5a2 + 6ccd32f12db9321477c4b8658eaa3a44681b6740 diff --git a/eng/Versions.props b/eng/Versions.props index 4123f6202d3f..0670abf060d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.420-servicing.24116.91 - 6.0.420-servicing.24116.91 + 6.0.420-servicing.24120.17 + 6.0.420-servicing.24120.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.28-servicing.24114.25 - 6.0.28-servicing.24114.25 + 6.0.28-servicing.24120.7 + 6.0.28-servicing.24120.7 6.0.28 6.0.28 6.0.28 From 9a74022e76c010cbee659a41947e1d068e238ea6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 21 Feb 2024 05:09:44 +0000 Subject: [PATCH 1142/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240220.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24120.17 -> To Version 6.0.420-servicing.24120.26 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.28 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 269ad17f99b1..38ac022d2a4e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,13 +42,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e3ef61e3ccb..27a065ab77be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ce993c8c6ca3d5af8133d66d7df91056d44d5788 + 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ce993c8c6ca3d5af8133d66d7df91056d44d5788 + 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ce993c8c6ca3d5af8133d66d7df91056d44d5788 + 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ce993c8c6ca3d5af8133d66d7df91056d44d5788 + 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ce993c8c6ca3d5af8133d66d7df91056d44d5788 + 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ce993c8c6ca3d5af8133d66d7df91056d44d5788 + 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - da00162921df1124e2f17a6504b15a309bf35460 + d6969baea023232e2739e505f3723228f949d8fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - da00162921df1124e2f17a6504b15a309bf35460 + d6969baea023232e2739e505f3723228f949d8fa https://dev.azure.com/dnceng/internal/_git/dotnet-templating - da00162921df1124e2f17a6504b15a309bf35460 + d6969baea023232e2739e505f3723228f949d8fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ccd32f12db9321477c4b8658eaa3a44681b6740 + 7392200c7ca1a316b5ae7e98263ba6c26be4f833 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ccd32f12db9321477c4b8658eaa3a44681b6740 + 7392200c7ca1a316b5ae7e98263ba6c26be4f833 diff --git a/eng/Versions.props b/eng/Versions.props index 0670abf060d2..66d734f30bbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.28 6.0.28 - 6.0.28-servicing.24116.17 - 6.0.28-servicing.24116.17 - 6.0.28-servicing.24116.17 - 6.0.28-servicing.24116.17 + 6.0.28-servicing.24120.5 + 6.0.28-servicing.24120.5 + 6.0.28-servicing.24120.5 + 6.0.28-servicing.24120.5 0.2.0 - 6.0.420-servicing.24120.17 - 6.0.420-servicing.24120.17 + 6.0.420-servicing.24120.26 + 6.0.420-servicing.24120.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 61ea15f7ce1e1bbdc55d17e5e088434bd8a1647c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 21 Feb 2024 07:49:44 +0000 Subject: [PATCH 1143/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240220.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24120.26 -> To Version 6.0.420-servicing.24120.33 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.28 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk --- 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 38ac022d2a4e..facaf96b0d6d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27a065ab77be..d6f61a051974 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef9b1726104aebb05c22498486cd6f4c1c3313b7 + c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef9b1726104aebb05c22498486cd6f4c1c3313b7 + c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef9b1726104aebb05c22498486cd6f4c1c3313b7 + c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef9b1726104aebb05c22498486cd6f4c1c3313b7 + c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d6969baea023232e2739e505f3723228f949d8fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7392200c7ca1a316b5ae7e98263ba6c26be4f833 + c1d600871abca733031eac0a17821179193da113 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7392200c7ca1a316b5ae7e98263ba6c26be4f833 + c1d600871abca733031eac0a17821179193da113 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 418b2633a2b67a2a1a61b1481a79f53eaa60a237 + 9de94bff9795bb0644835098b91e81edccfaa367 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 51556c9bd2c6057c7bd3a5999e20c4012aa253df + 4bb3a1d8ec37eda521bbf94605c43b035d2718b1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 66d734f30bbe..c25059d2cc4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.28-servicing.24116.7 + 6.0.28-servicing.24120.4 - 6.0.28-servicing.24116.14 + 6.0.28-servicing.24120.2 @@ -56,8 +56,8 @@ - 6.0.420-servicing.24120.26 - 6.0.420-servicing.24120.26 + 6.0.420-servicing.24120.33 + 6.0.420-servicing.24120.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.28-servicing.24116.13 - 6.0.28-servicing.24116.13 + 6.0.28-servicing.24120.3 + 6.0.28-servicing.24120.3 6.0.28 6.0.28 From c5f74545cae64c7f55de19867f98bfd45e84daff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:56:58 -0600 Subject: [PATCH 1144/1244] [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#18733) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2706717afb5..03d3587a670c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,26 +9,14 @@ - - - - - - - - - - - - @@ -51,19 +39,10 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a205dc59e15..bc6caff49871 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/source-build-reference-packages - 6425c284100043ea5829deb255811d3487a91fb6 + 2e6cb1a0008be982effb0c5d9e96a4ff138352d4 From 0fd3c1e80cc4458d064d1a05f2eef0d1021ad86c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:10 -0800 Subject: [PATCH 1145/1244] Update branding to 6.0.421 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f695c3266f6c..b3f94eb3d390 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 20 + 21 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From ca47aa74e9fb8975398bd1dc3a13846bd9d5accf Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 11 Mar 2024 02:15:24 -0700 Subject: [PATCH 1146/1244] [release/6.0.4xx] Add -pr version of pipeline --- .vsts-pr.yml | 437 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 437 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000000..0b653655fca1 --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,437 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/3.* + - internal/release/5.* + - internal/release/6.* + +variables: +- name: _PublishUsingPipelines + value: false +- name: PostBuildSign + value: true +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: Codeql.Enabled + value: true + - group: DotNet-DotNetCli-Storage + - group: DotNet-Installer-SDLValidation-Params + - name: _PublishUsingPipelines + value: true + +# Default to running tests in PRs and public CI, but not in official builds +- name: _WindowsTestArg + value: '-test' +- name: _NonWindowsTestArg + value: '--test' +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _WindowsTestArg + value: '' + - name: _NonWindowsTestArg + value: '' + +- name: _InternalRuntimeDownloadArgs + value: '' + +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBuilds storage account read tokens + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) + +stages: +- stage: build + jobs: + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifact: BuildConfiguration + displayName: Publish Build Config + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Debug_x86: + _BuildConfig: Debug + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_ES_Debug_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: es + _AdditionalBuildParameters: '' + _TestArg: '' + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + # Always run builds + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_arm: + _BuildConfig: Release + _BuildArchitecture: arm + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + # Always run builds + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_29_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.29' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_1_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Rhel_7_2_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '' + _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: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_arm: + _BuildConfig: Debug + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Debug_arm64: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # 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: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + # Always run builds + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Darwin + pool: + vmImage: 'macOS-latest' + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + + - template: /eng/common/templates/jobs/source-build.yml + + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + + # For .NET 6.0, source-build only supports 6.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball + + # https://github.com/dotnet/core-sdk/issues/248 + # - template: /eng/build.yml + # parameters: + # agentOs: FreeBSD + # queue: + # name: dnceng-freebsd-internal + # timeoutInMinutes: 180 + # matrix: + # Build_Release: + # _BuildConfig: Release + # _BuildArchitecture: 'x64' + # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2017.amd64 + + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: eng\common\templates\post-build\post-build.yml + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' From 54c244e049234576ff6d4b6b8775e84b125be5f5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 09:51:06 -0700 Subject: [PATCH 1147/1244] Update the nuget and msbuild ref versions for the installer tasks to the matching version we ship --- eng/Versions.props | 7 ++++++- src/core-sdk-tasks/core-sdk-tasks.csproj | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index b3f94eb3d390..54fa8e28daea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -93,7 +93,12 @@ - 5.8.0 + 6.0.6-rc.4 + $(NuGetBuildTasksPackageVersion) + + + + 17.0.1 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5ad1f11af317..f92da6189ddf 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -9,12 +9,12 @@ - - + + - + From 0178176a36e6016f046ab9529945f4789ac6bb51 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 09:54:04 -0700 Subject: [PATCH 1148/1244] Update to the 6.0.4xx version --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 54fa8e28daea..55355afce81f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -93,12 +93,12 @@ - 6.0.6-rc.4 + 6.3.4-rc.2 $(NuGetBuildTasksPackageVersion) - 17.0.1 + 17.3.2 From 32965a6b7c3d408bee9f34fcf482951c74d76ab5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 11:38:45 -0700 Subject: [PATCH 1149/1244] Update the SRM version to match the version coming from msbuild --- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index f92da6189ddf..5fc33672afb5 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -14,7 +14,7 @@ - + From 7e397bfe9b6521dd821f7b34467a4182621a6762 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 15:10:49 +0000 Subject: [PATCH 1150/1244] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24113.1 -> To Version 6.0.0-beta.24162.4 --- eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +- eng/common/templates-official/job/job.yml | 276 +++++++++++++++++ .../templates-official/job/onelocbuild.yml | 109 +++++++ .../job/publish-build-assets.yml | 121 ++++++++ .../templates-official/job/source-build.yml | 64 ++++ .../job/source-index-stage1.yml | 59 ++++ .../templates-official/jobs/codeql-build.yml | 31 ++ eng/common/templates-official/jobs/jobs.yml | 100 +++++++ .../templates-official/jobs/source-build.yml | 46 +++ .../post-build/common-variables.yml | 26 ++ .../post-build/post-build.yml | 277 ++++++++++++++++++ .../post-build/setup-maestro-vars.yml | 70 +++++ .../post-build/trigger-subscription.yml | 13 + .../steps/add-build-to-channel.yml | 13 + .../steps/component-governance.yml | 10 + .../steps/execute-codeql.yml | 32 ++ .../steps/generate-sbom.yml | 44 +++ .../templates-official/steps/publish-logs.yml | 23 ++ .../templates-official/steps/retain-build.yml | 28 ++ .../steps/send-to-helix.yml | 94 ++++++ .../templates-official/steps/source-build.yml | 108 +++++++ .../variables/sdl-variables.yml | 7 + global.json | 6 +- 25 files changed, 1574 insertions(+), 23 deletions(-) create mode 100644 eng/common/templates-official/job/job.yml create mode 100644 eng/common/templates-official/job/onelocbuild.yml create mode 100644 eng/common/templates-official/job/publish-build-assets.yml create mode 100644 eng/common/templates-official/job/source-build.yml create mode 100644 eng/common/templates-official/job/source-index-stage1.yml create mode 100644 eng/common/templates-official/jobs/codeql-build.yml create mode 100644 eng/common/templates-official/jobs/jobs.yml create mode 100644 eng/common/templates-official/jobs/source-build.yml create mode 100644 eng/common/templates-official/post-build/common-variables.yml create mode 100644 eng/common/templates-official/post-build/post-build.yml create mode 100644 eng/common/templates-official/post-build/setup-maestro-vars.yml create mode 100644 eng/common/templates-official/post-build/trigger-subscription.yml create mode 100644 eng/common/templates-official/steps/add-build-to-channel.yml create mode 100644 eng/common/templates-official/steps/component-governance.yml create mode 100644 eng/common/templates-official/steps/execute-codeql.yml create mode 100644 eng/common/templates-official/steps/generate-sbom.yml create mode 100644 eng/common/templates-official/steps/publish-logs.yml create mode 100644 eng/common/templates-official/steps/retain-build.yml create mode 100644 eng/common/templates-official/steps/send-to-helix.yml create mode 100644 eng/common/templates-official/steps/source-build.yml create mode 100644 eng/common/templates-official/variables/sdl-variables.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc6caff49871..e19d8eb63a12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 96facbceaca1e4eb498055c005088764d3b38dff + c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75 - + https://github.com/dotnet/arcade - 96facbceaca1e4eb498055c005088764d3b38dff + c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75 - + https://github.com/dotnet/arcade - 96facbceaca1e4eb498055c005088764d3b38dff + c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b3f94eb3d390..78e95c0ee552 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24113.1 + 6.0.0-beta.24162.4 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 18823840b112..0182856edd00 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 # Add source entry to PackageSources -function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) @@ -49,11 +49,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern Write-Host "Package source $SourceName already present." } - AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password + AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $pwd } # Add a credential node for the specified source -function AddCredential($creds, $source, $username, $password) { +function AddCredential($creds, $source, $username, $pwd) { # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -82,17 +82,17 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("key", "ClearTextPassword") $sourceElement.AppendChild($passwordElement) | Out-Null } - $passwordElement.SetAttribute("value", $Password) + $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." ForEach ($PackageSource in $maestroPrivateSources) { Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd } } @@ -144,24 +144,24 @@ if ($disabledSources -ne $null) { $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } $dotnet5Source = $sources.SelectSingleNode("add[@key='dotnet5']") if ($dotnet5Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } $dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']") if ($dotnet6Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } $doc.Save($filename) diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml new file mode 100644 index 000000000000..616bfc38696d --- /dev/null +++ b/eng/common/templates-official/job/job.yml @@ -0,0 +1,276 @@ +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +parameters: +# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + cancelTimeoutInMinutes: '' + condition: '' + container: '' + continueOnError: false + dependsOn: '' + displayName: '' + pool: '' + steps: [] + strategy: '' + timeoutInMinutes: '' + variables: [] + workspace: '' + templateContext: '' + +# Job base template specific parameters + # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md + artifacts: '' + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishBuildAssets: false + enablePublishTestResults: false + enablePublishUsingPipelines: false + disableComponentGovernance: '' + mergeTestResults: false + testRunTitle: '' + testResultsFormat: '' + name: '' + preSteps: [] + runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 6.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + +jobs: +- job: ${{ parameters.name }} + + ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: + cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} + + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + + ${{ if ne(parameters.container, '') }}: + container: ${{ parameters.container }} + + ${{ if ne(parameters.continueOnError, '') }}: + continueOnError: ${{ parameters.continueOnError }} + + ${{ if ne(parameters.dependsOn, '') }}: + dependsOn: ${{ parameters.dependsOn }} + + ${{ if ne(parameters.displayName, '') }}: + displayName: ${{ parameters.displayName }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + + ${{ if ne(parameters.timeoutInMinutes, '') }}: + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + + variables: + - ${{ if ne(parameters.enableTelemetry, 'false') }}: + - name: DOTNET_CLI_TELEMETRY_PROFILE + value: '$(Build.Repository.Uri)' + - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: + - name: EnableRichCodeNavigation + value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 + - ${{ each variable in parameters.variables }}: + # handle name-value variable syntax + # example: + # - name: [key] + # value: [value] + - ${{ if ne(variable.name, '') }}: + - name: ${{ variable.name }} + value: ${{ variable.value }} + + # handle variable groups + - ${{ if ne(variable.group, '') }}: + - group: ${{ variable.group }} + + # handle key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}: + - ${{ each pair in variable }}: + - name: ${{ pair.key }} + value: ${{ pair.value }} + + # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds + - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + + ${{ if ne(parameters.workspace, '') }}: + workspace: ${{ parameters.workspace }} + + steps: + - ${{ if ne(parameters.preSteps, '') }}: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - task: MicroBuildSigningPlugin@3 + displayName: Install MicroBuild plugin + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + env: + TeamName: $(_TeamName) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + + - task: NuGetAuthenticate@1 + + - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: current + artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} + targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} + itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} + + - ${{ each step in parameters.steps }}: + - ${{ step }} + + - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: + - task: RichCodeNavIndexer@0 + displayName: RichCodeNav Upload + inputs: + languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} + richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + continueOnError: true + + - template: /eng/common/templates-official/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} + + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: MicroBuildCleanup@1 + displayName: Execute Microbuild cleanup tasks + condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + env: + TeamName: $(_TeamName) + + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if or(eq(parameters.artifacts.publish.artifacts, 'true'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - task: CopyFiles@2 + displayName: Gather binaries for publish to artifacts + inputs: + SourceFolder: 'artifacts/bin' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' + - task: CopyFiles@2 + displayName: Gather packages for publish to artifacts + inputs: + SourceFolder: 'artifacts/packages' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish pipeline artifacts + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} + continueOnError: true + condition: always() + - ${{ if or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}: + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: 'artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' + continueOnError: true + condition: always() + + - ${{ if or(eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - ${{ if and(ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.ArtifactStagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + continueOnError: true + condition: always() + + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: + - task: PublishTestResults@2 + displayName: Publish XUnit Test Results + inputs: + testResultsFormat: 'xUnit' + testResultsFiles: '*.xml' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: + - task: PublishTestResults@2 + displayName: Publish TRX Test Results + inputs: + testResultsFormat: 'VSTest' + testResultsFiles: '*.trx' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + + - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.StagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.StagingDirectory)/AssetManifests' + PublishLocation: Container + 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-official/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml new file mode 100644 index 000000000000..e0e9a4bc5129 --- /dev/null +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -0,0 +1,109 @@ +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: '' + + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex + GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + + SourcesDirectory: $(Build.SourcesDirectory) + CreatePr: true + AutoCompletePr: false + ReusePr: true + UseLfLineEndings: true + UseCheckedInLocProjectJson: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main + condition: '' + +jobs: +- job: OneLocBuild + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild + + ${{ 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: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022-pt + os: windows + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + + + steps: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: eng/Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + ${{ 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') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ if ne(parameters.MirrorRepo, '') }}: + isMirrorRepoSelected: true + gitHubOrganization: ${{ parameters.GitHubOrg }} + mirrorRepo: ${{ parameters.MirrorRepo }} + mirrorBranch: ${{ parameters.MirrorBranch }} + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Localization Files + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish LocProject.json + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml new file mode 100644 index 000000000000..9498aa412db8 --- /dev/null +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -0,0 +1,121 @@ +parameters: + configuration: 'Debug' + + # Optional: condition for the job to run + condition: '' + + # Optional: 'true' if future jobs should run even if this job fails + continueOnError: false + + # Optional: dependencies of the job + dependsOn: '' + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: {} + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishUsingPipelines: false + +jobs: +- job: Asset_Registry_Publish + + dependsOn: ${{ parameters.dependsOn }} + + displayName: Publish to Build Asset Registry + + pool: ${{ parameters.pool }} + + variables: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _BuildConfig + value: ${{ parameters.configuration }} + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: runCodesignValidationInjection + value: false + + steps: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download artifact + inputs: + artifactName: AssetManifests + downloadPath: '$(Build.StagingDirectory)/Download' + checkDownloadedFiles: true + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Enable cross-org NuGet feed authentication + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) + + - task: PowerShell@2 + displayName: Publish Build Assets + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' + /p:BuildAssetRegistryToken=$(MaestroAccessToken) + /p:MaestroApiEndpoint=https://maestro.dot.net + /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} + /p:Configuration=$(_BuildConfig) + /p:OfficialBuildId=$(Build.BuildNumber) + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: powershell@2 + displayName: Create ReleaseConfigs Artifact + inputs: + targetType: inline + script: | + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish ReleaseConfigs Artifact + inputs: + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - task: powershell@2 + displayName: Check if SymbolPublishingExclusionsFile.txt exists + inputs: + targetType: inline + script: | + $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + if(Test-Path -Path $symbolExclusionfile) + { + Write-Host "SymbolExclusionFile exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" + } + else{ + Write-Host "Symbols Exclusion file does not exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" + } + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish SymbolPublishingExclusionsFile Artifact + condition: eq(variables['SymbolExclusionFile'], 'true') + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: + - template: /eng/common/templates-official/steps/publish-logs.yml + parameters: + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml new file mode 100644 index 000000000000..96be5e6e115a --- /dev/null +++ b/eng/common/templates-official/job/source-build.yml @@ -0,0 +1,64 @@ +parameters: + # This template adds arcade-powered source-build to CI. The template produces a server job with a + # default ID 'Source_Build_Complete' to put in a dependency list if necessary. + + # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. + jobNamePrefix: 'Source_Build' + + # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for + # managed-only repositories. This is an object with these properties: + # + # name: '' + # The name of the job. This is included in the job ID. + # targetRID: '' + # The name of the target RID to use, instead of the one auto-detected by Arcade. + # nonPortable: false + # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than + # linux-x64), and compiling against distro-provided packages rather than portable ones. + # skipPublishValidation: false + # Disables publishing validation. By default, a check is performed to ensure no packages are + # published by source-build. + # container: '' + # A container to use. Runs in docker. + # pool: {} + # A pool to use. Runs directly on an agent. + # buildScript: '' + # Specifies the build script to invoke to perform the build in the repo. The default + # './build.sh' should work for typical Arcade repositories, but this is customizable for + # difficult situations. + # jobProperties: {} + # A list of job properties to inject at the top level, for potential extensibility beyond + # container and pool. + platform: {} + +jobs: +- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} + displayName: Source-Build (${{ parameters.platform.name }}) + + ${{ each property in parameters.platform.jobProperties }}: + ${{ property.key }}: ${{ property.value }} + + ${{ if ne(parameters.platform.container, '') }}: + container: ${{ parameters.platform.container }} + + ${{ if eq(parameters.platform.pool, '') }}: + # 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: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + image: 1es-mariner-2-pt + os: linux + ${{ if ne(parameters.platform.pool, '') }}: + pool: ${{ parameters.platform.pool }} + + workspace: + clean: all + + steps: + - template: /eng/common/templates-official/steps/source-build.yml + parameters: + platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml new file mode 100644 index 000000000000..3d8b0b966cb7 --- /dev/null +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -0,0 +1,59 @@ +parameters: + runAsPublic: false + sourceIndexPackageVersion: 1.0.1-20210614.1 + sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json + sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" + preSteps: [] + binlogPath: artifacts/log/Debug/Build.binlog + pool: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022-pt + os: windows + condition: '' + dependsOn: '' + +jobs: +- job: SourceIndexStage1 + dependsOn: ${{ parameters.dependsOn }} + condition: ${{ parameters.condition }} + variables: + - name: SourceIndexPackageVersion + value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexPackageSource + value: ${{ parameters.sourceIndexPackageSource }} + - name: BinlogPath + value: ${{ parameters.binlogPath }} + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: source-dot-net stage1 variables + + pool: ${{ parameters.pool }} + steps: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - task: UseDotNet@2 + displayName: Use .NET Core sdk 3.1 + inputs: + packageType: sdk + version: 3.1.x + installationPath: $(Agent.TempDirectory)/dotnet + workingDirectory: $(Agent.TempDirectory) + + - script: | + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + displayName: Download Tools + # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. + workingDirectory: $(Agent.TempDirectory) + + - script: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository + + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + displayName: Process Binlog into indexable sln + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + displayName: Upload stage1 artifacts to source index + env: + BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) diff --git a/eng/common/templates-official/jobs/codeql-build.yml b/eng/common/templates-official/jobs/codeql-build.yml new file mode 100644 index 000000000000..0bf7ee29f408 --- /dev/null +++ b/eng/common/templates-official/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-official/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.110.1 + - 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-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml new file mode 100644 index 000000000000..669ccd48f7f0 --- /dev/null +++ b/eng/common/templates-official/jobs/jobs.yml @@ -0,0 +1,100 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: Enable publishing using release pipelines + enablePublishUsingPipelines: false + + # Optional: Enable running the source-build jobs to build repo from source + enableSourceBuild: false + + # Optional: Parameters for source-build template. + # See /eng/common/templates-official/jobs/source-build.yml for options + sourceBuildParameters: [] + + graphFileGeneration: + # Optional: Enable generating the graph files at the end of the build + enabled: false + # Optional: Include toolset dependencies in the generated graph files + includeToolset: 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: Override automatically derived dependsOn value for "publish build assets" job + publishBuildAssetsDependsOn: '' + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + enableSourceIndex: false + sourceIndexParams: {} + +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +jobs: +- ${{ each job in parameters.jobs }}: + - template: ../job/job.yml + parameters: + # pass along parameters + ${{ each parameter in parameters }}: + ${{ if ne(parameter.key, 'jobs') }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # pass along job properties + ${{ each property in job }}: + ${{ if ne(property.key, 'job') }}: + ${{ property.key }}: ${{ property.value }} + + name: ${{ job.job }} + +- ${{ if eq(parameters.enableSourceBuild, true) }}: + - template: /eng/common/templates-official/jobs/source-build.yml + parameters: + allCompletedJobId: Source_Build_Complete + ${{ each parameter in parameters.sourceBuildParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if eq(parameters.enableSourceIndex, 'true') }}: + - template: ../job/source-index-stage1.yml + parameters: + runAsPublic: ${{ parameters.runAsPublic }} + ${{ each parameter in parameters.sourceIndexParams }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - template: ../job/publish-build-assets.yml + parameters: + continueOnError: ${{ parameters.continueOnError }} + dependsOn: + - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.publishBuildAssetsDependsOn }}: + - ${{ job.job }} + - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.jobs }}: + - ${{ job.job }} + - ${{ if eq(parameters.enableSourceBuild, true) }}: + - Source_Build_Complete + 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: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022-pt + os: windows + + runAsPublic: ${{ parameters.runAsPublic }} + publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml new file mode 100644 index 000000000000..2159009dc8e1 --- /dev/null +++ b/eng/common/templates-official/jobs/source-build.yml @@ -0,0 +1,46 @@ +parameters: + # This template adds arcade-powered source-build to CI. A job is created for each platform, as + # well as an optional server job that completes when all platform jobs complete. + + # The name of the "join" job for all source-build platforms. If set to empty string, the job is + # not included. Existing repo pipelines can use this job depend on all source-build jobs + # completing without maintaining a separate list of every single job ID: just depend on this one + # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. + allCompletedJobId: '' + + # See /eng/common/templates-official/job/source-build.yml + jobNamePrefix: 'Source_Build' + + # This is the default platform provided by Arcade, intended for use by a managed-only repo. + defaultManagedPlatform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + + # Defines the platforms on which to run build jobs. One job is created for each platform, and the + # object in this array is sent to the job template as 'platform'. If no platforms are specified, + # one job runs on 'defaultManagedPlatform'. + platforms: [] + +jobs: + +- ${{ if ne(parameters.allCompletedJobId, '') }}: + - job: ${{ parameters.allCompletedJobId }} + displayName: Source-Build Complete + pool: server + dependsOn: + - ${{ each platform in parameters.platforms }}: + - ${{ parameters.jobNamePrefix }}_${{ platform.name }} + - ${{ if eq(length(parameters.platforms), 0) }}: + - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} + +- ${{ each platform in parameters.platforms }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ platform }} + +- ${{ if eq(length(parameters.platforms), 0) }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ parameters.defaultManagedPlatform }} diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml new file mode 100644 index 000000000000..fae340f4d20d --- /dev/null +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -0,0 +1,26 @@ +variables: + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-Blob-Feed + - group: DotNet-DotNetCli-Storage + - group: DotNet-MSRC-Storage + - group: Publish-Build-Assets + + # Whether the build is internal or not + - name: IsInternalBuild + value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + + # Default Maestro++ API Endpoint and API Version + - name: MaestroApiEndPoint + value: "https://maestro.dot.net" + - name: MaestroApiAccessToken + value: $(MaestroAccessToken) + - name: MaestroApiVersion + value: "2020-02-20" + + - name: SourceLinkCLIVersion + value: 3.0.0 + - name: SymbolToolVersion + value: 1.0.1 + + - name: runCodesignValidationInjection + value: false diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml new file mode 100644 index 000000000000..80bfa4946c69 --- /dev/null +++ b/eng/common/templates-official/post-build/post-build.yml @@ -0,0 +1,277 @@ +parameters: + # 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 + + - name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + + - name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + + - 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 + - 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 + - name: validateDependsOn + type: object + default: + - build + + - name: publishDependsOn + type: object + default: + - Validate + +stages: +- ${{ 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: + - job: + displayName: NuGet Validation + condition: eq( ${{ parameters.enableNugetValidation }}, 'true') + 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: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022-pt + os: windows + + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + + - job: + displayName: Signing Validation + condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) + 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: AzurePipelines-EO + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + itemPattern: | + ** + !**/Microsoft.SourceBuild.Intermediate.*.nupkg + + # 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@1 + 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) + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: ../steps/publish-logs.yml + parameters: + StageLabel: 'Validation' + JobLabel: 'Signing' + + - job: + displayName: SourceLink Validation + condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') + 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: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true + +- 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: AzurePipelines-EO + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - 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 }}' diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml new file mode 100644 index 000000000000..0c87f149a4ad --- /dev/null +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -0,0 +1,70 @@ +parameters: + BARBuildId: '' + PromoteToChannelIds: '' + +steps: + - ${{ 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 + inputs: + targetType: inline + pwsh: true + script: | + try { + if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { + $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt + + $BarId = $Content | Select -Index 0 + $Channels = $Content | Select -Index 1 + $IsStableBuild = $Content | Select -Index 2 + + $AzureDevOpsProject = $Env:System_TeamProject + $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId + $AzureDevOpsBuildId = $Env:Build_BuildId + } + 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 + } + + 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-official/post-build/trigger-subscription.yml b/eng/common/templates-official/post-build/trigger-subscription.yml new file mode 100644 index 000000000000..da669030daf6 --- /dev/null +++ b/eng/common/templates-official/post-build/trigger-subscription.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Triggering subscriptions + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + arguments: -SourceRepo $(Build.Repository.Uri) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/add-build-to-channel.yml b/eng/common/templates-official/steps/add-build-to-channel.yml new file mode 100644 index 000000000000..f67a210d62f3 --- /dev/null +++ b/eng/common/templates-official/steps/add-build-to-channel.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Add Build to Channel + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 + arguments: -BuildId $(BARBuildId) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroApiAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml new file mode 100644 index 000000000000..babc2757d8d1 --- /dev/null +++ b/eng/common/templates-official/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/eng/common/templates-official/steps/execute-codeql.yml b/eng/common/templates-official/steps/execute-codeql.yml new file mode 100644 index 000000000000..9b4a5ffa30a7 --- /dev/null +++ b/eng/common/templates-official/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-official/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/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml new file mode 100644 index 000000000000..7fc4f358023d --- /dev/null +++ b/eng/common/templates-official/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: 1ES.PublishPipelineArtifact@1 + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + inputs: + targetPath: '${{parameters.manifestDirPath}}' + artifactName: $(ARTIFACT_NAME) + diff --git a/eng/common/templates-official/steps/publish-logs.yml b/eng/common/templates-official/steps/publish-logs.yml new file mode 100644 index 000000000000..04012fed182a --- /dev/null +++ b/eng/common/templates-official/steps/publish-logs.yml @@ -0,0 +1,23 @@ +parameters: + StageLabel: '' + JobLabel: '' + +steps: +- task: Powershell@2 + displayName: Prepare Binlogs to Upload + inputs: + targetType: inline + script: | + New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + continueOnError: true + condition: always() + +- task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' + PublishLocation: Container + ArtifactName: PostBuildLogs + continueOnError: true + condition: always() diff --git a/eng/common/templates-official/steps/retain-build.yml b/eng/common/templates-official/steps/retain-build.yml new file mode 100644 index 000000000000..83d97a26a01f --- /dev/null +++ b/eng/common/templates-official/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml new file mode 100644 index 000000000000..cd02ae1607f3 --- /dev/null +++ b/eng/common/templates-official/steps/send-to-helix.yml @@ -0,0 +1,94 @@ +# Please remember to update the documentation if you make changes to these parameters! +parameters: + HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ + HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' + HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number + HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixConfiguration: '' # optional -- additional property attached to a job + HelixPreCommands: '' # optional -- commands to run before Helix work item execution + HelixPostCommands: '' # optional -- commands to run after Helix work item execution + WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects + WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects + WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects + CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload + XUnitProjects: '' # optional -- semicolon delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true + XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects + XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects + XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner + XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects + IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control + WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." + IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set + HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting int) + Creator: '' # optional -- if the build is external, use this to specify who is sending the job + DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO + condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() + continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + +steps: + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml new file mode 100644 index 000000000000..9eb7e51456a7 --- /dev/null +++ b/eng/common/templates-official/steps/source-build.yml @@ -0,0 +1,108 @@ +parameters: + # This template adds arcade-powered source-build to CI. + + # This is a 'steps' template, and is intended for advanced scenarios where the existing build + # infra has a careful build methodology that must be followed. For example, a repo + # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline + # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to + # GitHub. Using this steps template leaves room for that infra to be included. + + # Defines the platform on which to run the steps. See 'eng/common/templates-official/job/source-build.yml' + # for details. The entire object is described in the 'job' template for simplicity, even though + # the usage of the properties on this object is split between the 'job' and 'steps' templates. + platform: {} + +steps: +# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) +- script: | + set -x + df -h + + # If building on the internal project, the artifact feeds variable may be available (usually only if needed) + # In that case, call the feed setup script to add internal feeds corresponding to public ones. + # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. + # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those + # changes. + $internalRestoreArgs= + if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then + # Temporarily work around https://github.com/dotnet/arcade/issues/7709 + chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' + + # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. + # This only works if there is a username/email configured, which won't be the case in most CI runs. + git config --get user.email + if [ $? -ne 0 ]; then + git config user.email dn-bot@microsoft.com + git config user.name dn-bot + fi + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # 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)' + fi + + buildConfig=Release + # Check if AzDO substitutes in a build config from a variable, and use it if so. + if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then + buildConfig='$(_BuildConfig)' + fi + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + fi + + targetRidArgs= + if [ '${{ parameters.platform.targetRID }}' != '' ]; then + targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' + fi + + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + --configuration $buildConfig \ + --restore --build --pack $publishArgs -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ + $targetRidArgs \ + $runtimeOsArgs \ + /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + /p:ArcadeBuildFromSource=true + displayName: Build + +# Upload build logs for diagnosis. +- task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + SourceFolder: '$(Build.SourcesDirectory)' + Contents: | + **/*.log + **/*.binlog + artifacts/source-build/self/prebuilt-report/** + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + +- task: 1ES.PublishPipelineArtifact@1 + displayName: Publish BuildLogs + inputs: + targetPath: '$(Build.StagingDirectory)/BuildLogs' + artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) + continueOnError: true + condition: succeededOrFailed() diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml new file mode 100644 index 000000000000..1a860bd04064 --- /dev/null +++ b/eng/common/templates-official/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 73265b36f99f..e1f0ec366d49 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.126", + "dotnet": "6.0.127", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24113.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24162.4", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24162.4" } } From 614fd28fba617752580b594613aa7f5cba4da65e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 14:43:34 -0700 Subject: [PATCH 1151/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#19058) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 2 +- global.json | 6 +++--- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index facaf96b0d6d..047b2c714af3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,28 @@ - + + + + + + + + @@ -42,15 +49,20 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86a3926e93ee..955dc44a4b0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75 + 100394106fe203c112ab72bcc1576fb3753f7910 - + https://github.com/dotnet/arcade - c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75 + 100394106fe203c112ab72bcc1576fb3753f7910 - + https://github.com/dotnet/arcade - c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75 + 100394106fe203c112ab72bcc1576fb3753f7910 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 02fc49bcd355..006e5ba63b48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24162.4 + 6.0.0-beta.24163.13 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 0182856edd00..4ed5c54e7331 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -49,7 +49,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern Write-Host "Package source $SourceName already present." } - AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $pwd + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd } # Add a credential node for the specified source diff --git a/global.json b/global.json index e1f0ec366d49..fd055d41740a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.127", + "dotnet": "6.0.128", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24162.4", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24162.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24163.13", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24163.13" } } From 970db731165bcfd117ae55e73571a31998252633 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Mar 2024 17:42:42 +0000 Subject: [PATCH 1152/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24120.33 -> To Version 6.0.421-servicing.24164.28 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.28 -> To Version 6.0.29 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 +++++------------ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 50 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 047b2c714af3..f816bed10a78 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -16,19 +17,12 @@ - - - - - - + - - - + @@ -49,21 +43,15 @@ + - - - - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 955dc44a4b0a..783e1338d4f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 + d45b35a0a9e4371b0e0db674629a9732623013fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 + d45b35a0a9e4371b0e0db674629a9732623013fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 + d45b35a0a9e4371b0e0db674629a9732623013fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 + d45b35a0a9e4371b0e0db674629a9732623013fa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 34a109148c7d8a2c8e6431e83e4bce5712dd8083 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + dd340b191b388fd448494f70a126ce8db511bba4 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d6969baea023232e2739e505f3723228f949d8fa + 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d6969baea023232e2739e505f3723228f949d8fa + 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d6969baea023232e2739e505f3723228f949d8fa + 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c1d600871abca733031eac0a17821179193da113 + 02aa9c44a4c781d17845ad6806fd049d1e887d1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c1d600871abca733031eac0a17821179193da113 + 02aa9c44a4c781d17845ad6806fd049d1e887d1c diff --git a/eng/Versions.props b/eng/Versions.props index 006e5ba63b48..b1f2540d5b3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.420 + 6.0.421 @@ -44,20 +44,20 @@ - 6.0.28 - 6.0.28 - 6.0.28-servicing.24120.5 - 6.0.28-servicing.24120.5 - 6.0.28-servicing.24120.5 - 6.0.28-servicing.24120.5 + 6.0.29 + 6.0.29 + 6.0.29-servicing.24162.17 + 6.0.29-servicing.24162.17 + 6.0.29-servicing.24162.17 + 6.0.29-servicing.24162.17 0.2.0 - 6.0.420-servicing.24120.33 - 6.0.420-servicing.24120.33 + 6.0.421-servicing.24164.28 + 6.0.421-servicing.24164.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.28-servicing.24120.3 - 6.0.28-servicing.24120.3 - 6.0.28 - 6.0.28 + 6.0.29-servicing.24162.5 + 6.0.29-servicing.24162.5 + 6.0.29 + 6.0.29 @@ -123,7 +123,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.420 + 6.0.421 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 87d5a28661032c0a90ee61775a7832a3d3c27052 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 21:23:07 +0000 Subject: [PATCH 1153/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.421-servicing.24164.28 -> To Version 6.0.421-servicing.24169.23 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.28 -> To Version 6.0.29 (parent: Microsoft.NET.Sdk --- NuGet.config | 9 +++---- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++++--------- 3 files changed, 46 insertions(+), 47 deletions(-) diff --git a/NuGet.config b/NuGet.config index f816bed10a78..32dd6c662a04 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,14 @@ - + - - - + @@ -43,9 +41,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 783e1338d4f1..21b0bbbb7a9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop d45b35a0a9e4371b0e0db674629a9732623013fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02aa9c44a4c781d17845ad6806fd049d1e887d1c + 5a8272ec1b63f6eab4b8530aaf3074333b991a6c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02aa9c44a4c781d17845ad6806fd049d1e887d1c + 5a8272ec1b63f6eab4b8530aaf3074333b991a6c @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 925c59b436d60b9cd6b5df54c3f9be13a9512c95 + bc697dd84500aeee0bcb6323e64967222f90c2aa https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index b1f2540d5b3e..b802dae23179 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,34 +46,34 @@ 6.0.29 6.0.29 - 6.0.29-servicing.24162.17 - 6.0.29-servicing.24162.17 - 6.0.29-servicing.24162.17 - 6.0.29-servicing.24162.17 + 6.0.29-servicing.24165.5 + 6.0.29-servicing.24165.5 + 6.0.29-servicing.24165.5 + 6.0.29-servicing.24165.5 0.2.0 - 6.0.421-servicing.24164.28 - 6.0.421-servicing.24164.28 + 6.0.421-servicing.24169.23 + 6.0.421-servicing.24169.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.12 + 6.0.13 - 6.0.28-servicing.24120.7 - 6.0.28-servicing.24120.7 - 6.0.28 - 6.0.28 - 6.0.28 - 6.0.28 + 6.0.29-servicing.24164.14 + 6.0.29-servicing.24164.14 + 6.0.29 + 6.0.29 + 6.0.29 + 6.0.29 2.1.0 From 2f55738e866a250997fddeebbf6f32a21aa2bdea Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 23:44:24 +0000 Subject: [PATCH 1154/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.421-servicing.24169.23 -> To Version 6.0.421-servicing.24169.39 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.29 -> To Version 6.0.29 (parent: Microsoft.NET.Sdk --- 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 32dd6c662a04..bdf08c7f3fdc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21b0bbbb7a9a..2ee8900d76ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d45b35a0a9e4371b0e0db674629a9732623013fa + 7c192f44ffe4f589b794fbdea808331efc8d8bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d45b35a0a9e4371b0e0db674629a9732623013fa + 7c192f44ffe4f589b794fbdea808331efc8d8bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d45b35a0a9e4371b0e0db674629a9732623013fa + 7c192f44ffe4f589b794fbdea808331efc8d8bde https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d45b35a0a9e4371b0e0db674629a9732623013fa + 7c192f44ffe4f589b794fbdea808331efc8d8bde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a8272ec1b63f6eab4b8530aaf3074333b991a6c + f2fb75391dcd7a292028a959be31c3767bab1848 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a8272ec1b63f6eab4b8530aaf3074333b991a6c + f2fb75391dcd7a292028a959be31c3767bab1848 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9de94bff9795bb0644835098b91e81edccfaa367 + 5ac05029bbfe9dc7b578ca44456fd1edc2f4507d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4bb3a1d8ec37eda521bbf94605c43b035d2718b1 + 573c73a5486beb4de70c4b628df1825540ea1d83 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b802dae23179..39ef1e11bf7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.28-servicing.24120.4 + 6.0.29-servicing.24165.6 - 6.0.28-servicing.24120.2 + 6.0.29-servicing.24168.9 @@ -56,8 +56,8 @@ - 6.0.421-servicing.24169.23 - 6.0.421-servicing.24169.23 + 6.0.421-servicing.24169.39 + 6.0.421-servicing.24169.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.29-servicing.24162.5 - 6.0.29-servicing.24162.5 + 6.0.29-servicing.24169.12 + 6.0.29-servicing.24169.12 6.0.29 6.0.29 From b033e3b8b9834cd06cf15fe23228064a92d51362 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 03:17:59 +0000 Subject: [PATCH 1155/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.421-servicing.24169.39 -> To Version 6.0.421-servicing.24169.69 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.29 -> To Version 6.0.29 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index bdf08c7f3fdc..c873f2e578c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ee8900d76ce..46807d178c27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 7c192f44ffe4f589b794fbdea808331efc8d8bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2fb75391dcd7a292028a959be31c3767bab1848 + 6d1821ce9263e25b061088f76e1dbce46dd2b880 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2fb75391dcd7a292028a959be31c3767bab1848 + 6d1821ce9263e25b061088f76e1dbce46dd2b880 diff --git a/eng/Versions.props b/eng/Versions.props index 39ef1e11bf7b..70de9ef41a99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.421-servicing.24169.39 - 6.0.421-servicing.24169.39 + 6.0.421-servicing.24169.69 + 6.0.421-servicing.24169.69 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.29-servicing.24164.14 - 6.0.29-servicing.24164.14 + 6.0.29-servicing.24169.13 + 6.0.29-servicing.24169.13 6.0.29 6.0.29 6.0.29 From a33fcd95493366afba308ef71dd6cceef4e3ba35 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 04:25:21 +0000 Subject: [PATCH 1156/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.421-servicing.24169.69 -> To Version 6.0.421-servicing.24169.80 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.421 -> To Version 6.0.421 (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 c873f2e578c0..29cd3c9baf2a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46807d178c27..4ea76f5c3492 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 + 86fb50d661cb520041b127141b6bb8a53769ee6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 + 86fb50d661cb520041b127141b6bb8a53769ee6f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 + 86fb50d661cb520041b127141b6bb8a53769ee6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d1821ce9263e25b061088f76e1dbce46dd2b880 + 785e5d1b37dfbed3ac4e14d97e9c9bce19bd5b13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d1821ce9263e25b061088f76e1dbce46dd2b880 + 785e5d1b37dfbed3ac4e14d97e9c9bce19bd5b13 diff --git a/eng/Versions.props b/eng/Versions.props index 70de9ef41a99..da8c5d0f407e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.421-servicing.24169.69 - 6.0.421-servicing.24169.69 + 6.0.421-servicing.24169.80 + 6.0.421-servicing.24169.80 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 67f037f97b1d039ad45cf52245564fcb2ea25ff3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 05:02:01 +0000 Subject: [PATCH 1157/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.421-servicing.24169.69 -> To Version 6.0.421-servicing.24169.87 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.29 -> To Version 6.0.29 (parent: Microsoft.NET.Sdk --- 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 29cd3c9baf2a..dc2e47645a6c 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 4ea76f5c3492..f6417885a319 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 86fb50d661cb520041b127141b6bb8a53769ee6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 785e5d1b37dfbed3ac4e14d97e9c9bce19bd5b13 + 9a9a0d0eee37bf18c160287530f7e72fc92f5ac9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 785e5d1b37dfbed3ac4e14d97e9c9bce19bd5b13 + 9a9a0d0eee37bf18c160287530f7e72fc92f5ac9 diff --git a/eng/Versions.props b/eng/Versions.props index da8c5d0f407e..a5522845df82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.29 6.0.29 - 6.0.29-servicing.24165.5 - 6.0.29-servicing.24165.5 - 6.0.29-servicing.24165.5 - 6.0.29-servicing.24165.5 + 6.0.29-servicing.24169.21 + 6.0.29-servicing.24169.21 + 6.0.29-servicing.24169.21 + 6.0.29-servicing.24169.21 0.2.0 - 6.0.421-servicing.24169.80 - 6.0.421-servicing.24169.80 + 6.0.421-servicing.24169.87 + 6.0.421-servicing.24169.87 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a5315624e6a8ed8e3d117e8bcfa00949a0084a5d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 18:38:49 +0000 Subject: [PATCH 1158/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.421-servicing.24169.87 -> To Version 6.0.421-servicing.24170.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.29 -> To Version 6.0.29 (parent: Microsoft.NET.Sdk --- 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 dc2e47645a6c..16ef8d37e635 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6417885a319..1a6ee7c296ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c192f44ffe4f589b794fbdea808331efc8d8bde + 0692302e909ffbc02bca94378eab9213ba3f4455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c192f44ffe4f589b794fbdea808331efc8d8bde + 0692302e909ffbc02bca94378eab9213ba3f4455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c192f44ffe4f589b794fbdea808331efc8d8bde + 0692302e909ffbc02bca94378eab9213ba3f4455 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c192f44ffe4f589b794fbdea808331efc8d8bde + 0692302e909ffbc02bca94378eab9213ba3f4455 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 86fb50d661cb520041b127141b6bb8a53769ee6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a9a0d0eee37bf18c160287530f7e72fc92f5ac9 + ec94b98111e1980885848558410affc81762ac45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a9a0d0eee37bf18c160287530f7e72fc92f5ac9 + ec94b98111e1980885848558410affc81762ac45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5ac05029bbfe9dc7b578ca44456fd1edc2f4507d + 8b4de777b2ddf7e0f4a06dec30bbc152315fdef8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 573c73a5486beb4de70c4b628df1825540ea1d83 + f3f959782e4e407301c19cd90dc0d1da329425bf https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a5522845df82..5ff685d8954b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.29-servicing.24165.6 + 6.0.29-servicing.24169.15 - 6.0.29-servicing.24168.9 + 6.0.29-servicing.24169.12 @@ -56,8 +56,8 @@ - 6.0.421-servicing.24169.87 - 6.0.421-servicing.24169.87 + 6.0.421-servicing.24170.1 + 6.0.421-servicing.24170.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.29-servicing.24169.12 - 6.0.29-servicing.24169.12 + 6.0.29-servicing.24169.26 + 6.0.29-servicing.24169.26 6.0.29 6.0.29 From 5102888162e96c2d53eaed1aec16c880aefc202c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Mar 2024 00:59:50 +0000 Subject: [PATCH 1159/1244] Merged PR 38441: [internal/release/6.0.4xx] 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.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: from 6.0.28 to 6.0.29 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: - **Date Produced**: March 21, 2024 10:02:30 PM UTC - **Commit**: 60e470eb7aa4134da472ce7a9d89a59bc2d845e4 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24170.1 to 6.0.421-servicing.24171.7][1] - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24170.1 to 6.0.421-servicing.24171.7][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.29][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][2] - **Microsoft.NETCor... --- NuGet.config | 9 ++++---- eng/Version.Details.xml | 50 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++-------- 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 16ef8d37e635..d8928b16eda5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,15 @@ - + + - + @@ -41,10 +42,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a6ee7c296ff..48895926f1db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 0692302e909ffbc02bca94378eab9213ba3f4455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 86fb50d661cb520041b127141b6bb8a53769ee6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec94b98111e1980885848558410affc81762ac45 + 60e470eb7aa4134da472ce7a9d89a59bc2d845e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec94b98111e1980885848558410affc81762ac45 + 60e470eb7aa4134da472ce7a9d89a59bc2d845e4 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - bc697dd84500aeee0bcb6323e64967222f90c2aa + 5a6205aabc468d65922f79266532e0eea9ca97ec https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 5ff685d8954b..ab968b36bb76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.29 6.0.29 - 6.0.29-servicing.24169.21 - 6.0.29-servicing.24169.21 - 6.0.29-servicing.24169.21 - 6.0.29-servicing.24169.21 + 6.0.29-servicing.24171.8 + 6.0.29-servicing.24171.8 + 6.0.29-servicing.24171.8 + 6.0.29-servicing.24171.8 0.2.0 - 6.0.421-servicing.24170.1 - 6.0.421-servicing.24170.1 + 6.0.421-servicing.24171.7 + 6.0.421-servicing.24171.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.29-servicing.24169.13 - 6.0.29-servicing.24169.13 + 6.0.29-servicing.24171.5 + 6.0.29-servicing.24171.5 6.0.29 6.0.29 6.0.29 @@ -193,7 +193,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.28 + 6.0.29 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 3d530de7d4a8dd74d026d358b7a7807ca5c1eca4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Mar 2024 16:08:37 +0000 Subject: [PATCH 1160/1244] Merged PR 38454: [internal/release/6.0.4xx] 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.421 to 6.0.421 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.421-rtm.24169.9 to 6.0.421-rtm.24171.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.421 to 6.0.421 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: - **Date Produced**: March 22, 2024 1:23:09 AM UTC - **Commit**: 6f9b73911c7a5bd447666c341acc4fffe64635b5 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24171.7 to 6.0.421-servicing.24171.14][1] - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24171.7 to 6.0.421-servicing.24171.14][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.421 to 6.0.421][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.421-rtm.24169.9 to 6.0.421-rtm.24171.7][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.421 to 6.0.421][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC60e470eb7aa4134da472ce7a9d89a59bc2d845e4&targetVersion=GC6f9b73911c7a5bd447666c341acc4fffe64635b5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC86fb50d661cb520041b127141b6bb8a53769ee6f&targetVersion=GC9ebb8d1d13e5672c54d1682cdc82eb5f474b9586&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 d8928b16eda5..4113aa77c566 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48895926f1db..d8f475c41286 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 86fb50d661cb520041b127141b6bb8a53769ee6f + 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 86fb50d661cb520041b127141b6bb8a53769ee6f + 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 86fb50d661cb520041b127141b6bb8a53769ee6f + 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 60e470eb7aa4134da472ce7a9d89a59bc2d845e4 + 6f9b73911c7a5bd447666c341acc4fffe64635b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 60e470eb7aa4134da472ce7a9d89a59bc2d845e4 + 6f9b73911c7a5bd447666c341acc4fffe64635b5 diff --git a/eng/Versions.props b/eng/Versions.props index ab968b36bb76..80d155bab123 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.421-servicing.24171.7 - 6.0.421-servicing.24171.7 + 6.0.421-servicing.24171.14 + 6.0.421-servicing.24171.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 04f27549cdbdcb0d6784037693769c93ed1de787 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Mar 2024 17:14:54 +0000 Subject: [PATCH 1161/1244] Merged PR 38480: [internal/release/6.0.4xx] 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.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: - **Date Produced**: March 22, 2024 4:35:16 PM UTC - **Commit**: e35ea426ec2ee54f57501b661ec7d656caf480d6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24171.14 to 6.0.421-servicing.24172.16][1] - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24171.14 to 6.0.421-servicing.24172.16][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.29 to 6.0.29][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6f9b73911c7a5bd447666c341acc4fffe64635b5&targetVersion=GCe35ea4... --- 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 4113aa77c566..558decbcb1ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8f475c41286..7e1a5316a790 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0692302e909ffbc02bca94378eab9213ba3f4455 + 75c9b26383d5e6908e8b07d68d134f115c696324 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0692302e909ffbc02bca94378eab9213ba3f4455 + 75c9b26383d5e6908e8b07d68d134f115c696324 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0692302e909ffbc02bca94378eab9213ba3f4455 + 75c9b26383d5e6908e8b07d68d134f115c696324 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0692302e909ffbc02bca94378eab9213ba3f4455 + 75c9b26383d5e6908e8b07d68d134f115c696324 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f9b73911c7a5bd447666c341acc4fffe64635b5 + e35ea426ec2ee54f57501b661ec7d656caf480d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f9b73911c7a5bd447666c341acc4fffe64635b5 + e35ea426ec2ee54f57501b661ec7d656caf480d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4de777b2ddf7e0f4a06dec30bbc152315fdef8 + 6525c5174ef1b8ee5b29c397e8a4b76e76487927 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f3f959782e4e407301c19cd90dc0d1da329425bf + 6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 80d155bab123..5d400d24ebc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.29-servicing.24169.15 + 6.0.29-servicing.24171.6 - 6.0.29-servicing.24169.12 + 6.0.29-servicing.24171.7 @@ -56,8 +56,8 @@ - 6.0.421-servicing.24171.14 - 6.0.421-servicing.24171.14 + 6.0.421-servicing.24172.16 + 6.0.421-servicing.24172.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.29-servicing.24169.26 - 6.0.29-servicing.24169.26 + 6.0.29-servicing.24171.9 + 6.0.29-servicing.24171.9 6.0.29 6.0.29 From a07cb5e274dd3a9026cbdf47139c0fe2268505ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Apr 2024 22:19:05 +0000 Subject: [PATCH 1162/1244] Update dependencies from https://github.com/dotnet/arcade build 20240326.9 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24163.13 -> To Version 6.0.0-beta.24176.9 --- NuGet.config | 21 ------------------- eng/Version.Details.xml | 12 +++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 3 ++- .../job/publish-build-assets.yml | 10 +++++---- .../post-build/post-build.yml | 2 ++ global.json | 4 ++-- 7 files changed, 19 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 047b2c714af3..03d3587a670c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,26 +9,14 @@ - - - - - - - - - - - - @@ -51,19 +39,10 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 955dc44a4b0a..1c6a86d36a13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 100394106fe203c112ab72bcc1576fb3753f7910 + e438144bbffb29ed5d7c113dc4947b51650344dc - + https://github.com/dotnet/arcade - 100394106fe203c112ab72bcc1576fb3753f7910 + e438144bbffb29ed5d7c113dc4947b51650344dc - + https://github.com/dotnet/arcade - 100394106fe203c112ab72bcc1576fb3753f7910 + e438144bbffb29ed5d7c113dc4947b51650344dc https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 006e5ba63b48..d049c73c2e30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24163.13 + 6.0.0-beta.24176.9 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 616bfc38696d..21945ebdc9e3 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -116,7 +116,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) @@ -124,6 +124,7 @@ jobs: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json env: TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 9498aa412db8..1d84eb301c46 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -80,14 +80,16 @@ jobs: inputs: targetType: inline script: | - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) - task: 1ES.PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' PublishLocation: Container ArtifactName: ReleaseConfigs diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 80bfa4946c69..96048b1ba5e4 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -137,6 +137,7 @@ stages: # 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: AzurePipelines-EO + image: 1ESPT-Windows2022 demands: Cmd os: windows # If it's not devdiv, it's dnceng @@ -251,6 +252,7 @@ stages: # 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: AzurePipelines-EO + image: 1ESPT-Windows2022 demands: Cmd os: windows # If it's not devdiv, it's dnceng diff --git a/global.json b/global.json index fd055d41740a..dd968ea937f3 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.24163.13", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24163.13" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24176.9", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24176.9" } } From 71acbd380f661305366160b334773f88fefd8e26 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Apr 2024 11:55:40 -0700 Subject: [PATCH 1163/1244] Update branding to 6.0.422 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 006e5ba63b48..f4c5b9579009 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 21 + 22 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 7696697e0dd4b0a8fb58ede94b53bb5592d02da7 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 2 Apr 2024 15:03:37 -0700 Subject: [PATCH 1164/1244] [6.0.4xx] Migrate to 1ES templates for internal builds (#19187) Co-authored-by: Matt Thalman --- .vsts-ci.yml | 794 +++++++++--------- .vsts-pr.yml | 35 +- eng/build-pr.yml | 166 ++++ eng/build.yml | 17 +- eng/source-build-tarball-build-official.yml | 28 +- eng/source-build-tarball-build.yml | 14 - .../job/source-build-build-tarball-pr.yml | 223 +++++ .../job/source-build-build-tarball.yml | 14 +- .../job/source-build-create-tarball-pr.yml | 85 ++ .../job/source-build-create-tarball.yml | 20 +- .../job/source-build-run-tarball-build-pr.yml | 132 +++ .../job/source-build-run-tarball-build.yml | 14 +- 12 files changed, 1080 insertions(+), 462 deletions(-) create mode 100644 eng/build-pr.yml delete mode 100644 eng/source-build-tarball-build.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 0b653655fca1..9d7eb72c89d6 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,3 +1,5 @@ +# Pipeline: https://dnceng.visualstudio.com/internal/_build?definitionId=286 + trigger: batch: true branches: @@ -21,7 +23,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -32,406 +33,427 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - name: _InternalRuntimeDownloadArgs value: '' - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) +- name: DncEngPublicBuildPool + value: NetCore-Svc-Public +- name: DncEngInternalBuildPool + value: NetCore1ESPool-Svc-Internal +# Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning. +- name: MicroBuildOutputFolderOverride + value: $(Agent.TempDirectory) -stages: -- stage: build - jobs: - - job: Publish_Build_Configuration - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish Build Config - - template: /eng/build.yml - parameters: - agentOs: Windows_NT - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Public-only builds - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Debug_x86: - _BuildConfig: Debug - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: $(_WindowsTestArg) - Build_ES_Debug_x64: - _BuildConfig: Debug - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: es - _AdditionalBuildParameters: '' - _TestArg: '' - # Internal-only builds - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: $(_WindowsTestArg) - # Always run builds - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - _TestArg: $(_WindowsTestArg) - Build_Release_arm: - _BuildConfig: Release - _BuildArchitecture: arm - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - - - template: /eng/build.yml - parameters: - agentOs: Windows_NT - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Always run builds - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - # Never run tests on PGO bits - _TestArg: '' - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: '' - pgoInstrument: true - - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_18_04_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Fedora_29_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.29' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_1_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker centos' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Debian_11_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker debian' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _AdditionalBuildParameters: '/p:BuildSdkDeb=true' - _TestArg: $(_NonWindowsTestArg) - Build_Rhel_7_2_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker rhel' - _LinuxPortable: '' - _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: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - # Never run tests on arm - _TestArg: '' - Build_Arm64_Debug: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Debug_arm: - _BuildConfig: Debug - # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm' - _BuildArchitecture: 'arm' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm - _TestArg: '' - Build_Linux_musl_Debug_arm64: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm64' - _BuildArchitecture: 'arm64' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Arm_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - # Never run tests on arm - _TestArg: '' - Build_Arm64_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_arm: - _BuildConfig: Release - # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm' - _BuildArchitecture: 'arm' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm - _TestArg: '' - Build_Linux_musl_Release_arm64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm64' - _BuildArchitecture: 'arm64' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - Build_Linux_Portable_Deb_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker rhel' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # 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: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Always run builds - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: '' - pgoInstrument: true +extends: + ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + parameters: + containers: + fedora38: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + sdl: + sourceAnalysisPool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + stages: + - stage: build + jobs: + # Build Retry Configuration + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + steps: + - task: 1ES.PublishPipelineArtifact@1 + displayName: Publish Build Config + inputs: + targetPath: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifactName: BuildConfiguration + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Debug_x86: + _BuildConfig: Debug + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_ES_Debug_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: es + _AdditionalBuildParameters: '' + _TestArg: '' + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + # Always run builds + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_arm: + _BuildConfig: Release + _BuildArchitecture: arm + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' - - template: /eng/build.yml - parameters: - agentOs: Darwin - pool: - vmImage: 'macOS-latest' - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release_x64: - _BuildConfig: Release - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Release_arm64: - _BuildConfig: Release - _RuntimeIdentifier: '--runtime-id osx-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + # Always run builds + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + pgoInstrument: true - - template: /eng/common/templates/jobs/source-build.yml + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-ubuntu-2004-open + os: linux + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_29_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.29' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_1_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Rhel_7_2_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '' + _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: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_arm: + _BuildConfig: Debug + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Debug_arm64: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # 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: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-ubuntu-2004-open + os: linux + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + # Always run builds + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + pgoInstrument: true - # For .NET 6.0, source-build only supports 6.0.1xx. Disable tarball build validation in all other branches. - # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball + - template: /eng/build.yml@self + parameters: + agentOs: Darwin + pool: + name: Azure Pipelines + image: macOS-latest + os: macOS + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + - template: /eng/common/templates-official/jobs/source-build.yml@self - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/job/publish-build-assets.yml - parameters: - dependsOn: - - Windows_NT - - Linux - - Darwin - - Source_Build_Managed - - Source_Build_Create_Tarball - - PGO_Linux - - PGO_Windows_NT - publishUsingPipelines: true - pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2017.amd64 + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml@self + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/job/publish-build-assets.yml@self + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: eng\common\templates\post-build\post-build.yml - parameters: - publishingInfraVersion: 3 - enableSymbolValidation: false - enableSigningValidation: false - enableNugetValidation: false - enableSourceLinkValidation: false - publishInstallersAndChecksums: true - SDLValidationParameters: - enable: false - params: ' -SourceToolsList @("policheck","credscan") - -TsaInstanceURL $(_TsaInstanceURL) - -TsaProjectName $(_TsaProjectName) - -TsaNotificationEmail $(_TsaNotificationEmail) - -TsaCodebaseAdmin $(_TsaCodebaseAdmin) - -TsaBugAreaPath $(_TsaBugAreaPath) - -TsaIterationPath $(_TsaIterationPath) - -TsaRepositoryName "dotnet-installer" - -TsaCodebaseName "dotnet-installer" - -TsaPublish $True' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/post-build/post-build.yml@self + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 0b653655fca1..42ca67ae988e 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -21,7 +21,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -32,10 +31,8 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - name: _InternalRuntimeDownloadArgs value: '' - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs @@ -58,7 +55,7 @@ stages: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration displayName: Publish Build Config - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -115,7 +112,7 @@ stages: # Never run tests on arm64 _TestArg: '' - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -144,7 +141,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -330,7 +327,7 @@ stages: _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -353,7 +350,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Darwin pool: @@ -375,26 +372,7 @@ stages: - template: /eng/common/templates/jobs/source-build.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - # For .NET 6.0, source-build only supports 6.0.1xx. Disable tarball build validation in all other branches. - # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball - - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/common/templates/job/publish-build-assets.yml @@ -413,7 +391,6 @@ stages: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2017.amd64 - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml parameters: diff --git a/eng/build-pr.yml b/eng/build-pr.yml new file mode 100644 index 000000000000..f05d66fa690d --- /dev/null +++ b/eng/build-pr.yml @@ -0,0 +1,166 @@ +parameters: + # Agent OS identifier and used as job name + agentOs: '' + + # Agent pool + pool: {} + + # Additional variables + variables: {} + + # Build strategy - matrix + strategy: {} + + # Job timeout + timeoutInMinutes: 180 + + # Publish using pipelines + enablePublishUsingPipelines: true + +phases: +- template: /eng/common/templates/job/job.yml + parameters: + ${{ if parameters.pgoInstrument }}: + name: PGO_${{ parameters.agentOs }} + ${{ if not(parameters.pgoInstrument) }}: + name: ${{ parameters.agentOs }} + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + enableMicrobuild: true + enablePublishBuildAssets: true + enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} + enableTelemetry: true + helixRepo: dotnet/installer + pool: ${{ parameters.pool }} + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + workspace: + clean: all + + variables: + - _PgoInstrument: '' + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '-pack' + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '--pack' + - ${{ if parameters.pgoInstrument }}: + - _PgoInstrument: '/p:PgoInstrument=true' + - _PackArg: '' + - _AgentOSName: ${{ parameters.agentOs }} + - _TeamName: Roslyn-Project-System + - _SignType: test + - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-Symbol-Server-PATs + - group: DotNet-HelixApi-Access + - group: DotNet-Blob-Feed + - _DotNetPublishToBlobFeed: true + - _PushToVSFeed: true + - _SignType: real + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) + $(_PgoInstrument) + + steps: + - checkout: self + clean: true + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: build.cmd + $(_TestArg) $(_PackArg) + -publish -ci -sign + -Configuration $(_BuildConfig) + -Architecture $(_BuildArchitecture) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + env: + DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE) + + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - ${{ 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) + + - ${{ if eq(parameters.agentOs, 'Linux') }}: + - script: ./build.sh + $(_TestArg) $(_PackArg) + --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + $(_DockerParameter) + --architecture $(_BuildArchitecture) + $(_LinuxPortable) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: + - script: ./build.sh + $(_TestArg) + --pack --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + --architecture $(_BuildArchitecture) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT'), ne(variables['PostBuildSign'], 'true')) }}: + - task: NuGetCommand@2 + displayName: Push Visual Studio NuPkgs + inputs: + command: push + packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' + nuGetFeedType: external + publishFeedCredentials: 'DevDiv - VS package feed' + condition: and(succeeded(), ne(variables['PostBuildSign'], true), eq(variables['_PushToVSFeed'], 'true'), eq(variables['_DotNetPublishToBlobFeed'], 'true'), or(eq(variables['_BuildArchitecture'], 'x64'), eq(variables['_BuildArchitecture'], 'x86'))) + + - task: PublishTestResults@2 + displayName: Publish Test Results + inputs: + testRunner: XUnit + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + platform: '$(BuildPlatform)' + configuration: '$(_BuildConfig)' + condition: ne(variables['_TestArg'], '') + + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true + condition: always() + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true + condition: always() diff --git a/eng/build.yml b/eng/build.yml index c23bbb11b13f..2ce873c3d4d8 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -18,7 +18,7 @@ parameters: enablePublishUsingPipelines: true phases: -- template: /eng/common/templates/job/job.yml +- template: /eng/common/templates-official/job/job.yml parameters: ${{ if parameters.pgoInstrument }}: name: PGO_${{ parameters.agentOs }} @@ -28,9 +28,6 @@ phases: ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true enablePublishBuildAssets: true - # Don't use built-in arcade logic for publishing artifacts and test results, as we manually do this and give better names - #enablePublishBuildArtifacts: true - #enablePublishTestResults: true enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} enableTelemetry: true helixRepo: dotnet/installer @@ -49,12 +46,10 @@ phases: - ${{ if parameters.pgoInstrument }}: - _PgoInstrument: '/p:PgoInstrument=true' - _PackArg: '' - - _AgentOSName: ${{ parameters.agentOs }} - _TeamName: Roslyn-Project-System - _SignType: test - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access @@ -101,6 +96,7 @@ phases: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.agentOs, 'Linux') }}: - script: ./build.sh $(_TestArg) $(_PackArg) @@ -130,10 +126,9 @@ phases: displayName: Build - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT'), ne(variables['PostBuildSign'], 'true')) }}: - - task: NuGetCommand@2 + - task: 1ES.PublishNuget@1 displayName: Push Visual Studio NuPkgs inputs: - command: push packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' nuGetFeedType: external publishFeedCredentials: 'DevDiv - VS package feed' @@ -154,13 +149,13 @@ phases: inputs: SourceFolder: '$(Build.SourcesDirectory)/artifacts' Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* TargetFolder: '$(Build.ArtifactStagingDirectory)' continueOnError: true condition: always() - - task: PublishBuildArtifacts@1 + - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs to VSTS inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 5d396baaba46..bef9853c40a3 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -1,5 +1,6 @@ trigger: none pr: none + resources: pipelines: - pipeline: installer-build-resource @@ -17,10 +18,25 @@ resources: - internal/release/6.0.4xx stages: - build + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + parameters: + sdl: + sourceAnalysisPool: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022 + os: windows + customBuildTags: + - ES365AIMigrationTooling + stages: + - stage: build + jobs: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml@self + parameters: + installerBuildResourceId: installer-build-resource diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml deleted file mode 100644 index da87d93cf801..000000000000 --- a/eng/source-build-tarball-build.yml +++ /dev/null @@ -1,14 +0,0 @@ -trigger: none -pr: none -resources: - pipelines: - - pipeline: installer-build-resource - source: installer - trigger: none - -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml new file mode 100644 index 000000000000..f5569e26b8cc --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml @@ -0,0 +1,223 @@ +# Builds a source-build tarball + +parameters: + # Architecture to build + architecture: + + # Custom condition to apply to the job + condition: + + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Skip running the SDK content smoke-tests + excludeSdkContentTests: false + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: + + # Matrix to run jobs over + matrix: + + # Job name + name: + + # Agent pool to use + pool: + + # Build using the previous source-build artifacts + usePreviousArtifacts: false + +jobs: +- job: ${{ parameters.name }} + condition: ${{ parameters.condition }} + dependsOn: ${{ parameters.dependsOn }} + pool: ${{ parameters.pool }} + strategy: + matrix: ${{ parameters.matrix }} + timeoutInMinutes: 300 + variables: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - group: AzureDevOps-Artifact-Feeds-Pats + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - name: additionalBuildArgs + value: --with-sdk /tarball/.dotnet + - name: tarballDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory) + ${{ else }}: + value: $(Build.StagingDirectory)/tarball + - name: installerSrcDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory)/src/installer + ${{ else }}: + value: $(Build.SourcesDirectory) + workspace: + clean: all + + steps: + - checkout: self + clean: true + + - ${{ if ne(parameters.installerBuildResourceId, '') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-source*.tar.gz' + displayName: Download Source Tarball + + - script: | + set -x + + resourceIdPathSegment= + if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then + resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' + fi + + mkdir -p "$(tarballDir)" + tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" + eval rm -f "$tarballFilePath" + displayName: Extract Tarball + + - script: cp $(installerSrcDir)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + displayName: Copy Test NuGet Config + + - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz' + displayName: Download MSFT sdk Tarball + + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - download: current + artifact: $(_PreviousSourceBuildArtifact) + patterns: '*.tar.gz' + displayName: Download Previous Source Build Artifacts + + - task: CopyFiles@2 + displayName: Copy Previous Source Build Artifacts + inputs: + SourceFolder: $(PIPELINE.WORKSPACE)/$(_PreviousSourceBuildArtifact) + Contents: '*.tar.gz' + TargetFolder: $(tarballDir)/packages/archive/ + + - script: | + set -x + + if [[ '${{ parameters.usePreviousArtifacts }}' != 'true' ]]; then + customPrepArgs= + if [[ '$(_BootstrapPrep)' == 'true' ]]; then + customPrepArgs='--bootstrap' + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs} + else + mkdir $(tarballDir)/.dotnet + tarballFilePath="$(tarballDir)/packages/archive/dotnet-sdk-*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)/.dotnet" + eval rm -f "$tarballFilePath" + fi + displayName: Prep Tarball + + - script: | + set -x + df -h + + customRunArgs= + customBuildArgs= + if [[ '$(_RunOnline)' == 'true' ]]; then + customBuildArgs='--online' + else + customRunArgs='--network none' + fi + + # See https://github.com/dotnet/source-build/issues/3712 + if [[ '$(_OverrideDistroDisablingSha1)' == 'true' ]]; then + customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + customBuildArgs="$customBuildArgs --poison" + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball ${customRunArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) + displayName: Build Tarball + + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerSrcDir)/eng/common/SetupNugetSources.sh + arguments: $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - script: | + set -x + + dockerVolumeArgs="-v $(tarballDir):/tarball" + dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" + poisonArg='' + + if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then + dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" + platform="linux" + docker run --rm $(_Container) /bin/sh -c "cat /etc/os-release | grep -q alpine" + if [[ $? == 0 ]]; then + platform="$platform-musl" + fi + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + poisonArg='--poison' + dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" + fi + + docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs $(_Container) ./build.sh $poisonArg --run-smoke-test $(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. + - script: | + set -x + + targetFolder=$(Build.StagingDirectory)/BuildLogs/ + mkdir -p ${targetFolder} + + cd "$(tarballDir)" + find artifacts/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; + displayName: Prepare BuildLogs staging directory + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() + + - task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + continueOnError: true + inputs: + testRunner: vSTest + testResultsFiles: 'test/**/*.trx' + searchFolder: $(tarballDir) + mergeTestResults: true + publishRunAttachments: true + testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) + + - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts + condition: succeededOrFailed() + continueOnError: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index f5569e26b8cc..f13e9193b83c 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -198,9 +198,11 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() @@ -216,8 +218,10 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' - artifact: $(Agent.JobName)_Artifacts + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish Artifacts - condition: succeededOrFailed() + inputs: + targetPath: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/ + artifactName: $(Agent.JobName)_Artifacts continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml new file mode 100644 index 000000000000..347f61cf86b9 --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml @@ -0,0 +1,85 @@ +# Creates a source-build tarball + +jobs: +- job: Source_Build_Create_Tarball + container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + displayName: Source-Build Create Tarball + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ else }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + + variables: + - name: _BuildConfig + value: Release + + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNet-Source-Build-All-Orgs-Source-Access + workspace: + clean: all + + steps: + - ${{ 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) + - script: | + set -x + df -h + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # 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)' + fi + + ./build.sh \ + --ci \ + --configuration $(_BuildConfig) \ + --publish \ + -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + /p:DotNetPublishUsingPipelines=true \ + /p:ArcadeBuildTarball=true \ + /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw) + displayName: Create Tarball + + - task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + Contents: | + **/*.log + **/*.binlog + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() 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 347f61cf86b9..7cba0c4eaf67 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 @@ -2,23 +2,27 @@ jobs: - job: Source_Build_Create_Tarball - container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + container: fedora38 displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ else }}: name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux ${{ else }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux variables: - name: _BuildConfig @@ -78,8 +82,10 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml new file mode 100644 index 000000000000..1474bec5feaa --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml @@ -0,0 +1,132 @@ +# Builds a source-build tarball + +parameters: + # Dependent jobs that must be completed before this job will run + dependsOn: + + # 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 + # ----------------------------------------------------------------------------------------------- + alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 + centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 + debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 + fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalArm64: + name: Docker-Linux-Arm-Internal + poolPublicAmd64: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + +jobs: +- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + dependsOn: ${{ parameters.dependsOn }} + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Alpine317-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.alpine317Container }} + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: false + CentOS7-Online: + _BootstrapPrep: false + _Container: ${{ parameters.centOS7Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: true + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + CentOS7-Offline: + _BootstrapPrep: false + _Container: ${{ parameters.centOS7Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: false + CentOSStream9-Offline: + _BootstrapPrep: false + _Container: ${{ parameters.centOSStream9Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: true + _RunOnline: false + Fedora38-Offline: + _BootstrapPrep: false + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: true + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + Ubuntu1804-Offline: + _BootstrapPrep: false + _Container: ${{ parameters.ubuntu1804Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + name: Build_Tarball_x64 + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + ${{ parameters.poolInternalAmd64PR }} + ${{ else }}: + ${{ parameters.poolInternalAmd64 }} + +- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: arm64 + dependsOn: ${{ parameters.dependsOn }} + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Debian11-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.debian11Arm64Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + name: Build_Tarball_arm64 + pool: ${{ parameters.poolInternalArm64 }} + +- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. + # The bootstrap build will shortcut if the stage 1 build failed. + condition: succeededOrFailed() + dependsOn: Build_Tarball_x64 + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Fedora38-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + name: Build_Tarball_x64_Using_Previous + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ parameters.poolInternalAmd64 }} + usePreviousArtifacts: true 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 86f14f67775e..78cde5475b69 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 @@ -17,15 +17,21 @@ parameters: ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalAmd64PR: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalArm64: name: Docker-Linux-Arm-Internal + image: Mariner-2-Docker-ARM64 + os: linux + hostArchitecture: Arm64 poolPublicAmd64: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -109,7 +115,7 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: x64 - # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. condition: succeededOrFailed() dependsOn: Build_Tarball_x64 From 59b9f4ee0831664e3d073b3107d402b218f9a75a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:06:58 -0700 Subject: [PATCH 1165/1244] [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19149) 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 1c6a86d36a13..6b2e68d83c00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e438144bbffb29ed5d7c113dc4947b51650344dc - + https://github.com/dotnet/source-build-reference-packages - 2e6cb1a0008be982effb0c5d9e96a4ff138352d4 + 7ce77af2d76bb40b32e483b5050df50ea07b8984 From 6bc4c2adf8104799ec08fa335c9a3501d5cf4d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Fri, 5 Apr 2024 12:52:51 +0200 Subject: [PATCH 1166/1244] Rewrite testhost.json --- src/redist/targets/GenerateLayout.targets | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 1616e94027c8..412ca545cddd 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -481,6 +481,29 @@ Overwrite="true" /> + + + + + + + "Newtonsoft.Json": "13.0.1.0" + + + Newtonsoft.Json/13.0.1.0 + + + + + + + + + @@ -573,6 +596,7 @@ LayoutWorkloadUserLocalMarker; LayoutBundledTools; RetargetTools; + FixNewtonsoftInTesthostDepsJson; CrossgenLayout; LayoutAppHostTemplate; GeneratePrecomputedRarCache; From fbfea7c0c3ebaad4c2c08399b7a9f613c3a42084 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Apr 2024 18:00:04 +0000 Subject: [PATCH 1167/1244] Update dependencies from https://github.com/dotnet/arcade build 20240404.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24176.9 -> To Version 6.0.0-beta.24204.4 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates-official/job/onelocbuild.yml | 2 +- .../templates-official/job/source-build.yml | 2 +- .../job/source-index-stage1.yml | 2 +- eng/common/templates-official/jobs/jobs.yml | 2 +- .../templates-official/post-build/post-build.yml | 8 ++++---- .../steps/component-governance.yml | 2 +- .../templates/steps/component-governance.yml | 2 +- global.json | 4 ++-- 11 files changed, 33 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 558decbcb1ce..6e7ea226c50b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,27 @@ + + + + - + + + + @@ -42,15 +49,20 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e18ace87d103..4894786e8f65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - e438144bbffb29ed5d7c113dc4947b51650344dc + bd9b4590681e602535ed414e98a17e6ba121dca4 - + https://github.com/dotnet/arcade - e438144bbffb29ed5d7c113dc4947b51650344dc + bd9b4590681e602535ed414e98a17e6ba121dca4 - + https://github.com/dotnet/arcade - e438144bbffb29ed5d7c113dc4947b51650344dc + bd9b4590681e602535ed414e98a17e6ba121dca4 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b2122820bcd0..750eeae5750d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24176.9 + 6.0.0-beta.24204.4 diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index e0e9a4bc5129..08df5637599d 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -43,7 +43,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows variables: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 96be5e6e115a..f5fa09f41511 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -50,7 +50,7 @@ jobs: demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-mariner-2-pt + image: 1es-mariner-2 os: linux ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 3d8b0b966cb7..e96ec3cbe0ed 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -7,7 +7,7 @@ parameters: binlogPath: artifacts/log/Debug/Build.binlog pool: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows condition: '' dependsOn: '' diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml index 669ccd48f7f0..c124aa995787 100644 --- a/eng/common/templates-official/jobs/jobs.yml +++ b/eng/common/templates-official/jobs/jobs.yml @@ -92,7 +92,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ else }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 96048b1ba5e4..fce0d0bf5cef 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -103,7 +103,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: @@ -143,7 +143,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -206,7 +206,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -258,7 +258,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index babc2757d8d1..12527b80ea9c 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index babc2757d8d1..12527b80ea9c 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/global.json b/global.json index dd968ea937f3..ab4fa5d59422 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.24176.9", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24176.9" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24204.4" } } From b931c3d6114196f166db40c70c47e55021411c78 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 12 Apr 2024 10:57:49 -0700 Subject: [PATCH 1168/1244] Update WiX to 3.14.1.8722 (#19406) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6c7214295d06..541d3928c5ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -105,9 +105,9 @@ - 3.14.0.8606 + 3.14.1.8722 - 3.14.0-8606.20240208.1 + 3.14.1-8722.20240403.1 From 9514c83bfbbad0dc78ed55c68f1ccf31c6fe3965 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Apr 2024 18:38:34 +0000 Subject: [PATCH 1169/1244] Merged PR 38998: [internal/release/6.0.4xx] 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.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.3.2 to 17.3.4 (parent: Microsoft.NET.Sdk) - **NuGet.Build.Tasks**: from 6.3.4-rc.2 to 6.3.4-rc.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: from 6.0.29 to 6.0.30 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240416.41 - **Date Produced**: April 16, 2024 11:22:37 PM UTC - **Commit**: 2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24172.16 to 6.0.422-servicing.24216.41][1] - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24172.16 to 6.0.422-servicing.24216.41][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.30][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.30][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.29 to 6.0.30][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.29 to 6.0.30][2] - **Microsoft.Build**: [from 17.3.2 to 17.3.4][3] - **NuGet.Build.Tasks**: [from 6.3.4-rc.2 to 6.3.4-rc.2][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: [from 6.0.29 to 6.0.30][5] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe35ea4... --- NuGet.config | 25 ++++------------------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 3 files changed, 36 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6e7ea226c50b..aa43f8fee5db 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,19 @@ - - - - - - + + + - - - - - - @@ -49,21 +40,13 @@ - - - + - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4894786e8f65..af3fabd1e946 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 75c9b26383d5e6908e8b07d68d134f115c696324 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e35ea426ec2ee54f57501b661ec7d656caf480d6 + 2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e35ea426ec2ee54f57501b661ec7d656caf480d6 + 2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d @@ -146,14 +146,14 @@ 41a5af9d2c459a06c0795bf21a1c046200f375bf - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 561848881bab01749e6d8b03be2869a18ca944f7 + + https://github.com/dotnet/msbuild + a400405ba8c43976eda92a70d4adf72f9d292a22 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 5e444458a8c4a2dac9806fc1d387b7f157669540 + 5ec7c4dd0086f968a8bc5a20d5cc77b1454469f3 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 5a6205aabc468d65922f79266532e0eea9ca97ec + 3b28b2c8eb8a64c82c01e3deb104cfedf3b6a8ca https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 541d3928c5ab..d75decec0d22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.421-servicing.24172.16 - 6.0.421-servicing.24172.16 + 6.0.422-servicing.24216.41 + 6.0.422-servicing.24216.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,12 +67,12 @@ - 6.0.29-servicing.24171.5 - 6.0.29-servicing.24171.5 - 6.0.29 - 6.0.29 - 6.0.29 - 6.0.29 + 6.0.30-servicing.24215.25 + 6.0.30-servicing.24215.25 + 6.0.30 + 6.0.30 + 6.0.30 + 6.0.30 2.1.0 @@ -97,7 +97,7 @@ - 17.3.2 + 17.3.4 $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -155,7 +155,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.29 + 6.0.30 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 28f0ea76ee29e95dbc8cc69df61b7acabe851840 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 21:27:04 +0000 Subject: [PATCH 1170/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240417.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.24172.6 -> To Version 6.0.0-servicing.24217.1 --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6e7ea226c50b..03d3587a670c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,16 @@ - - - - - - - - - - - - @@ -49,21 +37,12 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4894786e8f65..f810b61f35f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade bd9b4590681e602535ed414e98a17e6ba121dca4 - + https://github.com/dotnet/source-build-reference-packages - 7ce77af2d76bb40b32e483b5050df50ea07b8984 + 2cd14a0da237e9ae169f76fefa5cdaa04ee0e3d7 From 365f04e342df359402a200f7e8b75ed6cb2000e8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Apr 2024 23:13:47 +0000 Subject: [PATCH 1171/1244] Merged PR 39043: [internal/release/6.0.4xx] 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.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.9 to 6.0.30-servicing.24217.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.29-servicing.24171.9 to 6.0.30-servicing.24217.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.421 to 6.0.422 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.421-rtm.24171.7 to 6.0.422-rtm.24216.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.421 to 6.0.422 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24171.6 to 6.0.30-servicing.24216.19 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.29-servicing.24171.7 to 6.0.30-servicing.24216.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240417.16 - **Date Produced**: April 17, 2024 6:35:52 PM UTC - **Commit**: 83a874d0cffdd270df2889668bbbec6066dd46f6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolve... --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index aa43f8fee5db..e9a45ce91782 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -18,8 +19,10 @@ + + @@ -40,13 +43,16 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af3fabd1e946..0b9e5220756d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 + 13683233bef71ad1d048e6481966879d52e1ccd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 + 13683233bef71ad1d048e6481966879d52e1ccd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 + 13683233bef71ad1d048e6481966879d52e1ccd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d + 83a874d0cffdd270df2889668bbbec6066dd46f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d + 83a874d0cffdd270df2889668bbbec6066dd46f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6525c5174ef1b8ee5b29c397e8a4b76e76487927 + 431a1dcb7d4eafa215951499ad374ffde8622e61 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc + dee47a1e2958aa9b97d3c5edf9433312cc5a4634 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d75decec0d22..271988b1d64d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.29-servicing.24171.6 + 6.0.30-servicing.24216.19 - 6.0.29-servicing.24171.7 + 6.0.30-servicing.24216.7 - 6.0.421 + 6.0.422 @@ -43,20 +43,20 @@ - 6.0.29 - 6.0.29 - 6.0.29-servicing.24171.8 - 6.0.29-servicing.24171.8 - 6.0.29-servicing.24171.8 - 6.0.29-servicing.24171.8 + 6.0.30 + 6.0.30 + 6.0.30-servicing.24216.19 + 6.0.30-servicing.24216.19 + 6.0.30-servicing.24216.19 + 6.0.30-servicing.24216.19 0.2.0 - 6.0.422-servicing.24216.41 - 6.0.422-servicing.24216.41 + 6.0.422-servicing.24217.16 + 6.0.422-servicing.24217.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,10 +77,10 @@ - 6.0.29-servicing.24171.9 - 6.0.29-servicing.24171.9 - 6.0.29 - 6.0.29 + 6.0.30-servicing.24217.3 + 6.0.30-servicing.24217.3 + 6.0.30 + 6.0.30 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.421 + 6.0.422 $(MicrosoftAspNetCoreAppRuntimePackageVersion) From ed3aeeda63d5e810513a8b96ad9e7e74d00f7fc4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 Apr 2024 20:48:33 +0000 Subject: [PATCH 1172/1244] Merged PR 39096: [internal/release/6.0.4xx] 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.422 to 6.0.422 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.422-rtm.24216.16 to 6.0.422-rtm.24218.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240418.15 - **Date Produced**: April 18, 2024 9:10:24 PM UTC - **Commit**: 2633fcf4a1c687675464ba179c5c79ad5e75a237 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.422-servicing.24217.16 to 6.0.422-servicing.24218.15][1] - **Microsoft.NET.Sdk**: [from 6.0.422-servicing.24217.16 to 6.0.422-servicing.24218.15][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24216.16 to 6.0.422-rtm.24218.5][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC83a874d0cffdd270df2889668bbbec6066dd46f6&targetVersion=GC2633fcf4a1c687675464ba179c5c79ad5e75a237&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC13683233bef71ad1d048e6481966879d52e1ccd5&targetVersion=GCef00e74f0a21b8a8192c1c409c154070ef39b95e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 e9a45ce91782..961e5aa8fd0b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b79f9e6d90a..6da6b9dbeb10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13683233bef71ad1d048e6481966879d52e1ccd5 + ef00e74f0a21b8a8192c1c409c154070ef39b95e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13683233bef71ad1d048e6481966879d52e1ccd5 + ef00e74f0a21b8a8192c1c409c154070ef39b95e https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13683233bef71ad1d048e6481966879d52e1ccd5 + ef00e74f0a21b8a8192c1c409c154070ef39b95e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 83a874d0cffdd270df2889668bbbec6066dd46f6 + 2633fcf4a1c687675464ba179c5c79ad5e75a237 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 83a874d0cffdd270df2889668bbbec6066dd46f6 + 2633fcf4a1c687675464ba179c5c79ad5e75a237 diff --git a/eng/Versions.props b/eng/Versions.props index 271988b1d64d..feade38d2952 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.422-servicing.24217.16 - 6.0.422-servicing.24217.16 + 6.0.422-servicing.24218.15 + 6.0.422-servicing.24218.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c88ad5affeb4a09363388f57f02aafab7548785e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Apr 2024 18:06:16 +0000 Subject: [PATCH 1173/1244] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240422.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.24217.1 -> To Version 6.0.0-servicing.24222.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 f810b61f35f2..84ad423573c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade bd9b4590681e602535ed414e98a17e6ba121dca4 - + https://github.com/dotnet/source-build-reference-packages - 2cd14a0da237e9ae169f76fefa5cdaa04ee0e3d7 + 86390422715f8f11400ff7fca9c2449888e47b6e From 1e32a8348f59037604e4a4c9af16d727a9637a73 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 Apr 2024 19:41:34 +0000 Subject: [PATCH 1174/1244] Merged PR 39109: [internal/release/6.0.4xx] 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.422 to 6.0.422 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.422-rtm.24218.5 to 6.0.422-rtm.24219.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240419.30 - **Date Produced**: April 20, 2024 1:55:25 AM UTC - **Commit**: 8cf6c33a08b323b46d298b83937a623059638611 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.422-servicing.24218.15 to 6.0.422-servicing.24219.30][1] - **Microsoft.NET.Sdk**: [from 6.0.422-servicing.24218.15 to 6.0.422-servicing.24219.30][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24218.5 to 6.0.422-rtm.24219.4][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2633fcf4a1c687675464ba179c5c79ad5e75a237&targetVersion=GC8cf6c33a08b323b46d298b83937a623059638611&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCef00e74f0a21b8a8192c1c409c154070ef39b95e&targetVersion=GCeffe0d00ab994d57a5e1334667dec144f9f2a9e9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 961e5aa8fd0b..fa90e444d2f9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6da6b9dbeb10..11240bdbda1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ef00e74f0a21b8a8192c1c409c154070ef39b95e + effe0d00ab994d57a5e1334667dec144f9f2a9e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ef00e74f0a21b8a8192c1c409c154070ef39b95e + effe0d00ab994d57a5e1334667dec144f9f2a9e9 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ef00e74f0a21b8a8192c1c409c154070ef39b95e + effe0d00ab994d57a5e1334667dec144f9f2a9e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2633fcf4a1c687675464ba179c5c79ad5e75a237 + 8cf6c33a08b323b46d298b83937a623059638611 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2633fcf4a1c687675464ba179c5c79ad5e75a237 + 8cf6c33a08b323b46d298b83937a623059638611 diff --git a/eng/Versions.props b/eng/Versions.props index feade38d2952..56a45b9ea9e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.422-servicing.24218.15 - 6.0.422-servicing.24218.15 + 6.0.422-servicing.24219.30 + 6.0.422-servicing.24219.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9efa2d1b469acc17b9391449bc3c7dd51ecb51dc Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 23 Apr 2024 21:23:09 +0000 Subject: [PATCH 1175/1244] Merged PR 39163: Deleted Source Build patch for format repo 0002-Add-explicit-System.Text.Json... Deleted Source Build patch for format repo 0002-Add-explicit-System.Text.Json-dependency.patch --- ...explicit-System.Text.Json-dependency.patch | 73 ------------------- 1 file changed, 73 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch deleted file mode 100644 index 3176d939bd2e..000000000000 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 26 Jun 2023 23:46:46 +0000 -Subject: [PATCH] Add explicit System.Text.Json dependency - -Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up -from PSB, via Microsoft.Build package. - -Backport: https://github.com/dotnet/format/pull/1887 ---- - Directory.Packages.props | 1 + - eng/Version.Details.xml | 4 ++++ - eng/Versions.props | 2 ++ - src/dotnet-format.csproj | 6 ++++++ - 4 files changed, 13 insertions(+) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 6b628c22..c9f86593 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -36,5 +36,6 @@ - - - -+ - - -\ No newline at end of file -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index cdfa5f5e..86f02b44 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -13,6 +13,10 @@ - https://github.com/dotnet/command-line-api - c776cd4e906b669b9cce1017fee7d0ba9845d163 - -+ -+ https://github.com/dotnet/runtime -+ 3241df7f2b0f3e2dada8d07229723c79fdbe4991 -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 27582078..bccaf176 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -20,6 +20,8 @@ - - 2.0.0-beta4.22504.1 - 0.4.0-alpha.22504.1 -+ -+ 6.0.8 - - -+ - - - From ae2bd4ec541f39c094376bdbc14138a38ec4caa1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 29 Apr 2024 23:13:26 +0000 Subject: [PATCH 1176/1244] Merged PR 39289: [internal/release/6.0.4xx] 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.422 to 6.0.422 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.422-rtm.24219.4 to 6.0.422-rtm.24229.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240429.15 - **Date Produced**: April 29, 2024 10:47:36 PM UTC - **Commit**: b47e9d314726020921851f007797b479a5f6905e - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.422-servicing.24219.30 to 6.0.422-servicing.24229.15][1] - **Microsoft.NET.Sdk**: [from 6.0.422-servicing.24219.30 to 6.0.422-servicing.24229.15][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24219.4 to 6.0.422-rtm.24229.7][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8cf6c33a08b323b46d298b83937a623059638611&targetVersion=GCb47e9d314726020921851f007797b479a5f6905e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCeffe0d00ab994d57a5e1334667dec144f9f2a9e9&targetVersion=GC086db5520af132ac32dcf8cce8ad4d561b868363&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index fa90e444d2f9..ad69301d07a8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,29 @@ + + + + + + - + + + @@ -43,15 +51,21 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f723590f5150..35620a2936cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - effe0d00ab994d57a5e1334667dec144f9f2a9e9 + 086db5520af132ac32dcf8cce8ad4d561b868363 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - effe0d00ab994d57a5e1334667dec144f9f2a9e9 + 086db5520af132ac32dcf8cce8ad4d561b868363 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - effe0d00ab994d57a5e1334667dec144f9f2a9e9 + 086db5520af132ac32dcf8cce8ad4d561b868363 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8cf6c33a08b323b46d298b83937a623059638611 + b47e9d314726020921851f007797b479a5f6905e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8cf6c33a08b323b46d298b83937a623059638611 + b47e9d314726020921851f007797b479a5f6905e diff --git a/eng/Versions.props b/eng/Versions.props index 56a45b9ea9e4..5451c281828e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.422-servicing.24219.30 - 6.0.422-servicing.24219.30 + 6.0.422-servicing.24229.15 + 6.0.422-servicing.24229.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9175bb16aa0bf8c18380795bf4c3c54d3a668947 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 1 May 2024 14:46:20 -0700 Subject: [PATCH 1177/1244] Update branding to 6.0.423 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 541d3928c5ab..b5ee42a0af3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 22 + 23 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From a94d7b39b3da1f2e13cb01e36899e8c1a8076751 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 6 May 2024 13:44:40 -0700 Subject: [PATCH 1178/1244] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19688) Co-authored-by: Matt Thalman --- .../pipelines/security-partners-dotnet.yml | 43 +++++++++++++------ 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 562530c964a5..9130b755251e 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -15,19 +15,36 @@ variables: - name: NuGetSecurityAnalysisWarningLevel value: none -jobs: -- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +resources: + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + +extends: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates parameters: - architecture: x64 - excludeSdkContentTests: true - matrix: - Ubuntu1804-Offline: - _BootstrapPrep: false - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false - name: Build_Tarball_x64 pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-windows-2022 + os: windows + stages: + - stage: stage + jobs: + - template: /src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml@self + parameters: + architecture: x64 + excludeSdkContentTests: true + matrix: + Ubuntu1804-Offline: + _BootstrapPrep: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false + name: Build_Tarball_x64 + pool: + name: NetCore1ESPool-Svc-Internal + image: 1es-ubuntu-2004 + os: linux From a407745f768546bbca3f8b0eac8bb7ba8778a759 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 14 May 2024 17:15:50 -0700 Subject: [PATCH 1179/1244] Update to later version of nuget --- src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj index bd43b568b256..a65f4b183893 100644 --- a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj +++ b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj @@ -11,7 +11,7 @@ - + From 62c676f3ffa289055023ce07a6b27ccea4f4ee59 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 May 2024 20:04:59 +0000 Subject: [PATCH 1180/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240516.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.422-servicing.24229.15 -> To Version 6.0.423-servicing.24266.15 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.30 -> To Version 6.0.31 (parent: Microsoft.NET.Sdk --- NuGet.config | 27 ++++++---------- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 60 insertions(+), 67 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad69301d07a8..cd93baa6715f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,23 @@ - - - + - - - - - - + - + + + @@ -51,21 +46,19 @@ - - - + - - - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35620a2936cb..3520fdc21656 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97d8f4cade971b93794a3805e7d72ee388f14c9b + 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97d8f4cade971b93794a3805e7d72ee388f14c9b + 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97d8f4cade971b93794a3805e7d72ee388f14c9b + 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97d8f4cade971b93794a3805e7d72ee388f14c9b + 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97d8f4cade971b93794a3805e7d72ee388f14c9b + 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97d8f4cade971b93794a3805e7d72ee388f14c9b + 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d696053fcd6735aaac1902afdb0b92edbf43e71 + 5a497cd2299423cfe8be2be3a116d3effc39725d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d696053fcd6735aaac1902afdb0b92edbf43e71 + 5a497cd2299423cfe8be2be3a116d3effc39725d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d696053fcd6735aaac1902afdb0b92edbf43e71 + 5a497cd2299423cfe8be2be3a116d3effc39725d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d696053fcd6735aaac1902afdb0b92edbf43e71 + 5a497cd2299423cfe8be2be3a116d3effc39725d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d696053fcd6735aaac1902afdb0b92edbf43e71 + 5a497cd2299423cfe8be2be3a116d3effc39725d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d696053fcd6735aaac1902afdb0b92edbf43e71 + 5a497cd2299423cfe8be2be3a116d3effc39725d https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 086db5520af132ac32dcf8cce8ad4d561b868363 + c33ad53bbb8b0c664403734a26e26cb270251ee3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 086db5520af132ac32dcf8cce8ad4d561b868363 + c33ad53bbb8b0c664403734a26e26cb270251ee3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 086db5520af132ac32dcf8cce8ad4d561b868363 + c33ad53bbb8b0c664403734a26e26cb270251ee3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b47e9d314726020921851f007797b479a5f6905e + 4b703c93b8b39450b0156580c82f27a2cdf7b655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b47e9d314726020921851f007797b479a5f6905e + 4b703c93b8b39450b0156580c82f27a2cdf7b655 diff --git a/eng/Versions.props b/eng/Versions.props index 65e96fbbf159..b2cdebd68d7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.422 + 6.0.423 @@ -43,20 +43,20 @@ - 6.0.30 - 6.0.30 - 6.0.30-servicing.24216.19 - 6.0.30-servicing.24216.19 - 6.0.30-servicing.24216.19 - 6.0.30-servicing.24216.19 + 6.0.31 + 6.0.31 + 6.0.31-servicing.24264.8 + 6.0.31-servicing.24264.8 + 6.0.31-servicing.24264.8 + 6.0.31-servicing.24264.8 0.2.0 - 6.0.422-servicing.24229.15 - 6.0.422-servicing.24229.15 + 6.0.423-servicing.24266.15 + 6.0.423-servicing.24266.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,12 +67,12 @@ - 6.0.30-servicing.24215.25 - 6.0.30-servicing.24215.25 - 6.0.30 - 6.0.30 - 6.0.30 - 6.0.30 + 6.0.31-servicing.24251.12 + 6.0.31-servicing.24251.12 + 6.0.31 + 6.0.31 + 6.0.31 + 6.0.31 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.422 + 6.0.423 $(MicrosoftAspNetCoreAppRuntimePackageVersion) From 04304317fe2552430381ab34dc377f686b12d947 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 May 2024 21:23:16 +0000 Subject: [PATCH 1181/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240516.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.423-servicing.24266.15 -> To Version 6.0.423-servicing.24266.19 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.31 -> To Version 6.0.31 (parent: Microsoft.NET.Sdk --- 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 cd93baa6715f..37c85b3b0d84 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3520fdc21656..2ee9d904a567 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a497cd2299423cfe8be2be3a116d3effc39725d + 929d26b875576909aad373373c983c63c65234c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a497cd2299423cfe8be2be3a116d3effc39725d + 929d26b875576909aad373373c983c63c65234c0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a497cd2299423cfe8be2be3a116d3effc39725d + 929d26b875576909aad373373c983c63c65234c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a497cd2299423cfe8be2be3a116d3effc39725d + 929d26b875576909aad373373c983c63c65234c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a497cd2299423cfe8be2be3a116d3effc39725d + 929d26b875576909aad373373c983c63c65234c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a497cd2299423cfe8be2be3a116d3effc39725d + 929d26b875576909aad373373c983c63c65234c0 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c33ad53bbb8b0c664403734a26e26cb270251ee3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b703c93b8b39450b0156580c82f27a2cdf7b655 + e64f8577c444a6dc86cab2bd94bf53f834113ce8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b703c93b8b39450b0156580c82f27a2cdf7b655 + e64f8577c444a6dc86cab2bd94bf53f834113ce8 diff --git a/eng/Versions.props b/eng/Versions.props index b2cdebd68d7b..009b42cc031d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,18 +45,18 @@ 6.0.31 6.0.31 - 6.0.31-servicing.24264.8 - 6.0.31-servicing.24264.8 - 6.0.31-servicing.24264.8 - 6.0.31-servicing.24264.8 + 6.0.31-servicing.24266.4 + 6.0.31-servicing.24266.4 + 6.0.31-servicing.24266.4 + 6.0.31-servicing.24266.4 0.2.0 - 6.0.423-servicing.24266.15 - 6.0.423-servicing.24266.15 + 6.0.423-servicing.24266.19 + 6.0.423-servicing.24266.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 27a824cc0bebe8cd954c676d3fff3df86dae1beb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 May 2024 22:30:00 +0000 Subject: [PATCH 1182/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240516.28 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.423-servicing.24266.19 -> To Version 6.0.423-servicing.24266.28 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.423 -> To Version 6.0.423 (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 37c85b3b0d84..6a63028064ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ee9d904a567..f3c271b6ffc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c33ad53bbb8b0c664403734a26e26cb270251ee3 + 899e481c21a53dd5898ece5c211955f46740521e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c33ad53bbb8b0c664403734a26e26cb270251ee3 + 899e481c21a53dd5898ece5c211955f46740521e https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c33ad53bbb8b0c664403734a26e26cb270251ee3 + 899e481c21a53dd5898ece5c211955f46740521e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e64f8577c444a6dc86cab2bd94bf53f834113ce8 + 806c8e273d42fa22ddf92440590d87bb16818ff7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e64f8577c444a6dc86cab2bd94bf53f834113ce8 + 806c8e273d42fa22ddf92440590d87bb16818ff7 diff --git a/eng/Versions.props b/eng/Versions.props index 009b42cc031d..cf2eff7d3467 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.423-servicing.24266.19 - 6.0.423-servicing.24266.19 + 6.0.423-servicing.24266.28 + 6.0.423-servicing.24266.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6dd1a6d0398923f8ed8f2be682a6a626ce79668b Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 16 May 2024 17:40:06 -0700 Subject: [PATCH 1183/1244] Update branding to 6.0.424 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 65e96fbbf159..8e66ee36b250 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 23 + 24 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 1293b87cff12f456f43783212bb4975a5593ca9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 19:12:18 +0000 Subject: [PATCH 1184/1244] [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19772) [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages --- NuGet.config | 21 ++++++++++++--------- eng/Version.Details.xml | 4 ++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad69301d07a8..4096b1bff2df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,28 @@ - - - - - - + + + + + + @@ -51,21 +51,24 @@ - - - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35620a2936cb..97b8fcd52c00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade bd9b4590681e602535ed414e98a17e6ba121dca4 - + https://github.com/dotnet/source-build-reference-packages - 86390422715f8f11400ff7fca9c2449888e47b6e + b6e3937b3818bb214a967e990da7002dd8f20fad From 1bde71448b4ee32f4d09e0f569a2108181a02f69 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 May 2024 23:16:37 +0000 Subject: [PATCH 1185/1244] Merged PR 39690: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240517.46 - **Date Produced**: May 17, 2024 9:49:12 PM UTC - **Commit**: 8c7ce8b7b86cf1278b2da96d07a6b62f8ceb468f - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.423-servicing.24266.28 to 6.0.424-servicing.24267.46][2] - **Microsoft.NET.Sdk**: [from 6.0.423-servicing.24266.28 to 6.0.424-servicing.24267.46][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.30 to 6.0.31][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.30-servicing.24217.3 to 6.0.31-servicing.24266.6][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.30-servicing.24217.3 to 6.0.31-servicing.24266.6][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.30 to 6.0.31][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.30-servicing.24216.19 to 6.0.31-servicing.24266.3][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.30 to 6.0.31][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.30-servicing.24216.7 to 6.0.31-servicing.24266.4][5] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC806c8e273d42fa22ddf92440590d87bb16818ff7&targetVersion=GC8c7ce8b7b86cf1278b2da96d07a6b62f8ceb468f&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCd0dfc3119d2aa9f601fcbdc56717b2f49781898e&targetVersion=GC31992eb5a715d2eaee71ccd7a8139a05d1c05311&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC431a1dcb7d4eafa215951499ad374ffde8622e61&targetVersion=GCcc6b27b00d494617f99060eb9e4ab4b362d06806&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCdee47a1e2958aa9b97d3c5edf9433312cc5a4634&targetVersion=GC9dd26a5992cddbe87e605d40ff71fe8137b6f7f5&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) [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.30 to 6.0.31 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.30-servicing.24217.3 to 6.0.31-servicing.24266.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.Wind... --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6a63028064ce..a4ed430ec570 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,11 +21,7 @@ - - - - - + @@ -55,11 +51,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62783324971b..94618d003779 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d0dfc3119d2aa9f601fcbdc56717b2f49781898e + 31992eb5a715d2eaee71ccd7a8139a05d1c05311 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d0dfc3119d2aa9f601fcbdc56717b2f49781898e + 31992eb5a715d2eaee71ccd7a8139a05d1c05311 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d0dfc3119d2aa9f601fcbdc56717b2f49781898e + 31992eb5a715d2eaee71ccd7a8139a05d1c05311 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d0dfc3119d2aa9f601fcbdc56717b2f49781898e + 31992eb5a715d2eaee71ccd7a8139a05d1c05311 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 899e481c21a53dd5898ece5c211955f46740521e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 806c8e273d42fa22ddf92440590d87bb16818ff7 + 8c7ce8b7b86cf1278b2da96d07a6b62f8ceb468f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 806c8e273d42fa22ddf92440590d87bb16818ff7 + 8c7ce8b7b86cf1278b2da96d07a6b62f8ceb468f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 431a1dcb7d4eafa215951499ad374ffde8622e61 + cc6b27b00d494617f99060eb9e4ab4b362d06806 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - dee47a1e2958aa9b97d3c5edf9433312cc5a4634 + 9dd26a5992cddbe87e605d40ff71fe8137b6f7f5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a16ce64d1ead..a81b252dc8a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.30-servicing.24216.19 + 6.0.31-servicing.24266.3 - 6.0.30-servicing.24216.7 + 6.0.31-servicing.24266.4 @@ -55,8 +55,8 @@ - 6.0.423-servicing.24266.28 - 6.0.423-servicing.24266.28 + 6.0.424-servicing.24267.46 + 6.0.424-servicing.24267.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,10 +77,10 @@ - 6.0.30-servicing.24217.3 - 6.0.30-servicing.24217.3 - 6.0.30 - 6.0.30 + 6.0.31-servicing.24266.6 + 6.0.31-servicing.24266.6 + 6.0.31 + 6.0.31 From 3d3d62c90b08781bbe6857cb04a468d290b59ba4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 May 2024 04:53:37 +0000 Subject: [PATCH 1186/1244] Merged PR 39711: [internal/release/6.0.4xx] 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.31 to 6.0.31 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.31 to 6.0.31 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.423 to 6.0.424 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.423-rtm.24266.2 to 6.0.424-rtm.24267.26 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.423 to 6.0.424 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240517.59 - **Date Produced**: May 17, 2024 11:48:42 PM UTC - **Commit**: 4603325bdf084367b10d8389aa2be7acac403f44 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.424-servicing.24267.46 to 6.0.424-servicing.24267.59][1] - **Microsoft.NET.Sdk**: [from 6.0.424-servicing.24267.46 to 6.0.424-servicing.24267.59][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.31 to 6.0.31][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.31 to 6.0.31][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11][2] - **dotnet-dev-certs**: [from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11][2] - **dotnet-user-secrets**: [from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.423 to 6.0.424][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.423-rtm.24266.2 to 6.0.424-rtm.24267.26][3] - **Microsoft.DotNet.Common... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index a4ed430ec570..8c7852e35e7e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,13 +42,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 94618d003779..fefac2f3f29d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 929d26b875576909aad373373c983c63c65234c0 + 97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 929d26b875576909aad373373c983c63c65234c0 + 97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 929d26b875576909aad373373c983c63c65234c0 + 97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 929d26b875576909aad373373c983c63c65234c0 + 97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 929d26b875576909aad373373c983c63c65234c0 + 97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 929d26b875576909aad373373c983c63c65234c0 + 97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 899e481c21a53dd5898ece5c211955f46740521e + 4b74c656842f4e70599201b959d683025bf71a7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 899e481c21a53dd5898ece5c211955f46740521e + 4b74c656842f4e70599201b959d683025bf71a7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 899e481c21a53dd5898ece5c211955f46740521e + 4b74c656842f4e70599201b959d683025bf71a7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c7ce8b7b86cf1278b2da96d07a6b62f8ceb468f + 4603325bdf084367b10d8389aa2be7acac403f44 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c7ce8b7b86cf1278b2da96d07a6b62f8ceb468f + 4603325bdf084367b10d8389aa2be7acac403f44 diff --git a/eng/Versions.props b/eng/Versions.props index a81b252dc8a0..c5fe998d5c7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.423 + 6.0.424 @@ -45,18 +45,18 @@ 6.0.31 6.0.31 - 6.0.31-servicing.24266.4 - 6.0.31-servicing.24266.4 - 6.0.31-servicing.24266.4 - 6.0.31-servicing.24266.4 + 6.0.31-servicing.24267.11 + 6.0.31-servicing.24267.11 + 6.0.31-servicing.24267.11 + 6.0.31-servicing.24267.11 0.2.0 - 6.0.424-servicing.24267.46 - 6.0.424-servicing.24267.46 + 6.0.424-servicing.24267.59 + 6.0.424-servicing.24267.59 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.423 + 6.0.424 $(MicrosoftAspNetCoreAppRuntimePackageVersion) From e57692b270f8853b55d4e4896334abdb0a6300e4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 18 May 2024 05:48:27 +0000 Subject: [PATCH 1187/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240517.78 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24267.59 -> To Version 6.0.424-servicing.24267.78 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.31 -> To Version 6.0.31 (parent: Microsoft.NET.Sdk --- NuGet.config | 9 +++---- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++++---------- 3 files changed, 43 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8c7852e35e7e..734db44449b5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,18 +10,19 @@ + - + - + @@ -45,13 +46,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fefac2f3f29d..50d293690a15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 31992eb5a715d2eaee71ccd7a8139a05d1c05311 + 732af8bbaf6c83496713dbd44444250fba5c6f4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 31992eb5a715d2eaee71ccd7a8139a05d1c05311 + 732af8bbaf6c83496713dbd44444250fba5c6f4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 31992eb5a715d2eaee71ccd7a8139a05d1c05311 + 732af8bbaf6c83496713dbd44444250fba5c6f4d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 31992eb5a715d2eaee71ccd7a8139a05d1c05311 + 732af8bbaf6c83496713dbd44444250fba5c6f4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 + abb709d623326fec5088c154377059f646653af0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 + abb709d623326fec5088c154377059f646653af0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 + abb709d623326fec5088c154377059f646653af0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 + abb709d623326fec5088c154377059f646653af0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 + abb709d623326fec5088c154377059f646653af0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 + abb709d623326fec5088c154377059f646653af0 @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4b74c656842f4e70599201b959d683025bf71a7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4603325bdf084367b10d8389aa2be7acac403f44 + c6ac680d25e36d9641f183d127f148eac1e11464 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4603325bdf084367b10d8389aa2be7acac403f44 + c6ac680d25e36d9641f183d127f148eac1e11464 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms cc6b27b00d494617f99060eb9e4ab4b362d06806 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9dd26a5992cddbe87e605d40ff71fe8137b6f7f5 + b90f1a2905baae28f376f41a3e0e48eb7cf2f8bf https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3b28b2c8eb8a64c82c01e3deb104cfedf3b6a8ca + 14534e389c9ec9a70b77eea006909f6e75df4102 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index c5fe998d5c7b..40c5bba374db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.31-servicing.24266.4 + 6.0.32-servicing.24267.10 @@ -55,8 +55,8 @@ - 6.0.424-servicing.24267.59 - 6.0.424-servicing.24267.59 + 6.0.424-servicing.24267.78 + 6.0.424-servicing.24267.78 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,18 +67,18 @@ - 6.0.31-servicing.24251.12 - 6.0.31-servicing.24251.12 - 6.0.31 - 6.0.31 - 6.0.31 - 6.0.31 + 6.0.32-servicing.24267.29 + 6.0.32-servicing.24267.29 + 6.0.32 + 6.0.32 + 6.0.32 + 6.0.32 2.1.0 - 6.0.31-servicing.24266.6 - 6.0.31-servicing.24266.6 + 6.0.31-servicing.24267.15 + 6.0.31-servicing.24267.15 6.0.31 6.0.31 @@ -155,7 +155,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.30 + 6.0.32 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 9b658aace2de35021e213869d3e0c13be4bcc5be Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 18 May 2024 23:26:06 +0000 Subject: [PATCH 1188/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240518.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24267.78 -> To Version 6.0.424-servicing.24268.4 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.31 -> To Version 6.0.31 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 734db44449b5..c7220bfab7f8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -43,13 +43,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50d293690a15..fa65613ae5aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f + 3ee766d0b1b35a87e99083531ff098068045b6ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f + 3ee766d0b1b35a87e99083531ff098068045b6ae https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f + 3ee766d0b1b35a87e99083531ff098068045b6ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f + 3ee766d0b1b35a87e99083531ff098068045b6ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f + 3ee766d0b1b35a87e99083531ff098068045b6ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f + 3ee766d0b1b35a87e99083531ff098068045b6ae https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4b74c656842f4e70599201b959d683025bf71a7e + 9cf8f1e9c0038587fa55099867a453f265cb6273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4b74c656842f4e70599201b959d683025bf71a7e + 9cf8f1e9c0038587fa55099867a453f265cb6273 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4b74c656842f4e70599201b959d683025bf71a7e + 9cf8f1e9c0038587fa55099867a453f265cb6273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c6ac680d25e36d9641f183d127f148eac1e11464 + 344674e5fd5e42b52abe8f4bed56342d15ff7c0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c6ac680d25e36d9641f183d127f148eac1e11464 + 344674e5fd5e42b52abe8f4bed56342d15ff7c0e diff --git a/eng/Versions.props b/eng/Versions.props index 40c5bba374db..7fed111453de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,18 +45,18 @@ 6.0.31 6.0.31 - 6.0.31-servicing.24267.11 - 6.0.31-servicing.24267.11 - 6.0.31-servicing.24267.11 - 6.0.31-servicing.24267.11 + 6.0.31-servicing.24267.21 + 6.0.31-servicing.24267.21 + 6.0.31-servicing.24267.21 + 6.0.31-servicing.24267.21 0.2.0 - 6.0.424-servicing.24267.78 - 6.0.424-servicing.24267.78 + 6.0.424-servicing.24268.4 + 6.0.424-servicing.24268.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 90984c823d032a7b129ad9967e1be0d0dcb18eea Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 19 May 2024 06:22:40 +0000 Subject: [PATCH 1189/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240518.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24268.4 -> To Version 6.0.424-servicing.24268.16 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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 From Version 6.0.31 -> To Version 6.0.31 (parent: Microsoft.NET.Sdk --- 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 c7220bfab7f8..9ec6f310adaf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa65613ae5aa..056be30f023c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 732af8bbaf6c83496713dbd44444250fba5c6f4d + 15a4f9abbd356883e2147d020e3db029c743e806 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 732af8bbaf6c83496713dbd44444250fba5c6f4d + 15a4f9abbd356883e2147d020e3db029c743e806 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 732af8bbaf6c83496713dbd44444250fba5c6f4d + 15a4f9abbd356883e2147d020e3db029c743e806 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 732af8bbaf6c83496713dbd44444250fba5c6f4d + 15a4f9abbd356883e2147d020e3db029c743e806 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3ee766d0b1b35a87e99083531ff098068045b6ae + 09c31efb6d6746cc270aebb80cf7fe1c73a7279f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3ee766d0b1b35a87e99083531ff098068045b6ae + 09c31efb6d6746cc270aebb80cf7fe1c73a7279f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3ee766d0b1b35a87e99083531ff098068045b6ae + 09c31efb6d6746cc270aebb80cf7fe1c73a7279f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3ee766d0b1b35a87e99083531ff098068045b6ae + 09c31efb6d6746cc270aebb80cf7fe1c73a7279f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3ee766d0b1b35a87e99083531ff098068045b6ae + 09c31efb6d6746cc270aebb80cf7fe1c73a7279f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3ee766d0b1b35a87e99083531ff098068045b6ae + 09c31efb6d6746cc270aebb80cf7fe1c73a7279f https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9cf8f1e9c0038587fa55099867a453f265cb6273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 344674e5fd5e42b52abe8f4bed56342d15ff7c0e + 9d55e6cd495114832029e35ad935ca995818aaa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 344674e5fd5e42b52abe8f4bed56342d15ff7c0e + 9d55e6cd495114832029e35ad935ca995818aaa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cc6b27b00d494617f99060eb9e4ab4b362d06806 + 8460a2e74768942ee0c5d081be831cf53c2e609a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b90f1a2905baae28f376f41a3e0e48eb7cf2f8bf + 66bb6b2efd50110c38e22e3f3b0dc9c972e536c7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7fed111453de..9ee073eaa548 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.31-servicing.24266.3 + 6.0.31-servicing.24267.12 - 6.0.32-servicing.24267.10 + 6.0.32-servicing.24268.2 @@ -45,18 +45,18 @@ 6.0.31 6.0.31 - 6.0.31-servicing.24267.21 - 6.0.31-servicing.24267.21 - 6.0.31-servicing.24267.21 - 6.0.31-servicing.24267.21 + 6.0.31-servicing.24268.1 + 6.0.31-servicing.24268.1 + 6.0.31-servicing.24268.1 + 6.0.31-servicing.24268.1 0.2.0 - 6.0.424-servicing.24268.4 - 6.0.424-servicing.24268.4 + 6.0.424-servicing.24268.16 + 6.0.424-servicing.24268.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,8 +77,8 @@ - 6.0.31-servicing.24267.15 - 6.0.31-servicing.24267.15 + 6.0.31-servicing.24268.4 + 6.0.31-servicing.24268.4 6.0.31 6.0.31 From 61b8f2a4f621de54fa628eb23cbae59706843b94 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 May 2024 17:31:39 +0000 Subject: [PATCH 1190/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24268.4 -> To Version 6.0.424-servicing.24270.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.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 From Version 6.0.31 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9ec6f310adaf..a33386565098 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 056be30f023c..2a7503640cb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 15a4f9abbd356883e2147d020e3db029c743e806 + 93a1697c05d3dd9d80b5a6d857dc78a933898323 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 15a4f9abbd356883e2147d020e3db029c743e806 + 93a1697c05d3dd9d80b5a6d857dc78a933898323 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 15a4f9abbd356883e2147d020e3db029c743e806 + 93a1697c05d3dd9d80b5a6d857dc78a933898323 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 15a4f9abbd356883e2147d020e3db029c743e806 + 93a1697c05d3dd9d80b5a6d857dc78a933898323 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9cf8f1e9c0038587fa55099867a453f265cb6273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d55e6cd495114832029e35ad935ca995818aaa3 + 9a18882249c0b52cd38e94fe7f6caf0be55b5a1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d55e6cd495114832029e35ad935ca995818aaa3 + 9a18882249c0b52cd38e94fe7f6caf0be55b5a1d diff --git a/eng/Versions.props b/eng/Versions.props index 9ee073eaa548..b26bf2aa9a33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.424-servicing.24268.16 - 6.0.424-servicing.24268.16 + 6.0.424-servicing.24270.9 + 6.0.424-servicing.24270.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,10 +77,10 @@ - 6.0.31-servicing.24268.4 - 6.0.31-servicing.24268.4 - 6.0.31 - 6.0.31 + 6.0.32-servicing.24269.10 + 6.0.32-servicing.24269.10 + 6.0.32 + 6.0.32 From 44780f9fc347a483860cfd1bff49d321c67cf425 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 May 2024 21:08:23 +0000 Subject: [PATCH 1191/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24270.9 -> To Version 6.0.424-servicing.24270.20 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- 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 a33386565098..1d26efab9692 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a7503640cb4..8e4958012ddb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 93a1697c05d3dd9d80b5a6d857dc78a933898323 + c1a1465eff5280de1f6b8cc62fee20494c89b2db - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 93a1697c05d3dd9d80b5a6d857dc78a933898323 + c1a1465eff5280de1f6b8cc62fee20494c89b2db - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 93a1697c05d3dd9d80b5a6d857dc78a933898323 + c1a1465eff5280de1f6b8cc62fee20494c89b2db https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 93a1697c05d3dd9d80b5a6d857dc78a933898323 + c1a1465eff5280de1f6b8cc62fee20494c89b2db https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9cf8f1e9c0038587fa55099867a453f265cb6273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a18882249c0b52cd38e94fe7f6caf0be55b5a1d + 58ff2eded45802350b27a9d43e88319ca940b976 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a18882249c0b52cd38e94fe7f6caf0be55b5a1d + 58ff2eded45802350b27a9d43e88319ca940b976 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8460a2e74768942ee0c5d081be831cf53c2e609a + 8b5c0ead7c241bb1415f17e61e0f891cce85ff4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 66bb6b2efd50110c38e22e3f3b0dc9c972e536c7 + 7e2bc9b2110c34fb82dc6a7296a9fe4d4ddfaf2c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b26bf2aa9a33..f456f7958618 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.31-servicing.24267.12 + 6.0.32-servicing.24269.17 - 6.0.32-servicing.24268.2 + 6.0.32-servicing.24270.6 @@ -55,8 +55,8 @@ - 6.0.424-servicing.24270.9 - 6.0.424-servicing.24270.9 + 6.0.424-servicing.24270.20 + 6.0.424-servicing.24270.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,8 +77,8 @@ - 6.0.32-servicing.24269.10 - 6.0.32-servicing.24269.10 + 6.0.32-servicing.24270.11 + 6.0.32-servicing.24270.11 6.0.32 6.0.32 From 45db330cbdedb3a583e1246a9ac490542eec3d04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 14:36:23 -0700 Subject: [PATCH 1192/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#19806) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 26 ------------------- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- .../job/source-index-stage1.yml | 6 ++--- .../templates-official/jobs/source-build.yml | 2 +- .../templates/job/source-index-stage1.yml | 6 ++--- eng/common/templates/jobs/source-build.yml | 2 +- global.json | 6 ++--- 8 files changed, 18 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4096b1bff2df..c6e6fab3a3cb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,23 +14,10 @@ - - - - - - - - - - - - - @@ -53,23 +40,10 @@ - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97b8fcd52c00..512605343b09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - bd9b4590681e602535ed414e98a17e6ba121dca4 + 2eab07c3d7b78219d10099b19fafeef2ecae1779 - + https://github.com/dotnet/arcade - bd9b4590681e602535ed414e98a17e6ba121dca4 + 2eab07c3d7b78219d10099b19fafeef2ecae1779 - + https://github.com/dotnet/arcade - bd9b4590681e602535ed414e98a17e6ba121dca4 + 2eab07c3d7b78219d10099b19fafeef2ecae1779 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8e66ee36b250..3a2864dae6a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24204.4 + 6.0.0-beta.24266.4 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index e96ec3cbe0ed..f04ad04c2b18 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20210614.1 + sourceIndexPackageVersion: 1.0.1-20240320.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -32,10 +32,10 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core sdk 3.1 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 3.1.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 2159009dc8e1..b9a1f67b9a9a 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index d8990549e809..b710698eb4d4 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20210614.1 + sourceIndexPackageVersion: 1.0.1-20240320.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -30,10 +30,10 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core sdk 3.1 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 3.1.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 00aa98eb3bfd..7c240e654472 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/global.json b/global.json index ab4fa5d59422..f624a99df800 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.128", + "dotnet": "6.0.130", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24204.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24266.4", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24266.4" } } From 302b4332cacfa1fac111771defd4da94231352a4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 May 2024 22:50:16 +0000 Subject: [PATCH 1193/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.43 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24270.9 -> To Version 6.0.424-servicing.24270.43 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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 From Version 6.0.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 +++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++++---------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1d26efab9692..7dc18b83b023 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e4958012ddb..2debf781df6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c1a1465eff5280de1f6b8cc62fee20494c89b2db + 32e0f9e1f2709e665f70c6ab04af0db13fe282b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c1a1465eff5280de1f6b8cc62fee20494c89b2db + 32e0f9e1f2709e665f70c6ab04af0db13fe282b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c1a1465eff5280de1f6b8cc62fee20494c89b2db + 32e0f9e1f2709e665f70c6ab04af0db13fe282b8 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c1a1465eff5280de1f6b8cc62fee20494c89b2db + 32e0f9e1f2709e665f70c6ab04af0db13fe282b8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09c31efb6d6746cc270aebb80cf7fe1c73a7279f + 298810852e879c6a4f573a15967fd3dda922a715 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09c31efb6d6746cc270aebb80cf7fe1c73a7279f + 298810852e879c6a4f573a15967fd3dda922a715 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09c31efb6d6746cc270aebb80cf7fe1c73a7279f + 298810852e879c6a4f573a15967fd3dda922a715 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09c31efb6d6746cc270aebb80cf7fe1c73a7279f + 298810852e879c6a4f573a15967fd3dda922a715 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09c31efb6d6746cc270aebb80cf7fe1c73a7279f + 298810852e879c6a4f573a15967fd3dda922a715 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09c31efb6d6746cc270aebb80cf7fe1c73a7279f + 298810852e879c6a4f573a15967fd3dda922a715 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9cf8f1e9c0038587fa55099867a453f265cb6273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 58ff2eded45802350b27a9d43e88319ca940b976 + 1bf1adf95832105762e69ea7d59953216307889a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 58ff2eded45802350b27a9d43e88319ca940b976 + 1bf1adf95832105762e69ea7d59953216307889a https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 8b5c0ead7c241bb1415f17e61e0f891cce85ff4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7e2bc9b2110c34fb82dc6a7296a9fe4d4ddfaf2c + c0fec5a46de850303175b2501975e5dceb5f81a8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f456f7958618..d4f696d9ee40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.32-servicing.24270.6 + 6.0.32-servicing.24270.10 @@ -43,20 +43,20 @@ - 6.0.31 - 6.0.31 - 6.0.31-servicing.24268.1 - 6.0.31-servicing.24268.1 - 6.0.31-servicing.24268.1 - 6.0.31-servicing.24268.1 + 6.0.32 + 6.0.32 + 6.0.32-servicing.24270.7 + 6.0.32-servicing.24270.7 + 6.0.32-servicing.24270.7 + 6.0.32-servicing.24270.7 0.2.0 - 6.0.424-servicing.24270.20 - 6.0.424-servicing.24270.20 + 6.0.424-servicing.24270.43 + 6.0.424-servicing.24270.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,8 +77,8 @@ - 6.0.32-servicing.24270.11 - 6.0.32-servicing.24270.11 + 6.0.32-servicing.24270.17 + 6.0.32-servicing.24270.17 6.0.32 6.0.32 From 7554381b9e1652d6a6d3200771b6b4d235efc4d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 00:13:23 +0000 Subject: [PATCH 1194/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.56 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24270.43 -> To Version 6.0.424-servicing.24270.56 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.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- 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 7dc18b83b023..ac3b81ba0c34 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2debf781df6b..f56610a12436 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 298810852e879c6a4f573a15967fd3dda922a715 + 9947b508f8fea8cca57ae03c5d3c97bc1b360c23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 298810852e879c6a4f573a15967fd3dda922a715 + 9947b508f8fea8cca57ae03c5d3c97bc1b360c23 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 298810852e879c6a4f573a15967fd3dda922a715 + 9947b508f8fea8cca57ae03c5d3c97bc1b360c23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 298810852e879c6a4f573a15967fd3dda922a715 + 9947b508f8fea8cca57ae03c5d3c97bc1b360c23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 298810852e879c6a4f573a15967fd3dda922a715 + 9947b508f8fea8cca57ae03c5d3c97bc1b360c23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 298810852e879c6a4f573a15967fd3dda922a715 + 9947b508f8fea8cca57ae03c5d3c97bc1b360c23 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9cf8f1e9c0038587fa55099867a453f265cb6273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf1adf95832105762e69ea7d59953216307889a + b23363eddcd40603106acf6055795f08d71d4adc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf1adf95832105762e69ea7d59953216307889a + b23363eddcd40603106acf6055795f08d71d4adc diff --git a/eng/Versions.props b/eng/Versions.props index d4f696d9ee40..cbc8f1286aa5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,18 +45,18 @@ 6.0.32 6.0.32 - 6.0.32-servicing.24270.7 - 6.0.32-servicing.24270.7 - 6.0.32-servicing.24270.7 - 6.0.32-servicing.24270.7 + 6.0.32-servicing.24270.17 + 6.0.32-servicing.24270.17 + 6.0.32-servicing.24270.17 + 6.0.32-servicing.24270.17 0.2.0 - 6.0.424-servicing.24270.43 - 6.0.424-servicing.24270.43 + 6.0.424-servicing.24270.56 + 6.0.424-servicing.24270.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From db34edd5a11cbd0434f9ddc95d5ba94a8519dd4e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 02:36:37 +0000 Subject: [PATCH 1195/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.68 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24270.56 -> To Version 6.0.424-servicing.24270.68 --- 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 ac5a45d0e52c..dedf3a6daedd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9cf8f1e9c0038587fa55099867a453f265cb6273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b23363eddcd40603106acf6055795f08d71d4adc + 477a32b4ea21bfedde04f7a79d7a239c87a08889 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b23363eddcd40603106acf6055795f08d71d4adc + 477a32b4ea21bfedde04f7a79d7a239c87a08889 diff --git a/eng/Versions.props b/eng/Versions.props index a0c237b78ac0..9771f0e74d74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.424-servicing.24270.56 - 6.0.424-servicing.24270.56 + 6.0.424-servicing.24270.68 + 6.0.424-servicing.24270.68 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5975dde5d43575945a5379cf18c2231bf890f012 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 03:28:37 +0000 Subject: [PATCH 1196/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.79 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24270.56 -> To Version 6.0.424-servicing.24270.79 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22553.1 -> To Version 6.0.200-1.24270.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 dedf3a6daedd..7e96b3e31097 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9cf8f1e9c0038587fa55099867a453f265cb6273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 477a32b4ea21bfedde04f7a79d7a239c87a08889 + 400290a5af82e5a6cab6e91a7aef76a5f5bd592c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 477a32b4ea21bfedde04f7a79d7a239c87a08889 + 400290a5af82e5a6cab6e91a7aef76a5f5bd592c @@ -135,9 +135,9 @@ 6e76d580fcc69954441344175bd1b0ab2e432026 - + https://github.com/dotnet/linker - 4be765525a1b45d28ab69a48f92e008b70a4e56e + e66cbcaa36aa719936a46160198c9012c6e174e4 linker diff --git a/eng/Versions.props b/eng/Versions.props index 9771f0e74d74..b9ca682f9727 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.424-servicing.24270.68 - 6.0.424-servicing.24270.68 + 6.0.424-servicing.24270.79 + 6.0.424-servicing.24270.79 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1da1a4b652aaa99271767e751aae1c14a75cda01 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 04:20:59 +0000 Subject: [PATCH 1197/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.83 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24270.56 -> To Version 6.0.424-servicing.24270.83 Dependency coherency updates 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.NET.ILLink.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++--- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index ac3b81ba0c34..cadc4eb2a928 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,13 +10,13 @@ - + - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e96b3e31097..ff093753fedc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 32e0f9e1f2709e665f70c6ab04af0db13fe282b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - abb709d623326fec5088c154377059f646653af0 + a1d71935158bdc68901bd014feca5fb68c43fb7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - abb709d623326fec5088c154377059f646653af0 + a1d71935158bdc68901bd014feca5fb68c43fb7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - abb709d623326fec5088c154377059f646653af0 + a1d71935158bdc68901bd014feca5fb68c43fb7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - abb709d623326fec5088c154377059f646653af0 + a1d71935158bdc68901bd014feca5fb68c43fb7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - abb709d623326fec5088c154377059f646653af0 + a1d71935158bdc68901bd014feca5fb68c43fb7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - abb709d623326fec5088c154377059f646653af0 + a1d71935158bdc68901bd014feca5fb68c43fb7c @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9cf8f1e9c0038587fa55099867a453f265cb6273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 400290a5af82e5a6cab6e91a7aef76a5f5bd592c + 3ee879352ffa2785a4f7c558ae1752bf31c6a4de - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 400290a5af82e5a6cab6e91a7aef76a5f5bd592c + 3ee879352ffa2785a4f7c558ae1752bf31c6a4de @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 14534e389c9ec9a70b77eea006909f6e75df4102 + 5a2faf37a44cf9ec7d58ef5cf8e7e9420ea04615 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index b9ca682f9727..9b571f6a9b5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.424-servicing.24270.79 - 6.0.424-servicing.24270.79 + 6.0.424-servicing.24270.83 + 6.0.424-servicing.24270.83 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,8 +67,8 @@ - 6.0.32-servicing.24267.29 - 6.0.32-servicing.24267.29 + 6.0.32-servicing.24270.20 + 6.0.32-servicing.24270.20 6.0.32 6.0.32 6.0.32 From f584fdd7a98a28dd2a1849d9d417cea507ad0c27 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 05:25:39 +0000 Subject: [PATCH 1198/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.89 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24270.83 -> To Version 6.0.424-servicing.24270.89 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.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index cadc4eb2a928..5c57b6115d61 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -43,13 +43,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff093753fedc..a586a88018a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9947b508f8fea8cca57ae03c5d3c97bc1b360c23 + 92ef010d93acfb0742062bb180149230c9d76175 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9947b508f8fea8cca57ae03c5d3c97bc1b360c23 + 92ef010d93acfb0742062bb180149230c9d76175 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9947b508f8fea8cca57ae03c5d3c97bc1b360c23 + 92ef010d93acfb0742062bb180149230c9d76175 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9947b508f8fea8cca57ae03c5d3c97bc1b360c23 + 92ef010d93acfb0742062bb180149230c9d76175 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9947b508f8fea8cca57ae03c5d3c97bc1b360c23 + 92ef010d93acfb0742062bb180149230c9d76175 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9947b508f8fea8cca57ae03c5d3c97bc1b360c23 + 92ef010d93acfb0742062bb180149230c9d76175 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9cf8f1e9c0038587fa55099867a453f265cb6273 + 18a8de8275918ced823bd7bea39220c9e675672b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9cf8f1e9c0038587fa55099867a453f265cb6273 + 18a8de8275918ced823bd7bea39220c9e675672b https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9cf8f1e9c0038587fa55099867a453f265cb6273 + 18a8de8275918ced823bd7bea39220c9e675672b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ee879352ffa2785a4f7c558ae1752bf31c6a4de + 029b34288a59c445962c72b9609efde78a67e855 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ee879352ffa2785a4f7c558ae1752bf31c6a4de + 029b34288a59c445962c72b9609efde78a67e855 diff --git a/eng/Versions.props b/eng/Versions.props index 9b571f6a9b5b..e67df5717aab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,18 +45,18 @@ 6.0.32 6.0.32 - 6.0.32-servicing.24270.17 - 6.0.32-servicing.24270.17 - 6.0.32-servicing.24270.17 - 6.0.32-servicing.24270.17 + 6.0.32-servicing.24270.25 + 6.0.32-servicing.24270.25 + 6.0.32-servicing.24270.25 + 6.0.32-servicing.24270.25 0.2.0 - 6.0.424-servicing.24270.83 - 6.0.424-servicing.24270.83 + 6.0.424-servicing.24270.89 + 6.0.424-servicing.24270.89 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e41275f538b9fbfb07fd14af4c4ec2269508be88 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 18:34:50 +0000 Subject: [PATCH 1199/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240521.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24270.89 -> To Version 6.0.424-servicing.24271.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- 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 5c57b6115d61..f037356c651f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a586a88018a6..af4215da5eaf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 32e0f9e1f2709e665f70c6ab04af0db13fe282b8 + fd7dd9ef7cc145f2f58a9783ae4d9278e8d38b26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 32e0f9e1f2709e665f70c6ab04af0db13fe282b8 + fd7dd9ef7cc145f2f58a9783ae4d9278e8d38b26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 32e0f9e1f2709e665f70c6ab04af0db13fe282b8 + fd7dd9ef7cc145f2f58a9783ae4d9278e8d38b26 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 32e0f9e1f2709e665f70c6ab04af0db13fe282b8 + fd7dd9ef7cc145f2f58a9783ae4d9278e8d38b26 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 18a8de8275918ced823bd7bea39220c9e675672b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 029b34288a59c445962c72b9609efde78a67e855 + 1273d12be0337a0527bf53b9a69a44fd9446cf2d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 029b34288a59c445962c72b9609efde78a67e855 + 1273d12be0337a0527bf53b9a69a44fd9446cf2d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b5c0ead7c241bb1415f17e61e0f891cce85ff4d + b7ab526075c97945087f09fbc7696c307d2fa9ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c0fec5a46de850303175b2501975e5dceb5f81a8 + 1d682d78ec30616431895982506dd675d4b29877 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e67df5717aab..9cd7db11cd65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.32-servicing.24269.17 + 6.0.32-servicing.24270.7 - 6.0.32-servicing.24270.10 + 6.0.32-servicing.24270.13 @@ -55,8 +55,8 @@ - 6.0.424-servicing.24270.89 - 6.0.424-servicing.24270.89 + 6.0.424-servicing.24271.11 + 6.0.424-servicing.24271.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,8 +77,8 @@ - 6.0.32-servicing.24270.17 - 6.0.32-servicing.24270.17 + 6.0.32-servicing.24271.2 + 6.0.32-servicing.24271.2 6.0.32 6.0.32 From 1ca694d577a00f304aef41b240abeeb0336ed5d5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 13 Jun 2024 00:16:41 +0000 Subject: [PATCH 1200/1244] Merged PR 40347: [internal/release/6.0.4xx] 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.App.Ref**: from 6.0.32 to 6.0.32 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.32 to 6.0.32 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.32 to 6.0.32 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.32 to 6.0.32 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.32 to 6.0.32 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.32-servicing.24270.25 to 6.0.32-servicing.24304.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.32 to 6.0.32 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.32-servicing.24270.25 to 6.0.32-servicing.24304.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.32-servicing.24270.25 to 6.0.32-servicing.24304.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.32-servicing.24270.25 to 6.0.32-servicing.24304.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: from 6.0.32 to 6.0.32 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240612.16 - **Date Produced**: June 12, 2024 10:27:03 PM UTC - **Commit**: 5a38de2eaeb73f0c990dd9afd20fcee54b1b4323 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.424-servicing.24271.11 to 6.0.424-servicing.24312.16][1] - **Microsoft.NET.Sdk**: [from 6.0.424-servicing.24271.11 to 6.0.424-servicing.24312.16][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.32 to 6.0.32][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.32 to 6.0.32][2] - **Microsoft.NE... --- NuGet.config | 30 ++++++++++++++++++++++----- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 56 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index f037356c651f..1ec228f9397c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,32 @@ - + - + - + + + + + + + + + + + @@ -43,15 +53,25 @@ - + - + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af4215da5eaf..412c48d62b7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop fd7dd9ef7cc145f2f58a9783ae4d9278e8d38b26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1d71935158bdc68901bd014feca5fb68c43fb7c + c1b0b27947208969c44a51033aef7fea048f3e55 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1d71935158bdc68901bd014feca5fb68c43fb7c + c1b0b27947208969c44a51033aef7fea048f3e55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1d71935158bdc68901bd014feca5fb68c43fb7c + c1b0b27947208969c44a51033aef7fea048f3e55 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1d71935158bdc68901bd014feca5fb68c43fb7c + c1b0b27947208969c44a51033aef7fea048f3e55 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1d71935158bdc68901bd014feca5fb68c43fb7c + c1b0b27947208969c44a51033aef7fea048f3e55 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1d71935158bdc68901bd014feca5fb68c43fb7c + c1b0b27947208969c44a51033aef7fea048f3e55 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92ef010d93acfb0742062bb180149230c9d76175 + e0843d8144f2d24489005db308721f4c82c0ddf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92ef010d93acfb0742062bb180149230c9d76175 + e0843d8144f2d24489005db308721f4c82c0ddf3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92ef010d93acfb0742062bb180149230c9d76175 + e0843d8144f2d24489005db308721f4c82c0ddf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92ef010d93acfb0742062bb180149230c9d76175 + e0843d8144f2d24489005db308721f4c82c0ddf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92ef010d93acfb0742062bb180149230c9d76175 + e0843d8144f2d24489005db308721f4c82c0ddf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92ef010d93acfb0742062bb180149230c9d76175 + e0843d8144f2d24489005db308721f4c82c0ddf3 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 18a8de8275918ced823bd7bea39220c9e675672b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1273d12be0337a0527bf53b9a69a44fd9446cf2d + 5a38de2eaeb73f0c990dd9afd20fcee54b1b4323 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1273d12be0337a0527bf53b9a69a44fd9446cf2d + 5a38de2eaeb73f0c990dd9afd20fcee54b1b4323 @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 5a2faf37a44cf9ec7d58ef5cf8e7e9420ea04615 + 8601068126449af799f8e07ca358dbbd4b3fcab4 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 2ac810fb4f07..913c7fe2f95e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,18 +45,18 @@ 6.0.32 6.0.32 - 6.0.32-servicing.24270.25 - 6.0.32-servicing.24270.25 - 6.0.32-servicing.24270.25 - 6.0.32-servicing.24270.25 + 6.0.32-servicing.24304.6 + 6.0.32-servicing.24304.6 + 6.0.32-servicing.24304.6 + 6.0.32-servicing.24304.6 0.2.0 - 6.0.424-servicing.24271.11 - 6.0.424-servicing.24271.11 + 6.0.424-servicing.24312.16 + 6.0.424-servicing.24312.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,8 +67,8 @@ - 6.0.32-servicing.24270.20 - 6.0.32-servicing.24270.20 + 6.0.32-servicing.24310.33 + 6.0.32-servicing.24310.33 6.0.32 6.0.32 6.0.32 From bbda713345ebf85cf8bb7c508cc2e9cca312f365 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Jun 2024 01:04:10 +0000 Subject: [PATCH 1201/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240612.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24312.16 -> To Version 6.0.424-servicing.24312.25 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.424 -> To Version 6.0.424 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++------------ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1ec228f9397c..1a4c629e6e1b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,12 +19,7 @@ - - - - - - + @@ -59,12 +54,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 412c48d62b7b..962d7fd814e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 18a8de8275918ced823bd7bea39220c9e675672b + 66882f1064cade03b498f5ae5361aab07e7b3627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 18a8de8275918ced823bd7bea39220c9e675672b + 66882f1064cade03b498f5ae5361aab07e7b3627 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 18a8de8275918ced823bd7bea39220c9e675672b + 66882f1064cade03b498f5ae5361aab07e7b3627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a38de2eaeb73f0c990dd9afd20fcee54b1b4323 + 69b93c4ee7464e0a5fc5a5b31d14ebf01832ab4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a38de2eaeb73f0c990dd9afd20fcee54b1b4323 + 69b93c4ee7464e0a5fc5a5b31d14ebf01832ab4b diff --git a/eng/Versions.props b/eng/Versions.props index 913c7fe2f95e..32b83a259e5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.424-servicing.24312.16 - 6.0.424-servicing.24312.16 + 6.0.424-servicing.24312.25 + 6.0.424-servicing.24312.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ce4ed02b83a7e18108bd0ab772a38eadbaf27811 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Jun 2024 21:47:39 +0000 Subject: [PATCH 1202/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240613.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24312.25 -> To Version 6.0.424-servicing.24313.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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 From Version 6.0.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++------------ eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1a4c629e6e1b..dc25e2b57613 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -22,12 +22,7 @@ - - - - - - + @@ -48,7 +43,7 @@ - + @@ -57,12 +52,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 962d7fd814e6..76755e2dc6a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fd7dd9ef7cc145f2f58a9783ae4d9278e8d38b26 + ef1b7f8086f89c7d119f33fd064f67c008af6ef7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fd7dd9ef7cc145f2f58a9783ae4d9278e8d38b26 + ef1b7f8086f89c7d119f33fd064f67c008af6ef7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fd7dd9ef7cc145f2f58a9783ae4d9278e8d38b26 + ef1b7f8086f89c7d119f33fd064f67c008af6ef7 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fd7dd9ef7cc145f2f58a9783ae4d9278e8d38b26 + ef1b7f8086f89c7d119f33fd064f67c008af6ef7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0843d8144f2d24489005db308721f4c82c0ddf3 + 1a4259e66dc4e9408b88e60fbf5aa39161a6d420 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0843d8144f2d24489005db308721f4c82c0ddf3 + 1a4259e66dc4e9408b88e60fbf5aa39161a6d420 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0843d8144f2d24489005db308721f4c82c0ddf3 + 1a4259e66dc4e9408b88e60fbf5aa39161a6d420 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0843d8144f2d24489005db308721f4c82c0ddf3 + 1a4259e66dc4e9408b88e60fbf5aa39161a6d420 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0843d8144f2d24489005db308721f4c82c0ddf3 + 1a4259e66dc4e9408b88e60fbf5aa39161a6d420 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0843d8144f2d24489005db308721f4c82c0ddf3 + 1a4259e66dc4e9408b88e60fbf5aa39161a6d420 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 66882f1064cade03b498f5ae5361aab07e7b3627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 69b93c4ee7464e0a5fc5a5b31d14ebf01832ab4b + 7f99a08223627f42071810ca3e2580eba7a8d9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 69b93c4ee7464e0a5fc5a5b31d14ebf01832ab4b + 7f99a08223627f42071810ca3e2580eba7a8d9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7ab526075c97945087f09fbc7696c307d2fa9ce + 0d0145ef1ba75ce4aaf306b233688edd3ec1ffb4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1d682d78ec30616431895982506dd675d4b29877 + cc260c42ce39f3b8d0e6b6970662e6d8fac58108 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 32b83a259e5c..1e148e87a39a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.32-servicing.24270.7 + 6.0.32-servicing.24312.1 - 6.0.32-servicing.24270.13 + 6.0.32-servicing.24312.4 @@ -45,18 +45,18 @@ 6.0.32 6.0.32 - 6.0.32-servicing.24304.6 - 6.0.32-servicing.24304.6 - 6.0.32-servicing.24304.6 - 6.0.32-servicing.24304.6 + 6.0.32-servicing.24313.2 + 6.0.32-servicing.24313.2 + 6.0.32-servicing.24313.2 + 6.0.32-servicing.24313.2 0.2.0 - 6.0.424-servicing.24312.25 - 6.0.424-servicing.24312.25 + 6.0.424-servicing.24313.21 + 6.0.424-servicing.24313.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,8 +77,8 @@ - 6.0.32-servicing.24271.2 - 6.0.32-servicing.24271.2 + 6.0.32-servicing.24313.3 + 6.0.32-servicing.24313.3 6.0.32 6.0.32 From 1b49e36e6777ac13558e29b4366698a99724c39f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Jun 2024 22:50:30 +0000 Subject: [PATCH 1203/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240613.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24313.21 -> To Version 6.0.424-servicing.24313.29 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index dc25e2b57613..e94f2fd883e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76755e2dc6a4..a2ef4c8c1a39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ef1b7f8086f89c7d119f33fd064f67c008af6ef7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1b0b27947208969c44a51033aef7fea048f3e55 + afb18ba908d9a6b8334c1e156ec88638932dedd1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1b0b27947208969c44a51033aef7fea048f3e55 + afb18ba908d9a6b8334c1e156ec88638932dedd1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1b0b27947208969c44a51033aef7fea048f3e55 + afb18ba908d9a6b8334c1e156ec88638932dedd1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1b0b27947208969c44a51033aef7fea048f3e55 + afb18ba908d9a6b8334c1e156ec88638932dedd1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1b0b27947208969c44a51033aef7fea048f3e55 + afb18ba908d9a6b8334c1e156ec88638932dedd1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1b0b27947208969c44a51033aef7fea048f3e55 + afb18ba908d9a6b8334c1e156ec88638932dedd1 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 66882f1064cade03b498f5ae5361aab07e7b3627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f99a08223627f42071810ca3e2580eba7a8d9c7 + f72fc479c5e2d2683dd7a31a602614ab2c8e7387 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f99a08223627f42071810ca3e2580eba7a8d9c7 + f72fc479c5e2d2683dd7a31a602614ab2c8e7387 diff --git a/eng/Versions.props b/eng/Versions.props index 1e148e87a39a..1fcce0590641 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.424-servicing.24313.21 - 6.0.424-servicing.24313.21 + 6.0.424-servicing.24313.29 + 6.0.424-servicing.24313.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,8 +67,8 @@ - 6.0.32-servicing.24310.33 - 6.0.32-servicing.24310.33 + 6.0.32-servicing.24313.8 + 6.0.32-servicing.24313.8 6.0.32 6.0.32 6.0.32 From c932263c35456da7fea1de4b35b3933b1fe808e4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 02:57:32 +0000 Subject: [PATCH 1204/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240613.45 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24313.29 -> To Version 6.0.424-servicing.24313.45 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index e94f2fd883e9..921cb566d073 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -43,16 +43,16 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2ef4c8c1a39..3603941c324f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef1b7f8086f89c7d119f33fd064f67c008af6ef7 + 1e1b31012836aad0ec30e4d376b58d55d38382f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef1b7f8086f89c7d119f33fd064f67c008af6ef7 + 1e1b31012836aad0ec30e4d376b58d55d38382f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef1b7f8086f89c7d119f33fd064f67c008af6ef7 + 1e1b31012836aad0ec30e4d376b58d55d38382f4 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef1b7f8086f89c7d119f33fd064f67c008af6ef7 + 1e1b31012836aad0ec30e4d376b58d55d38382f4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1a4259e66dc4e9408b88e60fbf5aa39161a6d420 + 765b3f39c0d851c9f4878737d936091ceac1bbf5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1a4259e66dc4e9408b88e60fbf5aa39161a6d420 + 765b3f39c0d851c9f4878737d936091ceac1bbf5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1a4259e66dc4e9408b88e60fbf5aa39161a6d420 + 765b3f39c0d851c9f4878737d936091ceac1bbf5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1a4259e66dc4e9408b88e60fbf5aa39161a6d420 + 765b3f39c0d851c9f4878737d936091ceac1bbf5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1a4259e66dc4e9408b88e60fbf5aa39161a6d420 + 765b3f39c0d851c9f4878737d936091ceac1bbf5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1a4259e66dc4e9408b88e60fbf5aa39161a6d420 + 765b3f39c0d851c9f4878737d936091ceac1bbf5 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 66882f1064cade03b498f5ae5361aab07e7b3627 + 42454cc925a39cba8b1f6cc2d999e2e7feaecfe6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 66882f1064cade03b498f5ae5361aab07e7b3627 + 42454cc925a39cba8b1f6cc2d999e2e7feaecfe6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 66882f1064cade03b498f5ae5361aab07e7b3627 + 42454cc925a39cba8b1f6cc2d999e2e7feaecfe6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f72fc479c5e2d2683dd7a31a602614ab2c8e7387 + 94c6de78f07fa9d46e872103b34fbe627ae8fd31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f72fc479c5e2d2683dd7a31a602614ab2c8e7387 + 94c6de78f07fa9d46e872103b34fbe627ae8fd31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0d0145ef1ba75ce4aaf306b233688edd3ec1ffb4 + 2e544744bf8fc5ee2ff1462531b7dd8e3c4af885 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - cc260c42ce39f3b8d0e6b6970662e6d8fac58108 + 2bc8523eac0e97b48cbed2f1e08a8ef97985c933 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1fcce0590641..c5938faf824b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.32-servicing.24312.1 + 6.0.32-servicing.24313.6 - 6.0.32-servicing.24312.4 + 6.0.32-servicing.24313.5 @@ -45,18 +45,18 @@ 6.0.32 6.0.32 - 6.0.32-servicing.24313.2 - 6.0.32-servicing.24313.2 - 6.0.32-servicing.24313.2 - 6.0.32-servicing.24313.2 + 6.0.32-servicing.24313.9 + 6.0.32-servicing.24313.9 + 6.0.32-servicing.24313.9 + 6.0.32-servicing.24313.9 0.2.0 - 6.0.424-servicing.24313.29 - 6.0.424-servicing.24313.29 + 6.0.424-servicing.24313.45 + 6.0.424-servicing.24313.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,8 +77,8 @@ - 6.0.32-servicing.24313.3 - 6.0.32-servicing.24313.3 + 6.0.32-servicing.24313.6 + 6.0.32-servicing.24313.6 6.0.32 6.0.32 From 00b4f025d76fd4578b50b531359007102b269423 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 23:12:45 +0000 Subject: [PATCH 1205/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240614.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24313.45 -> To Version 6.0.424-servicing.24314.19 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 921cb566d073..359742239170 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3603941c324f..df5532917bba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 1e1b31012836aad0ec30e4d376b58d55d38382f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - afb18ba908d9a6b8334c1e156ec88638932dedd1 + e77011b31a3e5c47d931248a64b47f9b2d47853d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - afb18ba908d9a6b8334c1e156ec88638932dedd1 + e77011b31a3e5c47d931248a64b47f9b2d47853d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - afb18ba908d9a6b8334c1e156ec88638932dedd1 + e77011b31a3e5c47d931248a64b47f9b2d47853d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - afb18ba908d9a6b8334c1e156ec88638932dedd1 + e77011b31a3e5c47d931248a64b47f9b2d47853d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - afb18ba908d9a6b8334c1e156ec88638932dedd1 + e77011b31a3e5c47d931248a64b47f9b2d47853d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - afb18ba908d9a6b8334c1e156ec88638932dedd1 + e77011b31a3e5c47d931248a64b47f9b2d47853d @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 42454cc925a39cba8b1f6cc2d999e2e7feaecfe6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 94c6de78f07fa9d46e872103b34fbe627ae8fd31 + 6609dfa9885640b0f79bc7e413181c09c4ed00cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 94c6de78f07fa9d46e872103b34fbe627ae8fd31 + 6609dfa9885640b0f79bc7e413181c09c4ed00cf diff --git a/eng/Versions.props b/eng/Versions.props index c5938faf824b..0baabdc59859 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.424-servicing.24313.45 - 6.0.424-servicing.24313.45 + 6.0.424-servicing.24314.19 + 6.0.424-servicing.24314.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,8 +67,8 @@ - 6.0.32-servicing.24313.8 - 6.0.32-servicing.24313.8 + 6.0.32-servicing.24314.7 + 6.0.32-servicing.24314.7 6.0.32 6.0.32 6.0.32 From e6f7f111ff26e842d5ef4bce64017ed5697c418f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 15 Jun 2024 05:32:01 +0000 Subject: [PATCH 1206/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240614.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24313.45 -> To Version 6.0.424-servicing.24314.33 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 359742239170..0922aed9c649 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -43,13 +43,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df5532917bba..e9ede7df5504 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 765b3f39c0d851c9f4878737d936091ceac1bbf5 + fedc545ce86467b7d3413d906f1ab02fb3db12ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 765b3f39c0d851c9f4878737d936091ceac1bbf5 + fedc545ce86467b7d3413d906f1ab02fb3db12ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 765b3f39c0d851c9f4878737d936091ceac1bbf5 + fedc545ce86467b7d3413d906f1ab02fb3db12ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 765b3f39c0d851c9f4878737d936091ceac1bbf5 + fedc545ce86467b7d3413d906f1ab02fb3db12ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 765b3f39c0d851c9f4878737d936091ceac1bbf5 + fedc545ce86467b7d3413d906f1ab02fb3db12ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 765b3f39c0d851c9f4878737d936091ceac1bbf5 + fedc545ce86467b7d3413d906f1ab02fb3db12ff https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42454cc925a39cba8b1f6cc2d999e2e7feaecfe6 + 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42454cc925a39cba8b1f6cc2d999e2e7feaecfe6 + 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42454cc925a39cba8b1f6cc2d999e2e7feaecfe6 + 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6609dfa9885640b0f79bc7e413181c09c4ed00cf + 048243a38e47e874236d495ecb1ff21b3f5aaad0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6609dfa9885640b0f79bc7e413181c09c4ed00cf + 048243a38e47e874236d495ecb1ff21b3f5aaad0 diff --git a/eng/Versions.props b/eng/Versions.props index 0baabdc59859..aed847f76343 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,18 +45,18 @@ 6.0.32 6.0.32 - 6.0.32-servicing.24313.9 - 6.0.32-servicing.24313.9 - 6.0.32-servicing.24313.9 - 6.0.32-servicing.24313.9 + 6.0.32-servicing.24314.5 + 6.0.32-servicing.24314.5 + 6.0.32-servicing.24314.5 + 6.0.32-servicing.24314.5 0.2.0 - 6.0.424-servicing.24314.19 - 6.0.424-servicing.24314.19 + 6.0.424-servicing.24314.33 + 6.0.424-servicing.24314.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 79f4af8404926d203ba6902f4ff99251d33e5597 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 15 Jun 2024 20:59:04 +0000 Subject: [PATCH 1207/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240615.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24314.33 -> To Version 6.0.424-servicing.24315.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- 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 0922aed9c649..0b1ee68f41a4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9ede7df5504..dc227b09278c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1e1b31012836aad0ec30e4d376b58d55d38382f4 + ef2ca68feb305bd9ebc3934b8488526caee3d118 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1e1b31012836aad0ec30e4d376b58d55d38382f4 + ef2ca68feb305bd9ebc3934b8488526caee3d118 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1e1b31012836aad0ec30e4d376b58d55d38382f4 + ef2ca68feb305bd9ebc3934b8488526caee3d118 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1e1b31012836aad0ec30e4d376b58d55d38382f4 + ef2ca68feb305bd9ebc3934b8488526caee3d118 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 048243a38e47e874236d495ecb1ff21b3f5aaad0 + d1ba1897fb2799cf7a51bab3492c933a4fdad702 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 048243a38e47e874236d495ecb1ff21b3f5aaad0 + d1ba1897fb2799cf7a51bab3492c933a4fdad702 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2e544744bf8fc5ee2ff1462531b7dd8e3c4af885 + 670045968593e524941ef480423796ceb50c5e2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2bc8523eac0e97b48cbed2f1e08a8ef97985c933 + 798cc6d4922db482f84fb72a8244f0da898bc5d6 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index aed847f76343..8e2ef61224d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.32-servicing.24313.6 + 6.0.32-servicing.24314.5 - 6.0.32-servicing.24313.5 + 6.0.32-servicing.24314.4 @@ -55,8 +55,8 @@ - 6.0.424-servicing.24314.33 - 6.0.424-servicing.24314.33 + 6.0.424-servicing.24315.2 + 6.0.424-servicing.24315.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,8 +77,8 @@ - 6.0.32-servicing.24313.6 - 6.0.32-servicing.24313.6 + 6.0.32-servicing.24314.6 + 6.0.32-servicing.24314.6 6.0.32 6.0.32 From 5777cef58607c401d9864fa6956b8208092ba0a7 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jul 2024 10:48:32 -0700 Subject: [PATCH 1208/1244] Update branding to 6.0.425 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 976db20b32aa..267e282eea50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 24 + 25 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c6c1747abb0538456e691831430d2cca397d79a4 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 2 Jul 2024 15:13:30 -0700 Subject: [PATCH 1209/1244] [release/6.0.4xx] Remove EOL centos 7 from PRs/CI (#19949) --- .vsts-ci.yml | 7 ------- .vsts-pr.yml | 7 ------- 2 files changed, 14 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 071768c91a79..35964b6cab7e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -213,13 +213,6 @@ extends: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_1_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker centos' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) Build_Debian_11_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker debian' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 42ca67ae988e..b1590392b32e 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -169,13 +169,6 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_1_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker centos' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) Build_Debian_11_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker debian' From 37e3da1524d81095daa9a99907f09459518eaf3a Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 3 Jul 2024 08:13:23 -0700 Subject: [PATCH 1210/1244] [release/6.0.4xx] Switch to dSAS for internal runtimes (#19939) --- .vsts-ci.yml | 4 +- .vsts-pr.yml | 4 +- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 2 +- eng/build-pr.yml | 2 +- eng/build.yml | 1 + .../templates-official/job/source-build.yml | 8 ++++ .../job/source-index-stage1.yml | 35 ++++++++++----- .../templates-official/jobs/source-build.yml | 8 ++++ .../post-build/common-variables.yml | 1 - .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ .../steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 28 ++++++++++++ eng/common/templates/job/source-build.yml | 8 ++++ .../templates/job/source-index-stage1.yml | 35 ++++++++++----- eng/common/templates/jobs/source-build.yml | 8 ++++ .../templates/post-build/common-variables.yml | 1 - .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ .../templates/steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 28 ++++++++++++ global.json | 4 +- 21 files changed, 295 insertions(+), 36 deletions(-) create mode 100644 eng/common/templates-official/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates-official/steps/get-delegation-sas.yml create mode 100644 eng/common/templates-official/steps/get-federated-access-token.yml create mode 100644 eng/common/templates/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates/steps/get-delegation-sas.yml create mode 100644 eng/common/templates/steps/get-federated-access-token.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 35964b6cab7e..52847992578e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -19,7 +19,6 @@ variables: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - name: Codeql.Enabled value: true - - group: DotNet-DotNetCli-Storage - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true @@ -36,7 +35,6 @@ variables: - name: _InternalRuntimeDownloadArgs value: '' - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) @@ -412,6 +410,8 @@ extends: _TestArg: '' - template: /eng/common/templates-official/jobs/source-build.yml@self + parameters: + enableInternalSources: true - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml@self diff --git a/.vsts-pr.yml b/.vsts-pr.yml index b1590392b32e..daac9010733d 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -17,7 +17,6 @@ variables: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - name: Codeql.Enabled value: true - - group: DotNet-DotNetCli-Storage - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true @@ -34,7 +33,6 @@ variables: - name: _InternalRuntimeDownloadArgs value: '' - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) @@ -364,6 +362,8 @@ stages: _TestArg: '' - template: /eng/common/templates/jobs/source-build.yml + parameters: + enableInternalSources: true - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 512605343b09..3775c4ec5840 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 2eab07c3d7b78219d10099b19fafeef2ecae1779 + 1844d819e6f33f1106083c5066ea01e0310eefa3 - + https://github.com/dotnet/arcade - 2eab07c3d7b78219d10099b19fafeef2ecae1779 + 1844d819e6f33f1106083c5066ea01e0310eefa3 - + https://github.com/dotnet/arcade - 2eab07c3d7b78219d10099b19fafeef2ecae1779 + 1844d819e6f33f1106083c5066ea01e0310eefa3 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 267e282eea50..d09290b7a0b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24266.4 + 6.0.0-beta.24326.2 diff --git a/eng/build-pr.yml b/eng/build-pr.yml index f05d66fa690d..653774872f18 100644 --- a/eng/build-pr.yml +++ b/eng/build-pr.yml @@ -66,6 +66,7 @@ phases: steps: - checkout: self clean: true + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - task: PowerShell@2 @@ -96,7 +97,6 @@ phases: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) - - ${{ if eq(parameters.agentOs, 'Linux') }}: - script: ./build.sh $(_TestArg) $(_PackArg) diff --git a/eng/build.yml b/eng/build.yml index 2ce873c3d4d8..84d86839b0b8 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -66,6 +66,7 @@ phases: steps: - checkout: self clean: true + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - task: PowerShell@2 diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index f5fa09f41511..a6f7efa77685 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -59,6 +65,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - template: /eng/common/templates-official/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index f04ad04c2b18..f6f0c15bfba4 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20240320.1 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -17,14 +18,14 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables pool: ${{ parameters.pool }} steps: @@ -40,8 +41,8 @@ jobs: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -53,7 +54,21 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" + + - script: | + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index b9a1f67b9a9a..9f60019cb01d 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates-official/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml index fae340f4d20d..5404cc7ecbef 100644 --- a/eng/common/templates-official/post-build/common-variables.yml +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -2,7 +2,6 @@ variables: - group: AzureDevOps-Artifact-Feeds-Pats - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - - group: DotNet-MSRC-Storage - group: Publish-Build-Assets # Whether the build is internal or not diff --git a/eng/common/templates-official/steps/enable-internal-runtimes.yml b/eng/common/templates-official/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000000..93a8394a666b --- /dev/null +++ b/eng/common/templates-official/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates-official/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml new file mode 100644 index 000000000000..c0e8f91317f0 --- /dev/null +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml new file mode 100644 index 000000000000..e3786cef6dfd --- /dev/null +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -0,0 +1,28 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index b6137f44ada1..8009ccb954ac 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -58,6 +64,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - template: /eng/common/templates/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b710698eb4d4..47f36e98bc16 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20240320.1 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -15,14 +16,14 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables pool: ${{ parameters.pool }} steps: @@ -38,8 +39,8 @@ jobs: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -51,7 +52,21 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" + + - script: | + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 7c240e654472..e3fbd9f38e10 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index fae340f4d20d..5404cc7ecbef 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -2,7 +2,6 @@ variables: - group: AzureDevOps-Artifact-Feeds-Pats - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - - group: DotNet-MSRC-Storage - group: Publish-Build-Assets # Whether the build is internal or not diff --git a/eng/common/templates/steps/enable-internal-runtimes.yml b/eng/common/templates/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000000..54dc9416c519 --- /dev/null +++ b/eng/common/templates/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml new file mode 100644 index 000000000000..c0e8f91317f0 --- /dev/null +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml new file mode 100644 index 000000000000..c8c49cc0e8f0 --- /dev/null +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -0,0 +1,28 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file diff --git a/global.json b/global.json index f624a99df800..750534f91754 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.24266.4", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24266.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24326.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24326.2" } } From 2148be2073f2ff0b8fd0cf6271a888e2b413d901 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 08:25:20 -0500 Subject: [PATCH 1211/1244] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19982) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5812b332c69a..99194a4de3ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -144,7 +144,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.131 + 6.0.132 From c7ab6625b3061d096285e095de7c17ec31562529 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 18:26:23 +0000 Subject: [PATCH 1212/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#19993) [release/6.0.4xx] Update dependencies from dotnet/arcade --- NuGet.config | 36 ++++++++++++++++++++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b1ee68f41a4..c4a66fb15bda 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,41 @@ + + + + + + + + + + + + + + + + + + + + @@ -43,15 +63,31 @@ + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9a35bd0173b..16cdfee24e81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 1844d819e6f33f1106083c5066ea01e0310eefa3 + fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 - + https://github.com/dotnet/arcade - 1844d819e6f33f1106083c5066ea01e0310eefa3 + fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 - + https://github.com/dotnet/arcade - 1844d819e6f33f1106083c5066ea01e0310eefa3 + fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 99194a4de3ba..cf3f9d329a46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24326.2 + 6.0.0-beta.24360.7 diff --git a/global.json b/global.json index 750534f91754..18b0acd2a4c5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.130", + "dotnet": "6.0.132", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24326.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24326.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24360.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24360.7" } } From e5fb1ef5fb15fcf86790e1cec4049ae262ab75b5 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Mon, 15 Jul 2024 14:39:34 -0700 Subject: [PATCH 1213/1244] Add support for targeting Windows version 26100 and update Windows SDK projection versions --- eng/ManualVersions.props | 13 +++++++------ src/redist/targets/GenerateBundledVersions.targets | 1 + test/EndToEnd/GivenWindowsApp.cs | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 57a4b6415199..8ea5be208a97 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,12 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.31 - 10.0.18362.31 - 10.0.19041.31 - 10.0.20348.31 - 10.0.22000.31 - 10.0.22621.31 + 10.0.17763.34 + 10.0.18362.34 + 10.0.19041.34 + 10.0.20348.34 + 10.0.22000.34 + 10.0.22621.34 + 10.0.26100.34 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index db2c5feb2848..6eb27f8740a5 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -674,6 +674,7 @@ Copyright (c) .NET Foundation. All rights reserved. /> + diff --git a/test/EndToEnd/GivenWindowsApp.cs b/test/EndToEnd/GivenWindowsApp.cs index 59f28eee89af..96595fe2704c 100644 --- a/test/EndToEnd/GivenWindowsApp.cs +++ b/test/EndToEnd/GivenWindowsApp.cs @@ -19,6 +19,7 @@ public class GivenWindowsApp : TestBase [InlineData("10.0.20348.0")] [InlineData("10.0.22000.0")] [InlineData("10.0.22621.0")] + [InlineData("10.0.26100.0")] public void ItCanBuildAndRun(string targetPlatformVersion) { var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt") From 815b6ea554d2256afef054970115fbd7e7dba2a6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Jul 2024 23:18:35 +0000 Subject: [PATCH 1214/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24315.2 -> To Version 6.0.425-servicing.24366.19 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.32 -> To Version 6.0.33 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 +++--------------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 3 files changed, 30 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index c4a66fb15bda..949dfdfb4a2f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,21 +14,13 @@ - - - - - + - - - - - + @@ -70,11 +62,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16cdfee24e81..20479ab2bed1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ef2ca68feb305bd9ebc3934b8488526caee3d118 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d1ba1897fb2799cf7a51bab3492c933a4fdad702 + 5d9665fb3c50eede6d337225cb863f5db7dc3a27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d1ba1897fb2799cf7a51bab3492c933a4fdad702 + 5d9665fb3c50eede6d337225cb863f5db7dc3a27 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 8601068126449af799f8e07ca358dbbd4b3fcab4 + 849e1a63a8319f9578b9e5f02da592d24d4aa2df https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index cf3f9d329a46..1103b2895445 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.424-servicing.24315.2 - 6.0.424-servicing.24315.2 + 6.0.425-servicing.24366.19 + 6.0.425-servicing.24366.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,12 +67,12 @@ - 6.0.32-servicing.24314.7 - 6.0.32-servicing.24314.7 - 6.0.32 - 6.0.32 - 6.0.32 - 6.0.32 + 6.0.33-servicing.24366.10 + 6.0.33-servicing.24366.10 + 6.0.33 + 6.0.33 + 6.0.33 + 6.0.33 2.1.0 @@ -155,7 +155,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.32 + 6.0.33 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 57cc5823b74c77ebe16adf6c4d828c9fec9ed79d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 06:46:05 +0000 Subject: [PATCH 1215/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.36 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.425-servicing.24366.19 -> To Version 6.0.425-servicing.24366.36 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.32 -> To Version 6.0.33 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++------------------ eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 3 files changed, 36 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 949dfdfb4a2f..4bdc6fc93ab1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,18 +23,10 @@ - - - - - + - - - - - + @@ -65,18 +57,10 @@ - - - - - + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20479ab2bed1..4ded52285b7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc + 8413a0dffce5dd2f6d53d6156e25f3bf649da60b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc + 8413a0dffce5dd2f6d53d6156e25f3bf649da60b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc + 8413a0dffce5dd2f6d53d6156e25f3bf649da60b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d9665fb3c50eede6d337225cb863f5db7dc3a27 + 3fa53f119ac9fca930e63f0979933210f1d22edd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d9665fb3c50eede6d337225cb863f5db7dc3a27 + 3fa53f119ac9fca930e63f0979933210f1d22edd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 670045968593e524941ef480423796ceb50c5e2f + 6a984c48f3489b60f25deb72ede6e5051bb130d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 798cc6d4922db482f84fb72a8244f0da898bc5d6 + b660c1e83039451abe9d9190a7aabe87c03fd7ae https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1103b2895445..336ee3cedadc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.32-servicing.24314.5 + 6.0.33-servicing.24366.4 - 6.0.32-servicing.24314.4 + 6.0.33-servicing.24366.5 - 6.0.424 + 6.0.425 @@ -55,8 +55,8 @@ - 6.0.425-servicing.24366.19 - 6.0.425-servicing.24366.19 + 6.0.425-servicing.24366.36 + 6.0.425-servicing.24366.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,10 +77,10 @@ - 6.0.32-servicing.24314.6 - 6.0.32-servicing.24314.6 - 6.0.32 - 6.0.32 + 6.0.33-servicing.24366.6 + 6.0.33-servicing.24366.6 + 6.0.33 + 6.0.33 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.424 + 6.0.425 $(MicrosoftAspNetCoreAppRuntimePackageVersion) From 6d549e883a023394876c9252edddca47b410b835 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:08:01 +0000 Subject: [PATCH 1216/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#20027) Co-authored-by: dotnet-maestro[bot] --- 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 16cdfee24e81..ddf7ced64f16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 + 3ea644036738781aff3b55f57a16bc99a6b82c4c - + https://github.com/dotnet/arcade - fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 + 3ea644036738781aff3b55f57a16bc99a6b82c4c - + https://github.com/dotnet/arcade - fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 + 3ea644036738781aff3b55f57a16bc99a6b82c4c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index cf3f9d329a46..7f4ce95b98f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24360.7 + 6.0.0-beta.24367.5 diff --git a/global.json b/global.json index 18b0acd2a4c5..49287840d85f 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.24360.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24360.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24367.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24367.5" } } From e6e362fc218ee64bed4c2e293af5ea929546d2d2 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 18 Jul 2024 19:46:30 +0000 Subject: [PATCH 1217/1244] Merged PR 41210: Enable internal runtimes when building tarball - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Enable internal runtimes when building tarball ---- #### AI description (iteration 1) #### PR Classification New feature to enable internal runtimes during the tarball creation process. #### PR Summary This pull request adds a step to enable internal runtimes when building the tarball. - `src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml`: Added a template step to enable internal runtimes. --- .../eng/common/templates/job/source-build-create-tarball.yml | 1 + 1 file changed, 1 insertion(+) 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 8b5b456b662c..2e4867a58551 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 @@ -42,6 +42,7 @@ jobs: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - script: | set -x df -h From f9cdab08cee5d0bb05041643048a135651ad57fd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jul 2024 19:50:31 +0000 Subject: [PATCH 1218/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240718.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.425-servicing.24366.36 -> To Version 6.0.425-servicing.24368.9 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.32 -> To Version 6.0.33 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4bdc6fc93ab1..87e4597f2fc4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,11 +7,7 @@ - - - - - + @@ -47,11 +43,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa1b93308b7e..0622de035711 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8413a0dffce5dd2f6d53d6156e25f3bf649da60b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fa53f119ac9fca930e63f0979933210f1d22edd + acb38060470b240e6d89c62e2d9a9635535fc76f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fa53f119ac9fca930e63f0979933210f1d22edd + acb38060470b240e6d89c62e2d9a9635535fc76f diff --git a/eng/Versions.props b/eng/Versions.props index 09677419dc52..7b01a810093b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,20 +43,20 @@ - 6.0.32 - 6.0.32 - 6.0.32-servicing.24314.5 - 6.0.32-servicing.24314.5 - 6.0.32-servicing.24314.5 - 6.0.32-servicing.24314.5 + 6.0.33 + 6.0.33 + 6.0.33-servicing.24368.7 + 6.0.33-servicing.24368.7 + 6.0.33-servicing.24368.7 + 6.0.33-servicing.24368.7 0.2.0 - 6.0.425-servicing.24366.36 - 6.0.425-servicing.24366.36 + 6.0.425-servicing.24368.9 + 6.0.425-servicing.24368.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fcce060d9fe00a232a3befd332464b0282484da1 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Mon, 29 Jul 2024 20:05:49 +0000 Subject: [PATCH 1219/1244] Merged PR 41388: [internal/release/6.0.4xx] 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.33 to 6.0.33 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.33 to 6.0.33 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240729.11 - **Date Produced**: July 29, 2024 7:35:20 PM UTC - **Commit**: 7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.425-servicing.24368.9 to 6.0.425-servicing.24379.11][1] - **Microsoft.NET.Sdk**: [from 6.0.425-servicing.24368.9 to 6.0.425-servicing.24379.11][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.33 to 6.0.33][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.33 to 6.0.33][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] - **dotnet-dev-certs**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] - **dotnet-user-secrets**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCacb38060470b240e6d89c62e2d9a9635535fc76f&targetVersion=GC7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCd917e14cc49f16d7190195501fd43fa4835d274f&targetVersion=GCf0f9de5692adf1c0576de062f93c6ab7b176433f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 19 +++++++++++++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 37 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 87e4597f2fc4..9d7ecd6e6201 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,13 @@ - + + + + @@ -20,9 +23,15 @@ + + + + + + @@ -43,15 +52,21 @@ - + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0622de035711..f3296ed9a4f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8413a0dffce5dd2f6d53d6156e25f3bf649da60b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - acb38060470b240e6d89c62e2d9a9635535fc76f + 7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - acb38060470b240e6d89c62e2d9a9635535fc76f + 7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad diff --git a/eng/Versions.props b/eng/Versions.props index 7b01a810093b..92057f28d395 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,18 +45,18 @@ 6.0.33 6.0.33 - 6.0.33-servicing.24368.7 - 6.0.33-servicing.24368.7 - 6.0.33-servicing.24368.7 - 6.0.33-servicing.24368.7 + 6.0.33-servicing.24379.5 + 6.0.33-servicing.24379.5 + 6.0.33-servicing.24379.5 + 6.0.33-servicing.24379.5 0.2.0 - 6.0.425-servicing.24368.9 - 6.0.425-servicing.24368.9 + 6.0.425-servicing.24379.11 + 6.0.425-servicing.24379.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ec33b3ccf268d4a8dea44d171d3e7094ce77019a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Aug 2024 11:23:32 -0700 Subject: [PATCH 1220/1244] Update branding to 6.0.426 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7f4ce95b98f2..4b3fa78e8952 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 25 + 26 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From d358f097e086edc87cc1fb2119886e2594ec08f0 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Fri, 9 Aug 2024 16:42:57 -0700 Subject: [PATCH 1221/1244] Update Windows SDK projection --- eng/ManualVersions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 8ea5be208a97..2a808a31ede1 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,12 +9,12 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.34 - 10.0.18362.34 - 10.0.19041.34 - 10.0.20348.34 - 10.0.22000.34 - 10.0.22621.34 - 10.0.26100.34 + 10.0.17763.38 + 10.0.18362.38 + 10.0.19041.38 + 10.0.20348.38 + 10.0.22000.38 + 10.0.22621.38 + 10.0.26100.38 From cd0d7b4ad47e5f848054c738b2d1f8a69796baa0 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Fri, 16 Aug 2024 17:06:57 +0000 Subject: [PATCH 1222/1244] Merged PR 41531: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240816.4 - **Date Produced**: August 16, 2024 4:11:44 PM UTC - **Commit**: 85d7e1ee6931838809c8c32856b69a131552793a - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.426-servicing.24415.29 to 6.0.426-servicing.24416.4][17] - **Microsoft.NET.Sdk**: [from 6.0.426-servicing.24415.29 to 6.0.426-servicing.24416.4][17] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][18] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][18] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][18] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][18] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.33-servicing.24366.4 to 6.0.34-servicing.24415.3][19] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][18] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.33-servicing.24366.5 to 6.0.34-servicing.24415.6][20] [17]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC691dfd4e7210727bb4c4385606495ec22d1ec727&targetVersion=GC85d7e1ee6931838809c8c32856b69a131552793a&_a=files [18]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC526b783fc75e702512a29ede591c4335dce62d6f&targetVersion=GC4e044058aadccd22bc0dc7ecb27ca7f5ab270584&_a=files [19]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC6a984c48f3489b60f25deb72ede6e5051bb130d4&targetVersion=GC43d5519b7b6f2093342515c04b054e88df71729e&_a=files [20]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb660c1e83039451abe9d9190a7aabe87c03fd7ae&targetVersion=GC5429ff1d84d93927157f54d620a0ad9ebf1f10b9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) [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.34 to 6.0.34 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7 (parent: Microsoft.NET.Sdk... --- NuGet.config | 33 ++++---------- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 42 +++++++++--------- 3 files changed, 78 insertions(+), 93 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d7ecd6e6201..ae2eee4205d3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,31 +7,22 @@ - + - - - - + - + - - - - + - - - - + @@ -52,22 +43,16 @@ - + - + - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3296ed9a4f9..35b4924f0fe2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8413a0dffce5dd2f6d53d6156e25f3bf649da60b + 8258476be31dcbbb6c69693eeafda17db361f28f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8413a0dffce5dd2f6d53d6156e25f3bf649da60b + 8258476be31dcbbb6c69693eeafda17db361f28f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8413a0dffce5dd2f6d53d6156e25f3bf649da60b + 8258476be31dcbbb6c69693eeafda17db361f28f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad + 85d7e1ee6931838809c8c32856b69a131552793a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad + 85d7e1ee6931838809c8c32856b69a131552793a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6a984c48f3489b60f25deb72ede6e5051bb130d4 + 43d5519b7b6f2093342515c04b054e88df71729e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b660c1e83039451abe9d9190a7aabe87c03fd7ae + 5429ff1d84d93927157f54d620a0ad9ebf1f10b9 https://github.com/dotnet/fsharp @@ -135,9 +135,9 @@ 6e76d580fcc69954441344175bd1b0ab2e432026 - + https://github.com/dotnet/linker - e66cbcaa36aa719936a46160198c9012c6e174e4 + 55d70c3aad879b95a3620d64c0a2c07e27afd80d linker @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 849e1a63a8319f9578b9e5f02da592d24d4aa2df + ec74ec8f24328a3e33feda7cc4d5064ef4565220 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index fc8859391888..23ab4ec656de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.33-servicing.24366.4 + 6.0.34-servicing.24415.3 - 6.0.33-servicing.24366.5 + 6.0.34-servicing.24415.6 @@ -43,20 +43,20 @@ - 6.0.33 - 6.0.33 - 6.0.33-servicing.24379.5 - 6.0.33-servicing.24379.5 - 6.0.33-servicing.24379.5 - 6.0.33-servicing.24379.5 + 6.0.34 + 6.0.34 + 6.0.34-servicing.24415.2 + 6.0.34-servicing.24415.2 + 6.0.34-servicing.24415.2 + 6.0.34-servicing.24415.2 0.2.0 - 6.0.425-servicing.24379.11 - 6.0.425-servicing.24379.11 + 6.0.426-servicing.24416.4 + 6.0.426-servicing.24416.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,20 +67,20 @@ - 6.0.33-servicing.24366.10 - 6.0.33-servicing.24366.10 - 6.0.33 - 6.0.33 - 6.0.33 - 6.0.33 + 6.0.34-servicing.24412.10 + 6.0.34-servicing.24412.10 + 6.0.34 + 6.0.34 + 6.0.34 + 6.0.34 2.1.0 - 6.0.33-servicing.24366.6 - 6.0.33-servicing.24366.6 - 6.0.33 - 6.0.33 + 6.0.34-servicing.24415.7 + 6.0.34-servicing.24415.7 + 6.0.34 + 6.0.34 @@ -155,7 +155,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.33 + 6.0.34 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From d4465ef2e845f5af8e8e5d6485e53a25fd0fe55d Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 20 Aug 2024 16:35:24 +0000 Subject: [PATCH 1223/1244] Merged PR 41823: [internal/release/6.0.4xx] 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.34 to 6.0.34 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.34-servicing.24415.3 to 6.0.34-servicing.24417.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240819.21 - **Date Produced**: August 19, 2024 6:47:13 PM UTC - **Commit**: b426ce913f1dadfb36ef0340fac54c062e773ab8 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.426-servicing.24417.8 to 6.0.426-servicing.24419.21][6] - **Microsoft.NET.Sdk**: [from 6.0.426-servicing.24417.8 to 6.0.426-servicing.24419.21][6] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][7] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][7] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][7] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][7] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.34-servicing.24415.3 to 6.0.34-servicing.24417.1][8] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][7] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2][9] [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC082c978531eff9587a55d1132f86e122f18a3415&targetVersion=GC... --- 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 ae2eee4205d3..33602d176896 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,13 +16,13 @@ - + - + - + @@ -43,16 +43,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35b4924f0fe2..a33131766464 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8258476be31dcbbb6c69693eeafda17db361f28f + 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8258476be31dcbbb6c69693eeafda17db361f28f + 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8258476be31dcbbb6c69693eeafda17db361f28f + 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 85d7e1ee6931838809c8c32856b69a131552793a + b426ce913f1dadfb36ef0340fac54c062e773ab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 85d7e1ee6931838809c8c32856b69a131552793a + b426ce913f1dadfb36ef0340fac54c062e773ab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 43d5519b7b6f2093342515c04b054e88df71729e + a625f79930686c2e7598d0cb0a6ba715ef176e4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5429ff1d84d93927157f54d620a0ad9ebf1f10b9 + 0716b4331761db24b6c5f2f52e8bcd32b6bd065b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 23ab4ec656de..d09d91045288 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.34-servicing.24415.3 + 6.0.34-servicing.24417.1 - 6.0.34-servicing.24415.6 + 6.0.34-servicing.24417.2 @@ -45,18 +45,18 @@ 6.0.34 6.0.34 - 6.0.34-servicing.24415.2 - 6.0.34-servicing.24415.2 - 6.0.34-servicing.24415.2 - 6.0.34-servicing.24415.2 + 6.0.34-servicing.24417.1 + 6.0.34-servicing.24417.1 + 6.0.34-servicing.24417.1 + 6.0.34-servicing.24417.1 0.2.0 - 6.0.426-servicing.24416.4 - 6.0.426-servicing.24416.4 + 6.0.426-servicing.24419.21 + 6.0.426-servicing.24419.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,8 +67,8 @@ - 6.0.34-servicing.24412.10 - 6.0.34-servicing.24412.10 + 6.0.34-servicing.24416.23 + 6.0.34-servicing.24416.23 6.0.34 6.0.34 6.0.34 @@ -77,8 +77,8 @@ - 6.0.34-servicing.24415.7 - 6.0.34-servicing.24415.7 + 6.0.34-servicing.24419.1 + 6.0.34-servicing.24419.1 6.0.34 6.0.34 From 6bcade91a73ddc70b9381951e8683bd4cd3691ed Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 29 Aug 2024 11:13:11 -0700 Subject: [PATCH 1224/1244] Update branding to 6.0.427 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index fc8859391888..2296a9b81dc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 26 + 27 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 8ee876699b9f1914d1468c4e5eef27f87bb2a957 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 3 Sep 2024 13:51:46 -0700 Subject: [PATCH 1225/1244] Update Dockerfile for new rhel image fixed to match https://github.com/dotnet/installer/pull/20094/files --- eng/docker/rhel/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile index c629cbf0ab66..202025488aa6 100644 --- a/eng/docker/rhel/Dockerfile +++ b/eng/docker/rhel/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359-2 # Setup User to match Host User, and give superuser permissions ARG USER_ID=0 From 3bd03a742d2ac867a8b03c7fed96135aa993d1fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Thu, 5 Sep 2024 17:16:53 +0200 Subject: [PATCH 1226/1244] Fix rewriting testhost.deps.json --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 412ca545cddd..a9c3f77fe884 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -496,7 +496,7 @@ - + Date: Mon, 9 Sep 2024 13:17:44 -0700 Subject: [PATCH 1227/1244] Update Windows SDK projection --- eng/ManualVersions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 2a808a31ede1..fcf7f359ca29 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,12 +9,12 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.38 - 10.0.18362.38 - 10.0.19041.38 - 10.0.20348.38 - 10.0.22000.38 - 10.0.22621.38 - 10.0.26100.38 + 10.0.17763.43 + 10.0.18362.43 + 10.0.19041.43 + 10.0.20348.43 + 10.0.22000.43 + 10.0.22621.43 + 10.0.26100.43 From 3cdeb446c4684e09cd3b83fa77d79da9c7b0c961 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Sep 2024 17:58:01 +0000 Subject: [PATCH 1228/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240910.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.426-servicing.24419.21 -> To Version 6.0.427-servicing.24460.7 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.24366.1 -> To Version 6.0.200-1.24429.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 29 +++++++++++++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 33602d176896..5dde9b6a0451 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,38 @@ + + + + + + + + + + + + + + + + + @@ -43,15 +60,27 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a33131766464..73eadebc53b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b426ce913f1dadfb36ef0340fac54c062e773ab8 + 21112780fde3871bb97039661760c8290473704c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b426ce913f1dadfb36ef0340fac54c062e773ab8 + 21112780fde3871bb97039661760c8290473704c @@ -135,9 +135,9 @@ 6e76d580fcc69954441344175bd1b0ab2e432026 - + https://github.com/dotnet/linker - 55d70c3aad879b95a3620d64c0a2c07e27afd80d + 0991fcde3933eecc12f53472a3347a94e2d1fdd5 linker diff --git a/eng/Versions.props b/eng/Versions.props index 52b02b7741d7..8a307c2bda31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.426-servicing.24419.21 - 6.0.426-servicing.24419.21 + 6.0.427-servicing.24460.7 + 6.0.427-servicing.24460.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1ff85d943009d7257cb009cb41651647ab55ce07 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Sep 2024 22:00:22 +0000 Subject: [PATCH 1229/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240911.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.427-servicing.24460.7 -> To Version 6.0.427-servicing.24461.12 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.34 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk --- NuGet.config | 19 ++++--------- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++++----------- 3 files changed, 50 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5dde9b6a0451..cca5ec03b9af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,16 @@ - - + - - - - - - + - - + @@ -60,12 +53,10 @@ - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73eadebc53b2..5a3cbe442553 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 4413239935644e4c528bd400fed7ae65a2667e4c https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 21112780fde3871bb97039661760c8290473704c + 0cdd72c79635078b4c89451ced59c95d71a365f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 21112780fde3871bb97039661760c8290473704c + 0cdd72c79635078b4c89451ced59c95d71a365f4 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - ec74ec8f24328a3e33feda7cc4d5064ef4565220 + c68eace1f3c11ab25cdf30a425ab3792773bb2cc https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 8a307c2bda31..00c437791ebd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,20 +43,20 @@ - 6.0.34 - 6.0.34 - 6.0.34-servicing.24417.1 - 6.0.34-servicing.24417.1 - 6.0.34-servicing.24417.1 - 6.0.34-servicing.24417.1 + 6.0.35 + 6.0.35 + 6.0.35-servicing.24454.6 + 6.0.35-servicing.24454.6 + 6.0.35-servicing.24454.6 + 6.0.35-servicing.24454.6 0.2.0 - 6.0.427-servicing.24460.7 - 6.0.427-servicing.24460.7 + 6.0.427-servicing.24461.12 + 6.0.427-servicing.24461.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,12 +67,12 @@ - 6.0.34-servicing.24416.23 - 6.0.34-servicing.24416.23 - 6.0.34 - 6.0.34 - 6.0.34 - 6.0.34 + 6.0.35-servicing.24459.18 + 6.0.35-servicing.24459.18 + 6.0.35 + 6.0.35 + 6.0.35 + 6.0.35 2.1.0 @@ -155,7 +155,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.34 + 6.0.35 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From b9ce6833108546cf63fdb72e505aa0b46ee1d9c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Sep 2024 19:16:23 +0000 Subject: [PATCH 1230/1244] Update dependencies from https://github.com/dotnet/arcade build 20240909.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24367.5 -> To Version 6.0.0-beta.24459.5 --- NuGet.config | 32 +++++ eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- .../post-build/add-build-to-channel.ps1 | 48 ------- .../post-build/check-channel-consistency.ps1 | 10 +- eng/common/post-build/nuget-validation.ps1 | 13 +- eng/common/post-build/nuget-verification.ps1 | 121 ++++++++++++++++++ eng/common/post-build/post-build-utils.ps1 | 91 ------------- eng/common/post-build/publish-using-darc.ps1 | 22 ++-- .../post-build/sourcelink-validation.ps1 | 10 +- eng/common/post-build/symbols-validation.ps1 | 2 - .../post-build/trigger-subscriptions.ps1 | 64 --------- .../job/publish-build-assets.yml | 17 ++- .../post-build/common-variables.yml | 2 - .../post-build/post-build.yml | 11 +- .../post-build/setup-maestro-vars.yml | 30 ++--- .../post-build/trigger-subscription.yml | 13 -- .../steps/add-build-to-channel.yml | 13 -- .../templates/job/publish-build-assets.yml | 17 ++- .../templates/post-build/common-variables.yml | 2 - .../templates/post-build/post-build.yml | 14 +- .../post-build/setup-maestro-vars.yml | 30 ++--- .../post-build/trigger-subscription.yml | 13 -- .../templates/steps/add-build-to-channel.yml | 13 -- global.json | 6 +- 25 files changed, 262 insertions(+), 346 deletions(-) delete mode 100644 eng/common/post-build/add-build-to-channel.ps1 create mode 100644 eng/common/post-build/nuget-verification.ps1 delete mode 100644 eng/common/post-build/post-build-utils.ps1 delete mode 100644 eng/common/post-build/trigger-subscriptions.ps1 delete mode 100644 eng/common/templates-official/post-build/trigger-subscription.yml delete mode 100644 eng/common/templates-official/steps/add-build-to-channel.yml delete mode 100644 eng/common/templates/post-build/trigger-subscription.yml delete mode 100644 eng/common/templates/steps/add-build-to-channel.yml diff --git a/NuGet.config b/NuGet.config index 9d7ecd6e6201..e976f75dd1a9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,16 @@ + + + + + + + @@ -23,12 +30,24 @@ + + + + + + + + + + + + @@ -52,6 +71,7 @@ + @@ -61,12 +81,24 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3296ed9a4f9..a3f2882e14c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 3ea644036738781aff3b55f57a16bc99a6b82c4c + 685008547318b269dbbb82cfc9ca968126301bbe - + https://github.com/dotnet/arcade - 3ea644036738781aff3b55f57a16bc99a6b82c4c + 685008547318b269dbbb82cfc9ca968126301bbe - + https://github.com/dotnet/arcade - 3ea644036738781aff3b55f57a16bc99a6b82c4c + 685008547318b269dbbb82cfc9ca968126301bbe https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2296a9b81dc3..e21270bac706 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24367.5 + 6.0.0-beta.24459.5 diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 deleted file mode 100644 index 49938f0c89f7..000000000000 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ /dev/null @@ -1,48 +0,0 @@ -param( - [Parameter(Mandatory=$true)][int] $BuildId, - [Parameter(Mandatory=$true)][int] $ChannelId, - [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', - [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' -) - -try { - . $PSScriptRoot\post-build-utils.ps1 - - # Check that the channel we are going to promote the build to exist - $channelInfo = Get-MaestroChannel -ChannelId $ChannelId - - if (!$channelInfo) { - Write-PipelineTelemetryCategory -Category 'PromoteBuild' -Message "Channel with BAR ID $ChannelId was not found in BAR!" - ExitWithExitCode 1 - } - - # Get info about which channel(s) the build has already been promoted to - $buildInfo = Get-MaestroBuild -BuildId $BuildId - - if (!$buildInfo) { - Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "Build with BAR ID $BuildId was not found in BAR!" - ExitWithExitCode 1 - } - - # Find whether the build is already assigned to the channel or not - if ($buildInfo.channels) { - foreach ($channel in $buildInfo.channels) { - if ($channel.Id -eq $ChannelId) { - Write-Host "The build with BAR ID $BuildId is already on channel $ChannelId!" - ExitWithExitCode 0 - } - } - } - - Write-Host "Promoting build '$BuildId' to channel '$ChannelId'." - - Assign-BuildToChannel -BuildId $BuildId -ChannelId $ChannelId - - Write-Host 'done.' -} -catch { - Write-Host $_ - Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to promote build '$BuildId' to channel '$ChannelId'" - ExitWithExitCode 1 -} diff --git a/eng/common/post-build/check-channel-consistency.ps1 b/eng/common/post-build/check-channel-consistency.ps1 index 63f3464c986a..470d48455ba6 100644 --- a/eng/common/post-build/check-channel-consistency.ps1 +++ b/eng/common/post-build/check-channel-consistency.ps1 @@ -4,7 +4,15 @@ param( ) try { - . $PSScriptRoot\post-build-utils.ps1 + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + + # `tools.ps1` checks $ci to perform some actions. Since the post-build + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + $disableConfigureToolsetImport = $true + . $PSScriptRoot\..\tools.ps1 if ($PromoteToChannels -eq "") { Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1 index dab3534ab538..9c81aa43917f 100644 --- a/eng/common/post-build/nuget-validation.ps1 +++ b/eng/common/post-build/nuget-validation.ps1 @@ -2,20 +2,11 @@ # tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage param( - [Parameter(Mandatory=$true)][string] $PackagesPath, # Path to where the packages to be validated are - [Parameter(Mandatory=$true)][string] $ToolDestinationPath # Where the validation tool should be downloaded to + [Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are ) try { - . $PSScriptRoot\post-build-utils.ps1 - - $url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1' - - New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force - - Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1 - - & ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg + & $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg } catch { Write-Host $_.ScriptStackTrace diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 new file mode 100644 index 000000000000..a365194a9389 --- /dev/null +++ b/eng/common/post-build/nuget-verification.ps1 @@ -0,0 +1,121 @@ +<# +.SYNOPSIS + Verifies that Microsoft NuGet packages have proper metadata. +.DESCRIPTION + Downloads a verification tool and runs metadata validation on the provided NuGet packages. This script writes an + error if any of the provided packages fail validation. All arguments provided to this PowerShell script that do not + match PowerShell parameters are passed on to the verification tool downloaded during the execution of this script. +.PARAMETER NuGetExePath + The path to the nuget.exe binary to use. If not provided, nuget.exe will be downloaded into the -DownloadPath + directory. +.PARAMETER PackageSource + The package source to use to download the verification tool. If not provided, nuget.org will be used. +.PARAMETER DownloadPath + The directory path to download the verification tool and nuget.exe to. If not provided, + %TEMP%\NuGet.VerifyNuGetPackage will be used. +.PARAMETER args + Arguments that will be passed to the verification tool. +.EXAMPLE + PS> .\verify.ps1 *.nupkg + Verifies the metadata of all .nupkg files in the currect working directory. +.EXAMPLE + PS> .\verify.ps1 --help + Displays the help text of the downloaded verifiction tool. +.LINK + https://github.com/NuGet/NuGetGallery/blob/master/src/VerifyMicrosoftPackage/README.md +#> + +# This script was copied from https://github.com/NuGet/NuGetGallery/blob/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1 + +[CmdletBinding(PositionalBinding = $false)] +param( + [string]$NuGetExePath, + [string]$PackageSource = "https://api.nuget.org/v3/index.json", + [string]$DownloadPath, + [Parameter(ValueFromRemainingArguments = $true)] + [string[]]$args +) + +# The URL to download nuget.exe. +$nugetExeUrl = "https://dist.nuget.org/win-x86-commandline/v4.9.4/nuget.exe" + +# The package ID of the verification tool. +$packageId = "NuGet.VerifyMicrosoftPackage" + +# The location that nuget.exe and the verification tool will be downloaded to. +if (!$DownloadPath) { + $DownloadPath = (Join-Path $env:TEMP "NuGet.VerifyMicrosoftPackage") +} + +$fence = New-Object -TypeName string -ArgumentList '=', 80 + +# Create the download directory, if it doesn't already exist. +if (!(Test-Path $DownloadPath)) { + New-Item -ItemType Directory $DownloadPath | Out-Null +} +Write-Host "Using download path: $DownloadPath" + +if ($NuGetExePath) { + $nuget = $NuGetExePath +} else { + $downloadedNuGetExe = Join-Path $DownloadPath "nuget.exe" + + # Download nuget.exe, if it doesn't already exist. + if (!(Test-Path $downloadedNuGetExe)) { + Write-Host "Downloading nuget.exe from $nugetExeUrl..." + $ProgressPreference = 'SilentlyContinue' + try { + Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + $ProgressPreference = 'Continue' + } catch { + $ProgressPreference = 'Continue' + Write-Error $_ + Write-Error "nuget.exe failed to download." + exit + } + } + + $nuget = $downloadedNuGetExe +} + +Write-Host "Using nuget.exe path: $nuget" +Write-Host " " + +# Download the latest version of the verification tool. +Write-Host "Downloading the latest version of $packageId from $packageSource..." +Write-Host $fence +& $nuget install $packageId ` + -Prerelease ` + -OutputDirectory $DownloadPath ` + -Source $PackageSource +Write-Host $fence +Write-Host " " + +if ($LASTEXITCODE -ne 0) { + Write-Error "nuget.exe failed to fetch the verify tool." + exit +} + +# Find the most recently downloaded tool +Write-Host "Finding the most recently downloaded verification tool." +$verifyProbePath = Join-Path $DownloadPath "$packageId.*" +$verifyPath = Get-ChildItem -Path $verifyProbePath -Directory ` + | Sort-Object -Property LastWriteTime -Descending ` + | Select-Object -First 1 +$verify = Join-Path $verifyPath "tools\NuGet.VerifyMicrosoftPackage.exe" +Write-Host "Using verification tool: $verify" +Write-Host " " + +# Execute the verification tool. +Write-Host "Executing the verify tool..." +Write-Host $fence +& $verify $args +Write-Host $fence +Write-Host " " + +# Respond to the exit code. +if ($LASTEXITCODE -ne 0) { + Write-Error "The verify tool found some problems." +} else { + Write-Output "The verify tool succeeded." +} diff --git a/eng/common/post-build/post-build-utils.ps1 b/eng/common/post-build/post-build-utils.ps1 deleted file mode 100644 index 534f6988d5b7..000000000000 --- a/eng/common/post-build/post-build-utils.ps1 +++ /dev/null @@ -1,91 +0,0 @@ -# Most of the functions in this file require the variables `MaestroApiEndPoint`, -# `MaestroApiVersion` and `MaestroApiAccessToken` to be globally available. - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -# `tools.ps1` checks $ci to perform some actions. Since the post-build -# scripts don't necessarily execute in the same agent that run the -# build.ps1/sh script this variable isn't automatically set. -$ci = $true -$disableConfigureToolsetImport = $true -. $PSScriptRoot\..\tools.ps1 - -function Create-MaestroApiRequestHeaders([string]$ContentType = 'application/json') { - Validate-MaestroVars - - $headers = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $headers.Add('Accept', $ContentType) - $headers.Add('Authorization',"Bearer $MaestroApiAccessToken") - return $headers -} - -function Get-MaestroChannel([int]$ChannelId) { - Validate-MaestroVars - - $apiHeaders = Create-MaestroApiRequestHeaders - $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}?api-version=$MaestroApiVersion" - - $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - return $result -} - -function Get-MaestroBuild([int]$BuildId) { - Validate-MaestroVars - - $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken - $apiEndpoint = "$MaestroApiEndPoint/api/builds/${BuildId}?api-version=$MaestroApiVersion" - - $result = try { return Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - return $result -} - -function Get-MaestroSubscriptions([string]$SourceRepository, [int]$ChannelId) { - Validate-MaestroVars - - $SourceRepository = [System.Web.HttpUtility]::UrlEncode($SourceRepository) - $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken - $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions?sourceRepository=$SourceRepository&channelId=$ChannelId&api-version=$MaestroApiVersion" - - $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - return $result -} - -function Assign-BuildToChannel([int]$BuildId, [int]$ChannelId) { - Validate-MaestroVars - - $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken - $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$MaestroApiVersion" - Invoke-WebRequest -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null -} - -function Trigger-Subscription([string]$SubscriptionId) { - Validate-MaestroVars - - $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken - $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions/$SubscriptionId/trigger?api-version=$MaestroApiVersion" - Invoke-WebRequest -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null -} - -function Validate-MaestroVars { - try { - Get-Variable MaestroApiEndPoint | Out-Null - Get-Variable MaestroApiVersion | Out-Null - Get-Variable MaestroApiAccessToken | Out-Null - - if (!($MaestroApiEndPoint -Match '^http[s]?://maestro-(int|prod).westus2.cloudapp.azure.com$')) { - Write-PipelineTelemetryError -Category 'MaestroVars' -Message "MaestroApiEndPoint is not a valid Maestro URL. '$MaestroApiEndPoint'" - ExitWithExitCode 1 - } - - if (!($MaestroApiVersion -Match '^[0-9]{4}-[0-9]{2}-[0-9]{2}$')) { - Write-PipelineTelemetryError -Category 'MaestroVars' -Message "MaestroApiVersion does not match a version string in the format yyyy-MM-DD. '$MaestroApiVersion'" - ExitWithExitCode 1 - } - } - catch { - Write-PipelineTelemetryError -Category 'MaestroVars' -Message 'Error: Variables `MaestroApiEndPoint`, `MaestroApiVersion` and `MaestroApiAccessToken` are required while using this script.' - Write-Host $_ - ExitWithExitCode 1 - } -} diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8d75..4ff587ca46a9 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -2,7 +2,6 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, - [Parameter(Mandatory=$true)][string] $MaestroToken, [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, @@ -10,7 +9,12 @@ param( ) try { - . $PSScriptRoot\post-build-utils.ps1 + # `tools.ps1` checks $ci to perform some actions. Since the post-build + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + $disableConfigureToolsetImport = $true + . $PSScriptRoot\..\tools.ps1 $darc = Get-Darc @@ -31,13 +35,13 @@ try { } & $darc add-build-to-channel ` - --id $buildId ` - --publishing-infra-version $PublishingInfraVersion ` - --default-channels ` - --source-branch main ` - --azdev-pat $AzdoToken ` - --bar-uri $MaestroApiEndPoint ` - --password $MaestroToken ` + --id $buildId ` + --publishing-infra-version $PublishingInfraVersion ` + --default-channels ` + --source-branch main ` + --azdev-pat "$AzdoToken" ` + --bar-uri "$MaestroApiEndPoint" ` + --ci ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index e8ab29afeb33..5c4dd17dc3a4 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -6,7 +6,15 @@ param( [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion # Version of SourceLink CLI to use ) -. $PSScriptRoot\post-build-utils.ps1 +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +# `tools.ps1` checks $ci to perform some actions. Since the post-build +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +$disableConfigureToolsetImport = $true +. $PSScriptRoot\..\tools.ps1 # Cache/HashMap (File -> Exist flag) used to consult whether a file exist # in the repository at a specific commit point. This is populated by inserting diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index a5af041ba775..8857e3b84034 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -299,8 +299,6 @@ function InstallDotnetSymbol { } try { - . $PSScriptRoot\post-build-utils.ps1 - InstallDotnetSymbol foreach ($Job in @(Get-Job)) { diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 deleted file mode 100644 index ac9a95778fcd..000000000000 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ /dev/null @@ -1,64 +0,0 @@ -param( - [Parameter(Mandatory=$true)][string] $SourceRepo, - [Parameter(Mandatory=$true)][int] $ChannelId, - [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', - [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' -) - -try { - . $PSScriptRoot\post-build-utils.ps1 - - # Get all the $SourceRepo subscriptions - $normalizedSourceRepo = $SourceRepo.Replace('dnceng@', '') - $subscriptions = Get-MaestroSubscriptions -SourceRepository $normalizedSourceRepo -ChannelId $ChannelId - - if (!$subscriptions) { - Write-PipelineTelemetryError -Category 'TriggerSubscriptions' -Message "No subscriptions found for source repo '$normalizedSourceRepo' in channel '$ChannelId'" - ExitWithExitCode 0 - } - - $subscriptionsToTrigger = New-Object System.Collections.Generic.List[string] - $failedTriggeredSubscription = $false - - # Get all enabled subscriptions that need dependency flow on 'everyBuild' - foreach ($subscription in $subscriptions) { - if ($subscription.enabled -and $subscription.policy.updateFrequency -like 'everyBuild' -and $subscription.channel.id -eq $ChannelId) { - Write-Host "Should trigger this subscription: ${$subscription.id}" - [void]$subscriptionsToTrigger.Add($subscription.id) - } - } - - foreach ($subscriptionToTrigger in $subscriptionsToTrigger) { - try { - Write-Host "Triggering subscription '$subscriptionToTrigger'." - - Trigger-Subscription -SubscriptionId $subscriptionToTrigger - - Write-Host 'done.' - } - catch - { - Write-Host "There was an error while triggering subscription '$subscriptionToTrigger'" - Write-Host $_ - Write-Host $_.ScriptStackTrace - $failedTriggeredSubscription = $true - } - } - - if ($subscriptionsToTrigger.Count -eq 0) { - Write-Host "No subscription matched source repo '$normalizedSourceRepo' and channel ID '$ChannelId'." - } - elseif ($failedTriggeredSubscription) { - Write-PipelineTelemetryError -Category 'TriggerSubscriptions' -Message 'At least one subscription failed to be triggered...' - ExitWithExitCode 1 - } - else { - Write-Host 'All subscriptions were triggered successfully!' - } -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'TriggerSubscriptions' -Message $_ - ExitWithExitCode 1 -} diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 1d84eb301c46..e035ef719bff 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -61,19 +61,24 @@ jobs: filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: eng\common\sdk-task.ps1 + arguments: > + -task PublishBuildAssets + -restore + -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - task: powershell@2 displayName: Create ReleaseConfigs Artifact diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml index 5404cc7ecbef..7e1af5af506c 100644 --- a/eng/common/templates-official/post-build/common-variables.yml +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -11,8 +11,6 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint value: "https://maestro.dot.net" - - name: MaestroApiAccessToken - value: $(MaestroAccessToken) - name: MaestroApiVersion value: "2020-02-20" diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index fce0d0bf5cef..7a83f6c4e302 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -128,7 +128,6 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -266,14 +265,16 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(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)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml index 0c87f149a4ad..af3a6eb12f12 100644 --- a/eng/common/templates-official/post-build/setup-maestro-vars.yml +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -11,19 +11,20 @@ steps: artifactName: ReleaseConfigs checkDownloadedFiles: true - - task: PowerShell@2 + - task: AzureCLI@2 name: setReleaseVars displayName: Set Release Configs Vars inputs: - targetType: inline - pwsh: true - script: | + azureSubscription: "Darc: Maestro Production" + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | try { if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt $BarId = $Content | Select -Index 0 - $Channels = $Content | Select -Index 1 + $Channels = $Content | Select -Index 1 $IsStableBuild = $Content | Select -Index 2 $AzureDevOpsProject = $Env:System_TeamProject @@ -31,15 +32,16 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + . $(Build.SourcesDirectory)\eng\common\tools.ps1 + $darc = Get-Darc + $buildInfo = & $darc get-build ` + --id ${{ parameters.BARBuildId }} ` + --extended ` + --output-format json ` + --ci ` + | convertFrom-Json - $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 + $BarId = ${{ parameters.BARBuildId }} $Channels = $Env:PromoteToMaestroChannels -split "," $Channels = $Channels -join "][" $Channels = "[$Channels]" @@ -65,6 +67,4 @@ steps: exit 1 } env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates-official/post-build/trigger-subscription.yml b/eng/common/templates-official/post-build/trigger-subscription.yml deleted file mode 100644 index da669030daf6..000000000000 --- a/eng/common/templates-official/post-build/trigger-subscription.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - ChannelId: 0 - -steps: -- task: PowerShell@2 - displayName: Triggering subscriptions - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 - arguments: -SourceRepo $(Build.Repository.Uri) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/add-build-to-channel.yml b/eng/common/templates-official/steps/add-build-to-channel.yml deleted file mode 100644 index f67a210d62f3..000000000000 --- a/eng/common/templates-official/steps/add-build-to-channel.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - ChannelId: 0 - -steps: -- task: PowerShell@2 - displayName: Add Build to Channel - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 - arguments: -BuildId $(BARBuildId) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroApiAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index bd3d54b760c2..cab9056d1e5e 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -61,19 +61,24 @@ jobs: filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: eng\common\sdk-task.ps1 + arguments: > + -task PublishBuildAssets + -restore + -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - task: powershell@2 displayName: Create ReleaseConfigs Artifact diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 5404cc7ecbef..7e1af5af506c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -11,8 +11,6 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint value: "https://maestro.dot.net" - - name: MaestroApiAccessToken - value: $(MaestroAccessToken) - name: MaestroApiVersion value: "2020-02-20" diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 5a0bb8d96d20..c6c2da3de6ee 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -125,7 +125,6 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -262,14 +261,17 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(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)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 0c87f149a4ad..af3a6eb12f12 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -11,19 +11,20 @@ steps: artifactName: ReleaseConfigs checkDownloadedFiles: true - - task: PowerShell@2 + - task: AzureCLI@2 name: setReleaseVars displayName: Set Release Configs Vars inputs: - targetType: inline - pwsh: true - script: | + azureSubscription: "Darc: Maestro Production" + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | try { if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt $BarId = $Content | Select -Index 0 - $Channels = $Content | Select -Index 1 + $Channels = $Content | Select -Index 1 $IsStableBuild = $Content | Select -Index 2 $AzureDevOpsProject = $Env:System_TeamProject @@ -31,15 +32,16 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + . $(Build.SourcesDirectory)\eng\common\tools.ps1 + $darc = Get-Darc + $buildInfo = & $darc get-build ` + --id ${{ parameters.BARBuildId }} ` + --extended ` + --output-format json ` + --ci ` + | convertFrom-Json - $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 + $BarId = ${{ parameters.BARBuildId }} $Channels = $Env:PromoteToMaestroChannels -split "," $Channels = $Channels -join "][" $Channels = "[$Channels]" @@ -65,6 +67,4 @@ steps: exit 1 } env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates/post-build/trigger-subscription.yml b/eng/common/templates/post-build/trigger-subscription.yml deleted file mode 100644 index da669030daf6..000000000000 --- a/eng/common/templates/post-build/trigger-subscription.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - ChannelId: 0 - -steps: -- task: PowerShell@2 - displayName: Triggering subscriptions - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 - arguments: -SourceRepo $(Build.Repository.Uri) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates/steps/add-build-to-channel.yml b/eng/common/templates/steps/add-build-to-channel.yml deleted file mode 100644 index f67a210d62f3..000000000000 --- a/eng/common/templates/steps/add-build-to-channel.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - ChannelId: 0 - -steps: -- task: PowerShell@2 - displayName: Add Build to Channel - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 - arguments: -BuildId $(BARBuildId) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroApiAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) diff --git a/global.json b/global.json index 49287840d85f..4a13cd368bea 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.132", + "dotnet": "6.0.133", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24367.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24367.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24459.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24459.5" } } From 892ed04039983ef4c4250cdde10d44d6e0bd8165 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Sep 2024 19:40:49 +0000 Subject: [PATCH 1231/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240912.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.427-servicing.24461.12 -> To Version 6.0.427-servicing.24462.20 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.35 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk --- 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 cca5ec03b9af..8f0e27311c16 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -53,7 +53,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a3cbe442553..ce7e444edfec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 1ad4097713d52a22315021099f2a185ae68abbe1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 1ad4097713d52a22315021099f2a185ae68abbe1 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0cdd72c79635078b4c89451ced59c95d71a365f4 + 853c4ee667f78b855aaf1ae621fc4980e327a49f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0cdd72c79635078b4c89451ced59c95d71a365f4 + 853c4ee667f78b855aaf1ae621fc4980e327a49f diff --git a/eng/Versions.props b/eng/Versions.props index 00c437791ebd..84857a44f610 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,18 +45,18 @@ 6.0.35 6.0.35 - 6.0.35-servicing.24454.6 - 6.0.35-servicing.24454.6 - 6.0.35-servicing.24454.6 - 6.0.35-servicing.24454.6 + 6.0.35-servicing.24462.3 + 6.0.35-servicing.24462.3 + 6.0.35-servicing.24462.3 + 6.0.35-servicing.24462.3 0.2.0 - 6.0.427-servicing.24461.12 - 6.0.427-servicing.24461.12 + 6.0.427-servicing.24462.20 + 6.0.427-servicing.24462.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 20eb419ec5d2a564f498581d1cd74b3c7794ec94 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Sep 2024 22:20:26 +0000 Subject: [PATCH 1232/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240912.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.427-servicing.24462.20 -> To Version 6.0.427-servicing.24462.29 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.34 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++------------ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8f0e27311c16..b4ed24fd02ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,12 +27,7 @@ - - - - - - + @@ -67,12 +62,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce7e444edfec..aea95c3eb630 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7132545b5ef9cfe30512311811ee420b1f208971 + 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7132545b5ef9cfe30512311811ee420b1f208971 + 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7132545b5ef9cfe30512311811ee420b1f208971 + 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7132545b5ef9cfe30512311811ee420b1f208971 + 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 853c4ee667f78b855aaf1ae621fc4980e327a49f + 29da8759f075a17329e174c53e59e85180928aa9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 853c4ee667f78b855aaf1ae621fc4980e327a49f + 29da8759f075a17329e174c53e59e85180928aa9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a625f79930686c2e7598d0cb0a6ba715ef176e4e + 1e8489e39e0709c40aa5540825b5e9e2c1c5a23b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0716b4331761db24b6c5f2f52e8bcd32b6bd065b + 869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 84857a44f610..e8658e33c094 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.34-servicing.24417.1 + 6.0.35-servicing.24461.4 - 6.0.34-servicing.24417.2 + 6.0.35-servicing.24462.2 @@ -55,8 +55,8 @@ - 6.0.427-servicing.24462.20 - 6.0.427-servicing.24462.20 + 6.0.427-servicing.24462.29 + 6.0.427-servicing.24462.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,10 +77,10 @@ - 6.0.34-servicing.24419.1 - 6.0.34-servicing.24419.1 - 6.0.34 - 6.0.34 + 6.0.35-servicing.24462.8 + 6.0.35-servicing.24462.8 + 6.0.35 + 6.0.35 From e9225b048a935a3eeb0bcc5dd97528e93cebc902 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Sep 2024 19:47:19 +0000 Subject: [PATCH 1233/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240913.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.427-servicing.24462.29 -> To Version 6.0.427-servicing.24463.13 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.35 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk --- 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 b4ed24fd02ef..fbd09b9bde74 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aea95c3eb630..4d93b9a2fcc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29da8759f075a17329e174c53e59e85180928aa9 + c3caa83afc23db553d477d695fb257e0f97ff857 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29da8759f075a17329e174c53e59e85180928aa9 + c3caa83afc23db553d477d695fb257e0f97ff857 diff --git a/eng/Versions.props b/eng/Versions.props index e8658e33c094..444fe7c70ecc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,18 +45,18 @@ 6.0.35 6.0.35 - 6.0.35-servicing.24462.3 - 6.0.35-servicing.24462.3 - 6.0.35-servicing.24462.3 - 6.0.35-servicing.24462.3 + 6.0.35-servicing.24462.14 + 6.0.35-servicing.24462.14 + 6.0.35-servicing.24462.14 + 6.0.35-servicing.24462.14 0.2.0 - 6.0.427-servicing.24462.29 - 6.0.427-servicing.24462.29 + 6.0.427-servicing.24463.13 + 6.0.427-servicing.24463.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6e5402277759a1aca8f081c1f218cd927f4bb906 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 14 Sep 2024 00:21:13 +0000 Subject: [PATCH 1234/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240913.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.427-servicing.24463.13 -> To Version 6.0.427-servicing.24463.31 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.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.35 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk --- 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 fbd09b9bde74..c93c9eb7ebee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d93b9a2fcc5..54a3c91b7ce4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 + fc5b097885ceb7463eb7163477356a39a359846f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 + fc5b097885ceb7463eb7163477356a39a359846f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 + fc5b097885ceb7463eb7163477356a39a359846f https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 + fc5b097885ceb7463eb7163477356a39a359846f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c3caa83afc23db553d477d695fb257e0f97ff857 + 9e198e0619cedfde17a7e493e4d1f8a9d089269d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c3caa83afc23db553d477d695fb257e0f97ff857 + 9e198e0619cedfde17a7e493e4d1f8a9d089269d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1e8489e39e0709c40aa5540825b5e9e2c1c5a23b + 9b5f402943986a66dfca2b6f4312cfca19d75c17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe + c9e44425226553e639116ff82698cfd2808f7769 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 444fe7c70ecc..ee64ca2a8a30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.35-servicing.24461.4 + 6.0.35-servicing.24462.9 - 6.0.35-servicing.24462.2 + 6.0.35-servicing.24462.14 @@ -55,8 +55,8 @@ - 6.0.427-servicing.24463.13 - 6.0.427-servicing.24463.13 + 6.0.427-servicing.24463.31 + 6.0.427-servicing.24463.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,8 +77,8 @@ - 6.0.35-servicing.24462.8 - 6.0.35-servicing.24462.8 + 6.0.35-servicing.24463.5 + 6.0.35-servicing.24463.5 6.0.35 6.0.35 From 7d7baad284ae696a0219d8378cea94e286369ed3 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 16 Sep 2024 14:20:54 -0700 Subject: [PATCH 1235/1244] Backport one specific package upgrade that was missed --- eng/Versions.props | 1 + src/core-sdk-tasks/core-sdk-tasks.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index e21270bac706..6a4cc864f56a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,6 +74,7 @@ 6.0.33 6.0.33 2.1.0 + 6.0.1 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5fc33672afb5..12e2266cc477 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -17,6 +17,7 @@ + From a8f27c87cafca4f33c1fb66f3fc88e5748e5df47 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Sep 2024 23:08:56 +0000 Subject: [PATCH 1236/1244] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240916.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.427-servicing.24463.31 -> To Version 6.0.427-servicing.24466.22 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.425 -> To Version 6.0.427 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++------------ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index c93c9eb7ebee..2dc7a26febb8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,12 +19,7 @@ - - - - - - + @@ -54,12 +49,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cafb1334d80..effcb7359e8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 + 7de8a2867cf734967eef78d8e82902f3e84650b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 + 7de8a2867cf734967eef78d8e82902f3e84650b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 + 7de8a2867cf734967eef78d8e82902f3e84650b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9e198e0619cedfde17a7e493e4d1f8a9d089269d + 0f7bfed6fab981db8d6b859311a1a98e2b5cd684 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9e198e0619cedfde17a7e493e4d1f8a9d089269d + 0f7bfed6fab981db8d6b859311a1a98e2b5cd684 diff --git a/eng/Versions.props b/eng/Versions.props index 0f2d5f0e28ad..ea32b04dbad1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.425 + 6.0.427 @@ -55,8 +55,8 @@ - 6.0.427-servicing.24463.31 - 6.0.427-servicing.24463.31 + 6.0.427-servicing.24466.22 + 6.0.427-servicing.24466.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.425 + 6.0.427 $(MicrosoftAspNetCoreAppRuntimePackageVersion) From 6d9dfff6bd69964d88617655640d506f783a4f4e Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 17 Sep 2024 22:56:34 +0000 Subject: [PATCH 1237/1244] Merged PR 42943: [internal/release/6.0.4xx] 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.35 to 6.0.35 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.425 to 6.0.427 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.425-rtm.24417.1 to 6.0.427-rtm.24466.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.425 to 6.0.427 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.35-servicing.24461.4 to 6.0.35-servicing.24462.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.35-servicing.24462.2 to 6.0.35-servicing.24462.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240913.28 - **Date Produced**: September 13, 2024 11:01:11 PM UTC - **Commit**: 1ce03150206eb3a054fd686a1c43da9b34f3314a - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.427-servicing.24466.22 to 6.0.427-servicing.24463.28][1] - **Microsoft.NET.Sdk**: [from 6.0.427-servicing.24466.22 to 6.0.427-servicing.24463.28][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.35 to 6.0.35][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.35-servicing.24463.5 to 6.0.35-servicing.24462.8][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.35-servicing.24463.5 to 6.0.35-servicing.24462.8][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.427 to 6.0.425][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.427-rtm.24466.3 to 6.0.425-rtm.24417.1][3] - **Microsoft.DotNet.Common.Projec... --- 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 effcb7359e8e..1ffbe5ba0f38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7de8a2867cf734967eef78d8e82902f3e84650b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f7bfed6fab981db8d6b859311a1a98e2b5cd684 + aa8718535dd4d26e91e431cbd3a9034b07de9a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f7bfed6fab981db8d6b859311a1a98e2b5cd684 + aa8718535dd4d26e91e431cbd3a9034b07de9a5d diff --git a/eng/Versions.props b/eng/Versions.props index ea32b04dbad1..381af1ab9642 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.427-servicing.24466.22 - 6.0.427-servicing.24466.22 + 6.0.427-servicing.24467.29 + 6.0.427-servicing.24467.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 93fddcf4f606055cb6ff9753b8971e5f57a5d31d Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Thu, 19 Sep 2024 17:45:09 +0000 Subject: [PATCH 1238/1244] Merged PR 43030: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240918.28 - **Date Produced**: September 19, 2024 6:33:29 AM UTC - **Commit**: d404f562916f5be62c6661e4f7033f26859ce939 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.427-servicing.24467.29 to 6.0.427-servicing.24468.28][1] - **Microsoft.NET.Sdk**: [from 6.0.427-servicing.24467.29 to 6.0.427-servicing.24468.28][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCaa8718535dd4d26e91e431cbd3a9034b07de9a5d&targetVersion=GCd404f562916f5be62c6661e4f7033f26859ce939&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 1ffbe5ba0f38..7750db5c9b79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7de8a2867cf734967eef78d8e82902f3e84650b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aa8718535dd4d26e91e431cbd3a9034b07de9a5d + d404f562916f5be62c6661e4f7033f26859ce939 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aa8718535dd4d26e91e431cbd3a9034b07de9a5d + d404f562916f5be62c6661e4f7033f26859ce939 diff --git a/eng/Versions.props b/eng/Versions.props index 381af1ab9642..b23814f82b55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.427-servicing.24467.29 - 6.0.427-servicing.24467.29 + 6.0.427-servicing.24468.28 + 6.0.427-servicing.24468.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 090be33b6fd069c2302c16d85bb5a691e690fef9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Oct 2024 15:55:32 -0700 Subject: [PATCH 1239/1244] Update branding to 6.0.428 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e21270bac706..2f8bc3e2ad31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 27 + 28 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 92bbf39b6786854af23381def9faa8b6b2068adb Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 2 Oct 2024 15:42:51 -0700 Subject: [PATCH 1240/1244] Try using macos 13 --- .vsts-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index daac9010733d..96a917f920c9 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -345,7 +345,7 @@ stages: parameters: agentOs: Darwin pool: - vmImage: 'macOS-latest' + vmImage: 'macos-13' timeoutInMinutes: 180 strategy: matrix: From c6430ee02939be8e1f995d77cea4afd9d64b9a9c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 2 Oct 2024 15:43:07 -0700 Subject: [PATCH 1241/1244] Use macos 13 instead --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index bee286311814..a1303ce1edde 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -392,7 +392,7 @@ extends: agentOs: Darwin pool: name: Azure Pipelines - image: macOS-latest + image: macos-13 os: macOS timeoutInMinutes: 180 strategy: From e6574cc0ce43f85cc5dd0c98502af6343e7a7ab2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 16:33:16 +0000 Subject: [PATCH 1242/1244] [release/6.0.4xx] Update dependencies from dotnet/arcade (#20137) [release/6.0.4xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3f2882e14c7..924d40876a29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 685008547318b269dbbb82cfc9ca968126301bbe + 51df77c8fcd7893066f14eab382ef95c5faed6cf - + https://github.com/dotnet/arcade - 685008547318b269dbbb82cfc9ca968126301bbe + 51df77c8fcd7893066f14eab382ef95c5faed6cf - + https://github.com/dotnet/arcade - 685008547318b269dbbb82cfc9ca968126301bbe + 51df77c8fcd7893066f14eab382ef95c5faed6cf https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2f8bc3e2ad31..019073ac68db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24459.5 + 6.0.0-beta.24463.1 diff --git a/global.json b/global.json index 4a13cd368bea..147e4f245934 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.24459.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24459.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24463.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24463.1" } } From aeb4f233420bb7ce61ece91d1a532799521e58e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Oct 2024 17:53:15 +0000 Subject: [PATCH 1243/1244] Update dependencies from https://github.com/dotnet/arcade build 20241008.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24463.1 -> To Version 6.0.0-beta.24508.2 --- 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 924d40876a29..17230bd820ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 51df77c8fcd7893066f14eab382ef95c5faed6cf + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - 51df77c8fcd7893066f14eab382ef95c5faed6cf + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - 51df77c8fcd7893066f14eab382ef95c5faed6cf + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 33cb2376abe4..97f276600d5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24463.1 + 6.0.0-beta.24508.2 diff --git a/global.json b/global.json index 147e4f245934..1d40609063bd 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.133", + "dotnet": "6.0.135", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24463.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24463.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24508.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24508.2" } } From a644847dc68d4c490be7bb5a0b3f9a9e3aee7ec0 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Mon, 14 Oct 2024 17:46:05 -0700 Subject: [PATCH 1244/1244] Update Windows SDK projection --- eng/ManualVersions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fcf7f359ca29..5b0d64cc3a12 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,12 +9,12 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.43 - 10.0.18362.43 - 10.0.19041.43 - 10.0.20348.43 - 10.0.22000.43 - 10.0.22621.43 - 10.0.26100.43 + 10.0.17763.52 + 10.0.18362.52 + 10.0.19041.52 + 10.0.20348.52 + 10.0.22000.52 + 10.0.22621.52 + 10.0.26100.52