From 407e1ca13652d79504d81e9d4fa380216f9a46a0 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Sun, 24 Apr 2022 21:27:50 -0700 Subject: [PATCH 001/401] 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 bdb26d893..fe1b531ea 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 0d1df6193..ecb6e1fa9 100644 --- a/src/finalizer/finalizer.cpp +++ b/src/finalizer/finalizer.cpp @@ -38,6 +38,39 @@ LExit: 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 002/401] 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 cbce2d136..9a84139e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,13 +9,8 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0cd745f93..ce6288e0e 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 4b4ef5512..9b48b99a9 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 003/401] 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 4b4ef5512..98a710b03 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 004/401] 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 ce6288e0e..41d58f98e 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 f61d3159b..6d6eb66c1 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 005/401] 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 41d58f98e..541bb14fd 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 6d6eb66c1..8e1ae4e1a 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 006/401] 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 541bb14fd..62ad1931e 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 8e1ae4e1a..b04f10f4c 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 007/401] 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 62ad1931e..9b0bc4b28 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 b04f10f4c..4eb62cdc6 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 008/401] 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 4eb62cdc6..de5a25883 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 009/401] 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 9b0bc4b28..0eb386314 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 de5a25883..a2a8910ac 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 010/401] 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 0eb386314..22a57d14a 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 a2a8910ac..8d430b2e3 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 7cf584ccbd26be3ead17c4aabf6d4714fe5e32e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Apr 2022 23:17:40 +0000 Subject: [PATCH 011/401] 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 22a57d14a..c2ec06111 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 8d430b2e3..0054728f8 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 012/401] 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 c2ec06111..0183cab7f 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 0054728f8..301cc12f2 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 013/401] 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 0183cab7f..439a9fcc1 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 301cc12f2..bf7e62b84 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 014/401] 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 439a9fcc1..e7332c39d 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 bf7e62b84..e23344bd1 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 015/401] 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 e7332c39d..5cf7b0f46 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 e23344bd1..4cf7869a2 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 016/401] 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 5c9b2f490..5dd2ca79e 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 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 017/401] 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 5cf7b0f46..1e7c4d0d4 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 4cf7869a2..c264dee60 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 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 018/401] 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 1e7c4d0d4..d31df600a 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 c264dee60..e35fe57d1 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 019/401] 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 d31df600a..f01300362 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 020/401] 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 f01300362..f26e34dbc 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 e35fe57d1..d970215c6 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 021/401] 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 f01300362..616a0fb20 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 022/401] 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 5f45b8708..f5423eaa6 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 d970215c6..d773bb308 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 023/401] 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 f5423eaa6..f9a032f59 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 d773bb308..8257eff6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22212.5 + 6.0.0-beta.22254.3 diff --git a/global.json b/global.json index b645142d3..c751a7b2d 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22254.3" } } From 6a94e1add2efb38edaf77441a61f0c9cfc169b16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 May 2022 17:18:19 +0000 Subject: [PATCH 024/401] 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 f5423eaa6..f217a80c6 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 d773bb308..d8a0d8c55 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 025/401] 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 b2f272f78..9f00f75df 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 77562cd2c..3236bae7d 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 026/401] 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 9f00f75df..ff933f666 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 3236bae7d..41a587c59 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 027/401] 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 ff933f666..dff38a195 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 41a587c59..19d616030 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 028/401] 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 dff38a195..bc45f33d4 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 19d616030..cce6863b6 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 029/401] 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 bc45f33d4..c6eb0585f 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 cce6863b6..338e646c5 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 030/401] 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 c6eb0585f..7a9fa63be 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 338e646c5..1a7c23473 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 031/401] 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 7a9fa63be..edb244295 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 1a7c23473..c94bc689a 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 032/401] 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 c6eb0585f..f1107fe7d 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 033/401] 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 01bd9d2f0..2b9a7eaec 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 c94bc689a..1b62f9e94 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 034/401] 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 2b9a7eaec..49c263978 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 1b62f9e94..2a85bda35 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 035/401] 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 49c263978..dbff048e4 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 2a85bda35..d83fb1ddd 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 8f637ffc7d14bc68a96a8199325640b83036fb73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 May 2022 03:23:49 +0000 Subject: [PATCH 036/401] 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 dbff048e4..490a62ec0 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 d83fb1ddd..d6c697204 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 037/401] 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 490a62ec0..f48c38879 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 d6c697204..01677a235 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 038/401] 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 f48c38879..0b0cb5090 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 01677a235..36f7a6f42 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 039/401] 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 9a84139e5..96ed2db16 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 0b0cb5090..6c7b7067a 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 36f7a6f42..ba8035c1d 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 040/401] 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 6c7b7067a..d26b1aac3 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 ba8035c1d..697a354f0 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 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 041/401] 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 f48c38879..3a24f0547 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 01677a235..12e81de58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22254.3 + 6.0.0-beta.22261.7 diff --git a/global.json b/global.json index c751a7b2d..de4424c2a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.104", + "dotnet": "6.0.105", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22254.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22261.7" } } From e22d016def3c6758224525e8f58a6269dbe8e8fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 May 2022 20:20:44 +0000 Subject: [PATCH 042/401] 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 96ed2db16..c49dc6d82 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 d26b1aac3..0b2723d3c 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 697a354f0..d4c2d3ee0 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 043/401] 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 0b2723d3c..4f44a97d0 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 d4c2d3ee0..89fadaf31 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 044/401] 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 3a24f0547..8233284d7 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 045/401] 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 c49dc6d82..9a84139e5 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 4f44a97d0..cd8865293 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 89fadaf31..ccf6dacd3 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 046/401] 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 cd8865293..cda4006e5 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 ccf6dacd3..94b7e5855 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 047/401] 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 cda4006e5..bbfadebfb 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 94b7e5855..07b0b9a00 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 048/401] 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 bbfadebfb..60d507450 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 07b0b9a00..220fc2c77 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 049/401] [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 12e81de58..81cdd3878 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 050/401] 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 60d507450..fe8a80df8 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 220fc2c77..fb9ad9ca5 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 051/401] 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 fe8a80df8..05ac22fd9 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 fb9ad9ca5..510e2f7d4 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 052/401] 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 bca1cdafb..d4a9b2cb5 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 f485370f6..53e994964 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 053/401] 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 d4a9b2cb5..ca74694a8 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 53e994964..33a6c560e 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 500d20e8e4ca6c33fd67f0db9e782fab2bda596e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 May 2022 03:20:57 +0000 Subject: [PATCH 054/401] 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 ca74694a8..46568780c 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 33a6c560e..24b94baee 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 055/401] 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 46568780c..186120f29 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 24b94baee..7da1c2d38 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 056/401] 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 186120f29..70c936086 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 7da1c2d38..35f180f1a 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 dce53aeba11bc70cd176d0fb238a368134ea5668 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 May 2022 19:47:22 +0000 Subject: [PATCH 057/401] 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 70c936086..e884de695 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 35f180f1a..07a6fe99e 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 058/401] 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 e884de695..e7bfdb99b 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 07a6fe99e..a5ac80e6f 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 059/401] 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 e7bfdb99b..6537fb19c 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 a5ac80e6f..8fefd90e3 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 060/401] 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 bca1cdafb..8c32b6e42 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 808804b54d3a3f1dca2cb1efbfa885b4c461b0be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 May 2022 19:57:21 +0000 Subject: [PATCH 061/401] 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 6537fb19c..0957862dc 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 8fefd90e3..dee3da453 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 63b29c23054a99262efad36077906537e012c920 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 18 May 2022 20:14:23 -0700 Subject: [PATCH 062/401] 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 a529f79d1..fcf6c3e03 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 063/401] 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 0957862dc..f4141494b 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 dee3da453..16f868179 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 f6a6ffec1cc95671bd74b63fe4f22486076b30ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 May 2022 03:01:26 +0000 Subject: [PATCH 064/401] 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 f4141494b..4a935496e 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 16f868179..0da403c42 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 065/401] 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 4a935496e..2099de6e0 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 0da403c42..19c3588ce 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 066/401] 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 2099de6e0..3053c2baa 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 19c3588ce..28d7a2977 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 067/401] 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 3053c2baa..04c619be0 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 28d7a2977..3d3ab2f50 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 068/401] 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 04c619be0..fc66ff64a 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 3d3ab2f50..bce0d6151 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 069/401] 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 fc66ff64a..0f8525e86 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 bce0d6151..c18e96c84 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 070/401] 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 0f8525e86..5617f0266 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 c18e96c84..6c11fe517 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 f440d22a33dc77c79c37a3ae8189f89df892c1f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 May 2022 22:53:46 +0000 Subject: [PATCH 071/401] 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 5617f0266..0ce0d3fe0 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 6c11fe517..c8b0941cb 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 072/401] 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 0ce0d3fe0..30f93ab35 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 c8b0941cb..f601cb47f 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 073/401] 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 f485370f6..6ca7a1608 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 eba30c0d65b1c75076ac132f181304b3c25a7878 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 May 2022 06:52:53 +0000 Subject: [PATCH 074/401] 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 30f93ab35..96e8a64ac 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 f601cb47f..13b9ecfe8 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 075/401] 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 96e8a64ac..f7ab3f837 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 13b9ecfe8..28edee398 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 fd9a3f2786e08e5c516a2dbc7d8a4ab707aa11e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 May 2022 09:22:21 +0000 Subject: [PATCH 076/401] 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 f7ab3f837..f989efe92 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 28edee398..0fdfafd35 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 077/401] 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 f989efe92..ec0dbad84 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 0fdfafd35..5f8ff42a0 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 a267c532f751f7466186e32d88723c5c16392789 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 May 2022 04:49:56 +0000 Subject: [PATCH 078/401] 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 ec0dbad84..0c5e8fa2d 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 5f8ff42a0..b5a4e1973 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 079/401] 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 0c5e8fa2d..279ecd33c 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 b5a4e1973..fafdb14ea 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 080/401] 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 279ecd33c..0cd37b04f 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 fafdb14ea..b92d3d7d2 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 081/401] 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 0cd37b04f..e07cbbbd7 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 082/401] 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 e07cbbbd7..68343dd89 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 7bd315174..c43840647 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 083/401] 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 68343dd89..b7a2ec9ad 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 c43840647..52f7c34af 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 084/401] 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 b7a2ec9ad..03afcb9bd 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 52f7c34af..a0c2fda4c 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 085/401] 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 03afcb9bd..5774d4ff0 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 a0c2fda4c..ce316ce87 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 086/401] 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 5774d4ff0..322fb933f 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 ce316ce87..97421f733 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 087/401] 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 322fb933f..4f9530594 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 97421f733..e97e006a1 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 088/401] 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 4f9530594..aef9de210 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 e97e006a1..8024246d5 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 089/401] 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 aef9de210..a6c5e0c2c 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 8024246d5..ce705c967 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 090/401] 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 a6c5e0c2c..f592ab48e 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 ce705c967..cea1e5ccf 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 091/401] 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 8c32b6e42..440ea747a 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 092/401] 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 f592ab48e..27b7a7051 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 cea1e5ccf..1dae7687e 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 093/401] 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 27b7a7051..0b7fd8d41 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 1dae7687e..30f88e50a 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 094/401] 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 0b7fd8d41..f232e3770 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 30f88e50a..a58f1ea94 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 095/401] 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 f232e3770..3ee74b7b3 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 a58f1ea94..c6ebdd3af 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 096/401] 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 440ea747a..df9e197d6 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 097/401] 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 3ee74b7b3..9d4bcc6ab 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 c6ebdd3af..8cc4d7e45 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 36b92cafe5d0b01250ffd651e8435c2817c5aef3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Jun 2022 03:03:28 +0000 Subject: [PATCH 098/401] 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 9d4bcc6ab..98aa2d577 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 8cc4d7e45..25b594b69 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 099/401] 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 98aa2d577..35501acbe 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 25b594b69..d58d1c539 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 100/401] 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 35501acbe..8a66e5457 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 d58d1c539..952d5fc5f 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 101/401] 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 8949af132..f440ca5f3 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 102/401] 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 8a66e5457..6111da596 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 952d5fc5f..474a1fbcf 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 103/401] 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 df9e197d6..36f345901 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 131e6ed24bd3971018064e33868e4bd538117ced Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Jun 2022 04:09:51 +0000 Subject: [PATCH 104/401] 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 6111da596..725bbdc10 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 474a1fbcf..8259b81f7 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 105/401] 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 725bbdc10..2499f7873 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 8259b81f7..44f0b4aee 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 106/401] 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 2499f7873..769c9c145 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 44f0b4aee..7e2180674 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 107/401] 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 a28265b3e..20ed99836 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -297,7 +297,7 @@ stages: _BuildArchitecture: 'x64' # Do not publish zips and tarballs. The linux-x64 binaries are # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false;BuildSdkDeb=true' + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_x64: _BuildConfig: Release From e585cf928459155b1065b6eb4f64199fb6d1059d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Jun 2022 03:18:55 +0000 Subject: [PATCH 108/401] 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 769c9c145..436687583 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 7e2180674..b4db473de 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 4a38b3c1482ab07c7c1b662648343cb5d5787792 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Jun 2022 22:49:44 +0000 Subject: [PATCH 109/401] 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 436687583..4fd7b926d 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 b4db473de..0e125724d 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 110/401] 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 4fd7b926d..65a173de4 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 0e125724d..be3c50ad0 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 111/401] 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 65a173de4..539c05a21 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 be3c50ad0..bd88e008f 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 112/401] 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 539c05a21..bd55f6083 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 bd88e008f..58bf9104c 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 113/401] 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 8543f5e5c..efb09817f 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,10 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.25 - 10.0.18362.25 - 10.0.19041.25 - 10.0.20348.25 - 10.0.22000.25 + 10.0.17763.26 + 10.0.18362.26 + 10.0.19041.26 + 10.0.20348.26 + 10.0.22000.26 + 10.0.22621.26 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 96fa6035b..840a2133b 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -673,6 +673,7 @@ Copyright (c) .NET Foundation. All rights reserved. /> + diff --git a/test/EndToEnd/GivenWindowsApp.cs b/test/EndToEnd/GivenWindowsApp.cs index bf2305953..59f28eee8 100644 --- a/test/EndToEnd/GivenWindowsApp.cs +++ b/test/EndToEnd/GivenWindowsApp.cs @@ -17,7 +17,8 @@ namespace EndToEnd [InlineData("10.0.18362.0")] [InlineData("10.0.19041.0")] [InlineData("10.0.20348.0")] - [InlineData("10.0.22000.0", Skip = "Package not published yet")] + [InlineData("10.0.22000.0")] + [InlineData("10.0.22621.0")] public void ItCanBuildAndRun(string targetPlatformVersion) { var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt") From c26eab078e6df6f319c5f9419e55f8aa9a9a8295 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Jun 2022 18:32:05 +0000 Subject: [PATCH 114/401] 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 bd55f6083..5eb3ec85f 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 58bf9104c..adfdc95b2 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 46f03f644c37deea81daf5791f25d6eb7791cdf0 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 14 Jun 2022 15:41:51 -0500 Subject: [PATCH 115/401] 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 1d284c47e..000000000 --- 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 116/401] [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 eab516290..001a16c01 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -34,6 +34,7 @@ + diff --git a/src/SourceBuild/tarball/content/repos/razor-compiler.proj b/src/SourceBuild/tarball/content/repos/razor-compiler.proj new file mode 100644 index 000000000..f47d22c98 --- /dev/null +++ b/src/SourceBuild/tarball/content/repos/razor-compiler.proj @@ -0,0 +1,21 @@ + + + + + $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) + + $(ProjectDirectory)global.json + $(ProjectDirectory)NuGet.config + false + + + + + + + + + + + + diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj index 9a26cd695..613ed2e26 100644 --- a/src/SourceBuild/tarball/content/repos/sdk.proj +++ b/src/SourceBuild/tarball/content/repos/sdk.proj @@ -39,6 +39,7 @@ + diff --git a/src/SourceBuild/tarball/patches/razor-compiler/0001-Exclude-test-projects-from-source-build.patch b/src/SourceBuild/tarball/patches/razor-compiler/0001-Exclude-test-projects-from-source-build.patch new file mode 100644 index 000000000..dded6ec2f --- /dev/null +++ b/src/SourceBuild/tarball/patches/razor-compiler/0001-Exclude-test-projects-from-source-build.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Wed, 13 Apr 2022 15:03:44 -0700 +Subject: [PATCH] Exclude test projects from source-build + +Backport PR: https://github.com/dotnet/razor-compiler/pull/226 +--- + src/test/Directory.Build.props | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/test/Directory.Build.props b/src/test/Directory.Build.props +index 95172906..047e4619 100644 +--- a/src/test/Directory.Build.props ++++ b/src/test/Directory.Build.props +@@ -8,5 +8,6 @@ + --> + true + false ++ true + + diff --git a/src/SourceBuild/tarball/patches/razor-compiler/0002-retarget-Razor-Syntax-Genreator-to-net6.0.patch b/src/SourceBuild/tarball/patches/razor-compiler/0002-retarget-Razor-Syntax-Genreator-to-net6.0.patch new file mode 100644 index 000000000..e101f8041 --- /dev/null +++ b/src/SourceBuild/tarball/patches/razor-compiler/0002-retarget-Razor-Syntax-Genreator-to-net6.0.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Thu, 14 Apr 2022 16:27:26 -0700 +Subject: [PATCH] retarget Razor Syntax Genreator to net6.0 + +Backport PR: https://github.com/dotnet/razor-compiler/pull/226 +--- + src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj b/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj +index 924379ac..362f0e3b 100644 +--- a/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj ++++ b/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj +@@ -3,6 +3,7 @@ + + Generates Razor syntax nodes from xml. For internal use only. + netcoreapp3.1 ++ net6.0 + dotnet-razorsyntaxgenerator + RazorSyntaxGenerator + Exe From 985a0871754b6aaf88fa41ca31b1dcdc9a3176d7 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 14 Jun 2022 16:06:11 -0700 Subject: [PATCH 117/401] 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 7e2180674..bfacfd922 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 57d6928a192041d086e355b42c9c4eae8de21b37 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Jun 2022 23:59:12 +0000 Subject: [PATCH 118/401] 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 769c9c145..ef4c90061 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 bfacfd922..da570c80d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22261.7 + 6.0.0-beta.22314.7 diff --git a/global.json b/global.json index de4424c2a..80e9668ff 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.105", + "dotnet": "6.0.106", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22261.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22314.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22314.7" } } From 3b7c25c763cc14fb52d7ee8400ac16437015cc21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Jun 2022 02:20:08 +0000 Subject: [PATCH 119/401] 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 36f345901..83256d48d 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 120/401] [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 c0642cdce..c50ae30f9 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 1d4db2143..d2ecfdfb2 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 121/401] 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 c50ae30f9..aff8d0df6 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 d2ecfdfb2..b075c955b 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 64a3acb5d06a5035062a48f994e8f5e4a5b2766d Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 15 Jun 2022 17:56:59 -0500 Subject: [PATCH 122/401] 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 ff9296640..c4f3f6ec2 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -124,6 +124,7 @@ $(TarballSourceDir)$(SourceDir)eng/ $(TarballRepoSourceEngDir)Version.Details.xml -q + $(RepoUri) $(RepoUri.Replace('https://dev.azure.com', 'https://dn-bot:$(AzDoPat)@dev.azure.com')) @@ -175,10 +176,18 @@ Command="git submodule update --init --recursive --depth 1" WorkingDirectory="$(TarballRepoSourceDir)" /> + + + + From 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 123/401] 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 aff8d0df6..ead1b16fb 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 b075c955b..606a3f77c 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 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 124/401] [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 ead1b16fb..7bab98264 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 606a3f77c..c357e5cb9 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 125/401] 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 7bab98264..21835d96e 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 c357e5cb9..3c538d980 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 126/401] 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 21835d96e..9486f655c 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 3c538d980..b2880258c 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 127/401] 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 9486f655c..9f7b407a4 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 b2880258c..e656a8ea4 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 128/401] 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 9f7b407a4..b279d79b4 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 e656a8ea4..ce33a409b 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 129/401] 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 b279d79b4..da7544fce 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 ce33a409b..544ec92ff 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 130/401] 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 da7544fce..6c66d5552 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 544ec92ff..3baf0a8a6 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 131/401] [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 6c66d5552..9e8ea9224 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 3baf0a8a6..fddd14c20 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 132/401] 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 9e8ea9224..7fb53c4ea 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 fddd14c20..26fff36f4 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 3159eccbc194346cf2af594183151ecff82166bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Jun 2022 05:35:59 +0000 Subject: [PATCH 133/401] 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 7fb53c4ea..fe8211817 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 26fff36f4..5d6932ea7 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 134/401] 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 fe8211817..7716b4add 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 5d6932ea7..a46ae11d6 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 135/401] 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 7716b4add..307949892 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 a46ae11d6..507ad35c6 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 eb8f2f182f12ab51613d031da95c5cb888b43984 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Jun 2022 18:32:07 +0000 Subject: [PATCH 136/401] 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 307949892..400737ec2 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 507ad35c6..86927edab 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 9f9e52f48db24125cdcea5196aa506ff59fa5705 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Jun 2022 03:28:20 +0000 Subject: [PATCH 137/401] 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 400737ec2..b9b5af755 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 86927edab..60c116ed1 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 138/401] 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 b9b5af755..58127fc2a 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 60c116ed1..643b2a429 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 139/401] 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 58127fc2a..6bc700bc9 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 643b2a429..3262661cb 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 140/401] 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 6bc700bc9..1e87eb680 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 3262661cb..377279712 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 141/401] 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 1e87eb680..719110ce0 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 377279712..c223564cd 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 142/401] 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 719110ce0..4ec235864 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 c223564cd..59d80ed7b 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 143/401] 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 4ec235864..483fd51fb 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 59d80ed7b..d7d5354dc 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 144/401] 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 483fd51fb..0c2f1e561 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 d7d5354dc..d85328d0d 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 145/401] 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 0c2f1e561..353fa4c0f 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 d85328d0d..75220734b 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 146/401] 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 353fa4c0f..6a2cb790d 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 75220734b..d7eb93f31 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 147/401] 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 6a2cb790d..b360ed7fc 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 d7eb93f31..9f2dda7d1 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 148/401] [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 b360ed7fc..c8edeb2c2 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 9f2dda7d1..93575accd 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 149/401] 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 840a2133b..dddadab15 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 150/401] 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 c8edeb2c2..adfd4d194 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 93575accd..d3bf047cd 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 151/401] 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 adfd4d194..b6229d2a6 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 d3bf047cd..0485cac3a 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 152/401] 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 b6229d2a6..4d99a1967 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 0485cac3a..227212b76 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 153/401] 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 4d99a1967..e0834752b 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 227212b76..138c06205 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 154/401] 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 e0834752b..c55eabe47 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 138c06205..9e1265f82 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 155/401] 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 c55eabe47..c7674116a 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 9e1265f82..9befda92f 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 156/401] 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 c7674116a..f3976e286 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 9befda92f..4ca8334f8 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 157/401] 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 f3976e286..4e44a45c6 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 4ca8334f8..28bd36fb5 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 158/401] 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 4e44a45c6..36c1cc0e3 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 28bd36fb5..1b0af883b 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 159/401] 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 426502e86..cf15d1bfc 100644 --- a/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch +++ b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch @@ -24,14 +24,14 @@ index ca52bd1f40..643d03e8af 100644 // There's no way to to register multiple service types per definition. See https://github.com/aspnet/DependencyInjection/issues/360 -#pragma warning disable CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint. - _applicationServiceCollection.AddSingleton(services -- => services.GetService() as IHostApplicationLifetime); +- => services.GetService()! as IHostApplicationLifetime); + _applicationServiceCollection.AddSingleton(services + => services.GetService()!); #pragma warning disable CS0618 // Type or member is obsolete - _applicationServiceCollection.AddSingleton(services -- => services.GetService() as AspNetCore.Hosting.IApplicationLifetime); +- => services.GetService()! as AspNetCore.Hosting.IApplicationLifetime); - _applicationServiceCollection.AddSingleton(services -- => services.GetService() as Extensions.Hosting.IApplicationLifetime); +- => services.GetService()! as Extensions.Hosting.IApplicationLifetime); + _applicationServiceCollection.AddSingleton(services + => services.GetService()!); + _applicationServiceCollection.AddSingleton(services From 7d9996016ae1e503eeabb1363e9fca4003273ad0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Jul 2022 03:51:36 +0000 Subject: [PATCH 160/401] 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 36c1cc0e3..77fb2fa4a 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 1b0af883b..930ae87ba 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 161/401] 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 77fb2fa4a..363888c51 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 930ae87ba..fcd5e402b 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 162/401] 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 363888c51..1b6758429 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 fcd5e402b..af864e003 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 163/401] 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 1b6758429..ed9353018 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 af864e003..4d0639bef 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 164/401] 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 20ed99836..74bea93e8 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 272f9596a..2d7e65698 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 4efe6994e36054c034d2f7b3e63f45f03a1c48ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Jul 2022 15:01:11 +0000 Subject: [PATCH 165/401] 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 83256d48d..2054c20fb 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 e77bb371d7309738cd75d088bb15e9c9f5b06878 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Jul 2022 00:32:05 +0000 Subject: [PATCH 166/401] 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 ed9353018..7905af2dc 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 4d0639bef..c6b484073 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 b27b4ecf9f1274ae4431a799b282c7f1cec8a1a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Jul 2022 22:38:20 +0000 Subject: [PATCH 167/401] 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 7905af2dc..9cbc85253 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 c6b484073..fbca69db5 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 5eb8a241c8a43372b36a4df7eb5273c36c773e45 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Jul 2022 14:58:40 +0000 Subject: [PATCH 168/401] 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 2054c20fb..2443f8e02 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 169/401] 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 cff9bda21..000000000 --- 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 ef25719e7c75d5812a05008283f04e980f264365 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Jul 2022 17:11:21 +0000 Subject: [PATCH 170/401] 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 9cbc85253..9e2d61278 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 fbca69db5..c33e89918 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 171/401] 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 9e2d61278..94bf496fc 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 c33e89918..3a80e29ab 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 172/401] 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 3a80e29ab..78b2ab852 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 50bd0f656734ee9e6d23e0f4d4e88e0fa324a862 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Jul 2022 21:49:35 +0000 Subject: [PATCH 173/401] 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 94bf496fc..ec71bcaf6 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 78b2ab852..0c3787024 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 174/401] 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 ec71bcaf6..9704f1c5f 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 0c3787024..547795883 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 175/401] 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 9704f1c5f..c19fe86fa 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 547795883..06e2795b7 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 a3290bfa2d775407cf53e5b73079c02d2ea8b1c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Jul 2022 15:07:24 +0000 Subject: [PATCH 176/401] 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 2443f8e02..bfee1f6bf 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 6b9fa18ad7f3392d86afef9197903b35ed30f900 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Jul 2022 13:43:25 -0700 Subject: [PATCH 177/401] 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 7b8536e48..b38fce70c 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 178/401] 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 4f5d25388..a983e09b4 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 01199e28c..396463345 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 1d7d271d4..f8b7ab77a 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 179/401] 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 b38fce70c..63bfd724e 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 180/401] 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 396463345..0c70c5efa 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 c097ef35a..22a87bc44 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 181/401] 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 0c70c5efa..ab7b5acdf 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 22a87bc44..00c543734 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 182/401] 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 ab7b5acdf..932a97689 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 00c543734..48982d6ad 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 5cb321b8759d06853ec97ad0d2c4341725082d7a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Jul 2022 11:12:45 -0700 Subject: [PATCH 183/401] 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 48982d6ad..8b6108da9 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 184/401] 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 dddadab15..fe34c9857 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 1a93c8b6ebf761d2be728e78f80f389866929307 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Jul 2022 19:40:37 +0000 Subject: [PATCH 185/401] 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 a983e09b4..1161d1e28 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 877fb6bcc..ca23a66fa 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 8b6108da9..940349c0c 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 186/401] 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 ca23a66fa..910d95c0e 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 940349c0c..8f124271e 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 187/401] 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 910d95c0e..bbc72d40a 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 8f124271e..8c9e654fe 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 146342f407f81fb12ea23871fac93a9b0cdf7c0f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 18 Jul 2022 22:23:06 +0000 Subject: [PATCH 188/401] 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 1161d1e28..b7ec3e5c7 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 bbc72d40a..0e71e8c28 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 8c9e654fe..88e7e5977 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 189/401] 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 a983e09b4..9a84139e5 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 877fb6bcc..231e226ba 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 190/401] 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 fe34c9857..6fd052fb0 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 191/401] 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 231e226ba..535cfe73f 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 192/401] 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 b7ec3e5c7..4d97ff5b3 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 0e71e8c28..9f51ec116 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 88e7e5977..6a9436af1 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 193/401] 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 535cfe73f..11424d73d 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 194/401] 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 11424d73d..247688704 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 fdea79d1060c0f283b10aa5c2e516ce1307d8cec Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Aug 2022 09:18:19 -0700 Subject: [PATCH 195/401] 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 8b6108da9..e9742675f 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 196/401] Servicing label --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e9742675f..62c902374 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 a64bc66e6ced51b0cda62babb6c51fc39f049d49 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 2 Aug 2022 23:04:03 +0000 Subject: [PATCH 197/401] 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 4d97ff5b3..e720e55fc 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 9f51ec116..4670ee2a8 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 6a9436af1..9ff4990d8 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 198/401] 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 4670ee2a8..03d20038b 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 9ff4990d8..ba2c870ae 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 199/401] 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 03d20038b..de2c5a283 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 ba2c870ae..583586caa 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 200/401] 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 de2c5a283..56c61a4fc 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 583586caa..544c6fa4d 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 201/401] 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 247688704..a33391b13 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 202/401] 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 56c61a4fc..d8809434f 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 544c6fa4d..c732959ab 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 203/401] 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 a33391b13..dacfe52ce 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 204/401] 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 6fd052fb0..e8948ec0b 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 205/401] 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 d8809434f..dc0ef9e62 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 c732959ab..90a30725e 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 206/401] 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 dc0ef9e62..dae04267b 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 90a30725e..485514f08 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 207/401] 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 60a6c6c5b..ecd5381d9 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 208/401] 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 dae04267b..159ff2451 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 485514f08..507da660a 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 209/401] [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 736bf9635..526cda48f 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 210/401] 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 e720e55fc..6c42273dc 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 159ff2451..67863b671 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 507da660a..d1828923e 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 211/401] 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 67863b671..6c46504bb 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 d1828923e..887f43938 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 212/401] 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 6c46504bb..f84b1aaa5 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 887f43938..bb9a68f57 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 213/401] 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 f84b1aaa5..e9005b958 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 bb9a68f57..cb8d89544 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 214/401] 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 e9005b958..7faf154fb 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 cb8d89544..08efbd8be 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 215/401] 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 6c42273dc..c605aadf2 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 7faf154fb..98d73769f 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 08efbd8be..428c22d52 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 216/401] 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 b7ec3e5c7..1f98426d4 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 ba9d82562..96d2edc8d 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 217/401] 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 | 142 ++++++++++++------ 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, 141 insertions(+), 69 deletions(-) create mode 100644 eng/common/internal/NuGet.config diff --git a/NuGet.config b/NuGet.config index b7ec3e5c7..1f98426d4 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 ba9d82562..5d29c3c65 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 c4d5e34ff..c40bd7eb4 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 a733a8885..3e5c1c74a 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 f6c774531..d5c76dc82 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 db830c00a..7428ef880 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 ($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 ($Verbose) { - $LocalInstallerArguments += @{ Verbose = $True } + 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 + } + $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 + } + $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 } - if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { - if($Force) { - $LocalInstallerArguments += @{ Force = $True } + } 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 ($Clean) { - $LocalInstallerArguments += @{ Clean = $True } + + 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 } - - 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 } } 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 000000000..19d3d311b --- /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 beb9c4648..7f5ce6d60 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 24cec0424..9ff6a10a6 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 9d1e3042d..991ae05f5 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 554e71cfc..48918df74 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 24e92a275..270607126 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 f1e1cb539..81d7b0355 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 80e9668ff..bb5632c68 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 218/401] 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 98d73769f..df8e547da 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 428c22d52..86db81d6d 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 64d3eb8f661b3faa7fc0dc87a3e50948268d12f3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 13 Aug 2022 00:05:04 +0000 Subject: [PATCH 219/401] 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 70a55d2d1..a852eff8a 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 44a4185a5..117f0babc 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 220/401] 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 c605aadf2..f5ff9f72a 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 a852eff8a..1080d6d4a 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 117f0babc..f21cb7dfa 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 221/401] 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 96d2edc8d..2ef2ea46a 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 e1e2b736749ec615917be13be5587793fef6f1be Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 13 Aug 2022 17:55:10 +0000 Subject: [PATCH 222/401] 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 f5ff9f72a..cdb2f751b 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 1080d6d4a..b16c0eabb 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 f21cb7dfa..48b122cde 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 223/401] 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 cdb2f751b..00ac53fcc 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 b16c0eabb..2d74fe388 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 48b122cde..7e88ab0dc 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 389b9280b5ae4d484fc373a5b78af8d5d1a93944 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 08:17:17 +0000 Subject: [PATCH 224/401] 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 2d74fe388..11475fab8 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 7e88ab0dc..60b938564 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 225/401] 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 00ac53fcc..c618bb6e4 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 11475fab8..21376019a 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 60b938564..9f169dc9c 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 226/401] 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 c618bb6e4..5e7a6aab0 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 21376019a..b1a8ae6bc 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 9f169dc9c..31f28527a 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 227/401] 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 0edd2916a..32f7a7f03 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 c40bd7eb4..7f50b8c44 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 bb5632c68..0aaa96317 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 228/401] 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 5e7a6aab0..a242b20b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 943f534b7..e1044f420 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 d988bcb75..841da1ec1 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 229/401] 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 a242b20b7..2bc1ffe75 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 e1044f420..8f1de58f5 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 841da1ec1..e53c0faed 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 230/401] 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 8f1de58f5..b5d180866 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 e53c0faed..754d5e409 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 231/401] 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 b5d180866..1ad152ccc 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 754d5e409..1b05b692e 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 232/401] 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 2bc1ffe75..68a00048f 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 1ad152ccc..8de59dca7 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 1b05b692e..2a1ba09f0 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 233/401] 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 68a00048f..1532c5e31 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 8de59dca7..c8882bbc5 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 2a1ba09f0..5c0c3c328 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 234/401] 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 c8882bbc5..6c7303fdc 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 5c0c3c328..7c6936239 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 c5e1ec90dde3263bed1c7d43439e8f423e19696c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 00:17:54 +0000 Subject: [PATCH 235/401] 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 6c7303fdc..da9823be3 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 7c6936239..a648d7a5f 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 236/401] 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 1532c5e31..ce7604cf1 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 da9823be3..3b7a80f93 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 a648d7a5f..b8fb7c373 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 237/401] 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 ce7604cf1..9ae6e6b22 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 3b7a80f93..f324774be 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 b8fb7c373..c3e6b88f1 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 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 238/401] 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 efb09817f..7707ace1a 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 e8948ec0b..45d27f020 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 239/401] 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 9ae6e6b22..10bd367f6 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 f324774be..dd9deff77 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 c3e6b88f1..e7a0a82c4 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 240/401] 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 10bd367f6..354037b95 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 dd9deff77..bb79a13fd 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 e7a0a82c4..3553845cd 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 9d3f9c9bfa1bce717712aaa5dd2e7cc557daf7db Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Aug 2022 05:36:39 +0000 Subject: [PATCH 241/401] 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 354037b95..4a6876363 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 bb79a13fd..0d2bbf7fa 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 3553845cd..b2671867d 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 242/401] 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 0d2bbf7fa..abce23389 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 b2671867d..b91400b46 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 243/401] 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 abce23389..1a92896ae 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 b91400b46..fc7df88dc 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 8c233f6049734c2f4ec47d97cdc13c8bf830fcba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 14:37:25 +0000 Subject: [PATCH 244/401] 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 32f7a7f03..0ec93ebe3 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 be22bc7844e7369b680836891f53ed08525c0b2c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 17 Aug 2022 00:28:54 +0000 Subject: [PATCH 245/401] 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 d0ea16a8d..f9fe2c166 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 246/401] 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 4a6876363..d6af126ea 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 f649eb3ee..9226b8ca2 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 fc7df88dc..463cfbfbc 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 247/401] 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 0ec93ebe3..ac9751877 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 248/401] 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 d6af126ea..4125dd15b 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 9226b8ca2..1cc5e0194 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 463cfbfbc..bff5a89bf 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 249/401] 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 4125dd15b..1930fe818 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 1cc5e0194..1090d776a 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 bff5a89bf..4c8991084 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 250/401] 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 1930fe818..b079642f2 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 1090d776a..97e50fe1f 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 4c8991084..ef2091198 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 251/401] 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 b079642f2..4a5b3e74d 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 97e50fe1f..8d07aa368 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 ef2091198..3364af816 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 252/401] 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 4a5b3e74d..141417d34 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 8d07aa368..7c572a940 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 3364af816..6ff3ec4ab 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 1474578b5d34ea044b2ce536375203bbfa00c0aa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 21 Aug 2022 17:06:53 +0000 Subject: [PATCH 253/401] 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 141417d34..1cd04a927 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 7c572a940..d5c2ce963 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 6ff3ec4ab..3423f9240 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 95d55b351e51ce8465cf094db0c8d132e80a8140 Mon Sep 17 00:00:00 2001 From: Alex Perovich Date: Wed, 31 Aug 2022 17:18:01 -0700 Subject: [PATCH 254/401] 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 c2af3ac8d..c43b60457 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -47,7 +47,7 @@ stages: - job: Publish_Build_Configuration pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals build.windows.10.amd64.vs2019.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -61,7 +61,7 @@ stages: agentOs: Windows_NT pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals build.windows.10.amd64.vs2019.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -118,7 +118,7 @@ stages: agentOs: Windows_NT pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals build.windows.10.amd64.vs2019.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -147,7 +147,7 @@ stages: agentOs: Linux pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -333,7 +333,7 @@ stages: agentOs: Linux pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 5cd5325d7..88f6f75a6 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,7 +46,7 @@ jobs: # source-build builds run in Docker, including the default managed platform. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Public + name: NetCore-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 4f993567f..8efb389d3 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -6,7 +6,7 @@ jobs: displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 2cf4ad628..e5e4f7e9a 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -25,7 +25,7 @@ parameters: poolInternalArm64: name: Docker-Linux-Arm-Internal poolPublicAmd64: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open jobs: From b1ee7db7b0397deed473ddd25ab42855daae086a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Sep 2022 10:31:43 -0700 Subject: [PATCH 255/401] 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 7f50b8c44..345614c44 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 be85081b6f4b8be50c991a650b9453597ff690eb Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 11 Aug 2022 16:41:17 -0700 Subject: [PATCH 256/401] 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 142daff4e..ff22bcbc1 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 28339be99..86710223d 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 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 257/401] [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 ae2b861d3..275a86d09 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 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 258/401] 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 1cd04a927..71373bd88 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 b7e2e834b..2b8705345 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 275a86d09..eb64e689f 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 9ff6a10a6..aaeb83b4d 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 991ae05f5..5b1b77d1c 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 88f6f75a6..b6137f44a 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 48918df74..9c4becbc8 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 270607126..fc022ca9b 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 0aaa96317..9d1e2d901 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 235e79474031bc4e9bfa3a52ff6d4eefbe552e73 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 15:58:42 +0000 Subject: [PATCH 259/401] 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 71373bd88..6acd09ccf 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 2b8705345..e986abf93 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 eb64e689f..53dfce5c2 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 a3037401514f1f6652671a33dae3b3f5bbcc7df1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 19:22:31 +0000 Subject: [PATCH 260/401] 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 6acd09ccf..ae933ee91 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 e986abf93..89c1a493d 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 53dfce5c2..da4fa4576 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 c74f58b3e055436a7425711b181750b942d0ffaa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 23:18:29 +0000 Subject: [PATCH 261/401] 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 ae933ee91..6ef2f2d6e 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 89c1a493d..a4720d6aa 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 da4fa4576..35666876f 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 9b4f4ba2f2ef3a1427d41f490146b1a51e1da247 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 01:08:12 +0000 Subject: [PATCH 262/401] 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 6ef2f2d6e..48041fd8b 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 a4720d6aa..b2a449246 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 35666876f..0cfb3da79 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 68624187969147694f78da1cc12444330b06fb1d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 04:17:27 +0000 Subject: [PATCH 263/401] 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 48041fd8b..89d231a7f 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 b2a449246..d0df94604 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 0cfb3da79..86f9cd19c 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 19a9961977f6317e47c6a8c42abf1795990f13bf Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Oct 2022 09:37:55 -0700 Subject: [PATCH 264/401] 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 eb64e689f..5cee88b5d 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 265/401] 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 b64731aff..2b8705345 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 ab2fa017423c66dd6e088dfef2d21985f91a0160 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 12 Oct 2022 16:48:00 -0700 Subject: [PATCH 266/401] 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 5cee88b5d..86400b0ba 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 267/401] 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 e00e01da1..9a84139e5 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 2b8705345..295136e2a 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 86400b0ba..204c9d28f 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 8943da242..33a6f2d0e 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 7428ef880..6c7a851a8 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 9d1e2d901..20ae9a5af 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 e55af734c22e1c2e2c35a162be5676e687fe2d39 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Oct 2022 17:41:04 +0000 Subject: [PATCH 268/401] 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 e29afeaab..963ee559c 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 778c68932..2cea7ba1f 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 266fd059c..f86693cfa 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 9c88a3391a15486f54d831720eb2d3ef1543bd88 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 00:16:44 +0000 Subject: [PATCH 269/401] 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 963ee559c..677097d4f 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 2cea7ba1f..6391c2658 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 f86693cfa..20ac6b792 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 adc37b6826370744eabb3e0d1d4f1846dded7f11 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 17:35:03 +0000 Subject: [PATCH 270/401] 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 677097d4f..aef14c2de 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 6391c2658..3bb22313c 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 20ac6b792..253d751f2 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 271/401] 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 aef14c2de..db9a96bce 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 3bb22313c..d547a62ab 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 253d751f2..4bc0d2e7a 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 d9bc49495ab92eae6adca0a9ebff9fe01eacd44c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 16:34:26 +0000 Subject: [PATCH 272/401] 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 db9a96bce..1e19ac368 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 d547a62ab..2348fde15 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 4bc0d2e7a..3390c5c05 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 c3b0ce9494e408bdf871733afebf9411c54bca68 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 19:45:17 +0000 Subject: [PATCH 273/401] 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 1e19ac368..3cc60df47 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 2348fde15..c29ba5350 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 3390c5c05..ce14f9be9 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 45b0a08d8b45001124884ac63f2ffbf973a6915d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 20:36:25 +0000 Subject: [PATCH 274/401] 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 3cc60df47..d0429bdc0 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 c29ba5350..9ac2ae45c 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 ce14f9be9..60bb245bf 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 275/401] 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 9ac2ae45c..03385f3bf 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 60bb245bf..b940f22e2 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 276/401] [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 13bcd2497..d927b3a86 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 41266955bd5410669548e624df32239b52169b88 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 02:54:16 +0000 Subject: [PATCH 277/401] 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 d0429bdc0..a3a5adc0f 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 03385f3bf..a71549079 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 b940f22e2..888dd89c7 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 278/401] 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 a3a5adc0f..8e3e1a08b 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 a71549079..b9a7df5a2 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 888dd89c7..d02f494a8 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 2bc18bf2920f0d6292aae0c786652e4b840de6a4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 15:32:23 +0000 Subject: [PATCH 279/401] 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 8e3e1a08b..063b396f5 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 b9a7df5a2..999ef2404 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 d02f494a8..ec9e23dce 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 319ac0113e7513c635434122e30aa00ba589b3d8 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Wed, 26 Oct 2022 21:24:13 -0700 Subject: [PATCH 280/401] 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 ecb6e1fa9..58bf9e1bd 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 c58c6a194..148487bde 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 c7fe18c3f80d4379f3620f5770f6e60b85437e6c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Nov 2022 14:17:48 -0700 Subject: [PATCH 281/401] 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 266fd059c..d227a0641 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 753a4009a52b422cdc0d6598c7c40b2f432bee4c Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 8 Nov 2022 06:35:11 -0800 Subject: [PATCH 282/401] [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 a230a4d7c..5d396baab 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 cffdf6bdb..ac6d73016 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 d927b3a86..45dfbf787 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 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 283/401] [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 e29afeaab..2cf5556c3 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 778c68932..4660a8502 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 d227a0641..16d21c80e 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 000000000..648c5068d --- /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 7b8ee18a2..9dd5709f6 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 20ae9a5af..b779ff3ff 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 735289e70..bd43b568b 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 4014b87ad..57c4a4b0a 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 284/401] 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 d5f4b3c3c..03d3587a6 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 6f6927b79..30ec9ee0a 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 ef6da98d2..4bdd19be0 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 fdfeea66e..b09ea669f 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 b779ff3ff..8facf9ad2 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 285/401] 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 d5f4b3c3c..03d3587a6 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 6f6927b79..b7dec2be6 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 169bf3cc9d307fee9d16f52f5f70bc45e09bae94 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 14 Nov 2022 10:49:54 -0800 Subject: [PATCH 286/401] 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 4bdd19be0..b08140799 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 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 287/401] 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 252fe486e..81bc7dec6 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 b08140799..f70cd8d28 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 8facf9ad2..e7ba925c7 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 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 288/401] 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 81bc7dec6..e10ce34fd 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 f70cd8d28..a497d5519 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 e7ba925c7..30864f9a7 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 030676c5c3f41fc251b71f4b7fce754450b8791b Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 15 Nov 2022 18:25:09 -0800 Subject: [PATCH 289/401] 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 7707ace1a..2bf456f30 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 f7ab730194bc086ed0696688fc9c438b8de4de54 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 18 Nov 2022 18:20:53 +0000 Subject: [PATCH 290/401] 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 03d3587a6..74cf836b2 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 e10ce34fd..769fa0af3 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 a497d5519..67f308f8a 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 13fcc4c2804478056df7158bec00e5f4bc72258b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 20 Nov 2022 01:44:05 +0000 Subject: [PATCH 291/401] 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 74cf836b2..a4e0e740a 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 769fa0af3..41d6fd844 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 67f308f8a..8ebafe121 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 eb6f31a22fe389a52116933558e7fb2bfdc2bd32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 01:12:06 +0000 Subject: [PATCH 292/401] 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 e10ce34fd..785371c43 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 293/401] 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 785371c43..890a79137 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 294/401] 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 a4e0e740a..efd7a806c 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 d503389e4..28bc11c20 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 8ebafe121..ddbacd946 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 2e998bcbeae74a596d217291407cca54724edd0d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Nov 2022 23:17:59 +0000 Subject: [PATCH 295/401] 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 efd7a806c..a930d5173 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 28bc11c20..4301fa690 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 ddbacd946..6b882a9af 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 be4f3ec4116a6987a84aa7890f764e9c669157f5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 29 Nov 2022 00:25:33 +0000 Subject: [PATCH 296/401] 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 a930d5173..d6bbaa924 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 4301fa690..7c41840e4 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 6b882a9af..3eb4349eb 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 41303c7fc4487ddc71af40f919874ade2444942a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 29 Nov 2022 10:42:27 -0800 Subject: [PATCH 297/401] 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 a497d5519..0c81327de 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 97dc64711fdd4ce09bdeb36b78b6bfd4c557d92b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 16:33:53 +0000 Subject: [PATCH 298/401] 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 890a79137..c41c7c02f 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 7d8d71a2e95219ecd69ce3fbe6a271832cffd16f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 19:48:44 +0000 Subject: [PATCH 299/401] 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 d6bbaa924..1b291cc3a 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 a88492713..17e2ecf4c 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 54597e2b1..3ecb62d3c 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 27ab36058b70b2e05063911df631fbf17f954a35 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 2 Dec 2022 15:20:32 +0000 Subject: [PATCH 300/401] 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 1b291cc3a..b1d3e88ec 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 17e2ecf4c..4c57d7b37 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 3ecb62d3c..6c8d84260 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 b9ce8d03de751da2cedf8bda4cb0575e100b6db9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Jan 2023 15:11:52 -0800 Subject: [PATCH 301/401] 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 0c81327de..25aa43a71 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 302/401] 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 b1d3e88ec..e185e9657 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 4c57d7b37..f09cd4457 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 3ad91b798..bc613e809 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 7718784e7343ac803e94a1d47b80b7eb15439b6e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 6 Jan 2023 08:37:55 +0000 Subject: [PATCH 303/401] 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 f09cd4457..3b72aa519 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 bc613e809..79717e176 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 6e11cb5a772d0a26fc705d566c8577b17dcdaa01 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 18:52:56 +0000 Subject: [PATCH 304/401] 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 3b72aa519..ccd7d365f 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 79717e176..1bf45ad72 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 06cd8082c3c4b8b2adf975213fb0441062663386 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 21:56:13 +0000 Subject: [PATCH 305/401] 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 ccd7d365f..8d6d123ca 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 1bf45ad72..324e421de 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 7803a43d0fc987a7bc6d755a3f77b3ec290b1e9d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 22:55:54 +0000 Subject: [PATCH 306/401] 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 8d6d123ca..0e8ee9001 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 324e421de..685032514 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 7c2e144469172bb874ccdaedfe59cbcc3b7c6d79 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 10 Jan 2023 15:43:16 -0800 Subject: [PATCH 307/401] [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 3ad91b798..de00f2ace 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 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 308/401] [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 b1d3e88ec..8d7143758 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 4c57d7b37..2a54de844 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 de00f2ace..dfc5106e9 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 ec8971eb0..51f30e53d 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 abb1b2bcd..b5b3e5aeb 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 30864f9a7..50c158ed8 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 309/401] 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 e185e9657..cfdcd77c2 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 0e8ee9001..f76b6837d 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 685032514..85a7e801d 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 310/401] 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 cfdcd77c2..03d3587a6 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 f76b6837d..64dda4212 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 85a7e801d..95040c524 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 7d32485f19a2602996c9a9361bf4dcfa40825764 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Jan 2023 00:44:53 +0000 Subject: [PATCH 311/401] 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 03d3587a6..82462001d 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 64dda4212..f01481d14 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 73d03616d..0f90ce321 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 312/401] 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 f01481d14..05f5e2e92 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 0f90ce321..2aa28c7d3 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 71832da9c7f5c30973707c19e3db9f1b9ac690ec Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Jan 2023 23:23:03 +0000 Subject: [PATCH 313/401] 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 82462001d..f0974c636 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 05f5e2e92..c34aff905 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 2aa28c7d3..0dcc8d8e6 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 314/401] 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 f0974c636..cd62f1e28 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 2a01c1776..56fecfbf9 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 832f0aa7b..ef79c6b78 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 faa22bb359cb0fe8e3843b16d6f48efd76322c13 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 23 Jan 2023 19:30:38 +0000 Subject: [PATCH 315/401] 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 cd62f1e28..9b9d1a70f 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 56fecfbf9..656239c93 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 ef79c6b78..144236889 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 c165970f9f115127ca2a20bf700a8505c838ea34 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 16:56:07 +0000 Subject: [PATCH 316/401] 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 9b9d1a70f..19b530eb1 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 656239c93..43eb755e2 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 144236889..adc2607ef 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 317/401] 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 19b530eb1..143be8960 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 43eb755e2..cfe813f06 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 adc2607ef..e49a941af 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 f3a869b15952f74a2ff130e3e88ceb5aa86dc774 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 19:38:35 +0000 Subject: [PATCH 318/401] 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 143be8960..49dc24bee 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 cfe813f06..5169f1954 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 e49a941af..6332e74ff 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 2988897946e3c38c4c25ac28979feadc1a521a4d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 20:30:23 +0000 Subject: [PATCH 319/401] 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 49dc24bee..6c3e5b378 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 5169f1954..2580ea82d 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 6332e74ff..d53ee7394 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 5c68d96fd2c4a4f3a9071b687f505832e61536f5 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Feb 2023 11:44:59 -0800 Subject: [PATCH 320/401] 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 018ae1453..c4b66ec00 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 8b9ae4165224430a86d6d5b316bcc95e9b704cb6 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 8 Feb 2023 23:21:49 +0100 Subject: [PATCH 321/401] [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 f96c9fb37..73dd514c5 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 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 322/401] 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 8d7143758..6c3e5b378 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 2a54de844..2580ea82d 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 c4b66ec00..a89efaa14 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 323/401] [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 a89efaa14..c73c08233 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 324/401] [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 6c3e5b378..82043164c 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 2580ea82d..58fd16726 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 c73c08233..b9376b1f5 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 50c158ed8..85690be2c 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 325/401] 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 82043164c..bfd18eeea 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 58fd16726..0e4a1bf4a 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 b9376b1f5..8450953cc 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 326/401] 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 bfd18eeea..f6f29d76e 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 0e4a1bf4a..ee6a74782 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 8450953cc..13723ff18 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 a3ac48421f136d6d3db06b7c0d7d7ba8d0f38ffc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Feb 2023 18:38:49 +0000 Subject: [PATCH 327/401] 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 f6f29d76e..1357fac19 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 ee6a74782..01c76cd8a 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 13723ff18..2b36b3b13 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 d8659ea151969e597785b032f243b7a537c620c1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Feb 2023 00:45:10 +0000 Subject: [PATCH 328/401] 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 1357fac19..bbd67aded 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 01c76cd8a..e926e9ad0 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 2b36b3b13..c1a331018 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 333c78c32a7c43a51b5c51dcbbe382ca6492df08 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 7 Mar 2023 10:11:39 -0800 Subject: [PATCH 329/401] 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 b9376b1f5..6a7c8ae3b 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 330/401] 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 bbd67aded..698834a3d 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 e926e9ad0..52df3b49a 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 2272bba06..7d2b36c8f 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 05d6ddeec6b2fd7dd5051eb61999e93da71f618e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Mar 2023 01:45:45 +0000 Subject: [PATCH 331/401] 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 52df3b49a..c2f9353fa 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 7d2b36c8f..be1ab5d01 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 332/401] 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 698834a3d..4e09bbbb1 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 c2f9353fa..f43f3e20b 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 38f357e2f..390ff4df1 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 333/401] 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 4e09bbbb1..22ab5e1f6 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 f43f3e20b..7e5650668 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 390ff4df1..75aeb4bf3 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 70a7a81aea8b9df6b6e7af10c8cadbbb763bcf08 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 12 Mar 2023 05:33:53 +0000 Subject: [PATCH 334/401] 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 22ab5e1f6..0d615458a 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 7e5650668..7d51c6db7 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 75aeb4bf3..901bb5811 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 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 335/401] [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 bbd67aded..03d3587a6 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 e926e9ad0..d30cb53aa 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 cad08e19d..568b45eda 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 85690be2c..5bd694fa0 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 336/401] 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 0d615458a..f26c40ae8 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 c97832f38..ebc4c3b83 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 6488414ff..6a01f8585 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 984df18d4945078b76055e00f96aba2ce1e19bc1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 16:49:31 +0000 Subject: [PATCH 337/401] 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 f26c40ae8..c513f0d95 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 ebc4c3b83..c6fd8b0ab 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 6a01f8585..027f5d4ea 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 338/401] 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 c513f0d95..bea49ce3c 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 c6fd8b0ab..41ac374ec 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 027f5d4ea..0b78522a0 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 a7b826c98184e97ee81572f52dc1b5e0bc9e18a7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Mar 2023 16:00:36 +0000 Subject: [PATCH 339/401] 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 41ac374ec..9f16a5d16 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 0b78522a0..ac761201a 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 50050b19ed5bf45225d668d4a07cca7c21d33ee9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 16:14:19 +0000 Subject: [PATCH 340/401] 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 bea49ce3c..d48582a42 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 9f16a5d16..9d2325c80 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 ac761201a..e91e0a4f8 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 3d2f6cc5e6d748d4fca121c026fad8d422d22b2f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 19:20:40 +0000 Subject: [PATCH 341/401] 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 d48582a42..105358b16 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 9d2325c80..c188eebb1 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 e91e0a4f8..062ebcdd9 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 bfd6ec740e905beb535ce88d63cc54568ae54c3c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 22:08:20 +0000 Subject: [PATCH 342/401] 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 105358b16..2050fdc98 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 c188eebb1..7e1bdec8a 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 062ebcdd9..5f40fcf56 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 343/401] 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 2050fdc98..dee0d7d6f 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 7e1bdec8a..cbf0b4598 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 5f40fcf56..ccb8e2479 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 7d884aa771f89625f9191b28f482006c93c9cb0a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Apr 2023 10:33:43 -0700 Subject: [PATCH 344/401] 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 568b45eda..ee7f8503c 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 345/401] [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 dee0d7d6f..bb95457fe 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 cbf0b4598..b43e4b469 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 e39ad4f17..3cd2ea603 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 5bd694fa0..1f0711594 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 346/401] 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 bb95457fe..074ca0c70 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 b43e4b469..1ecd1190b 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 8eab0dc13..783422594 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 87380a18ebe0118506aba93c47d3f2313286c984 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Apr 2023 16:36:52 +0000 Subject: [PATCH 347/401] 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 074ca0c70..a0c2db74e 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 1ecd1190b..cb93eb12a 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 783422594..398ff8575 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 01c1454fb13059ffee1edf4d6a0bdef83424a7d3 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 May 2023 10:59:56 -0700 Subject: [PATCH 348/401] 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 8eab0dc13..1fe96be53 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 1d5188379db294dec0753666898e1fec0ea8fa16 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 May 2023 23:56:26 +0000 Subject: [PATCH 349/401] 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 a0c2db74e..5addf7d71 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 cb93eb12a..25aeedd4e 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 49ec29055..ed23edb1a 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 98c3e32451300747fb3d8c5d1407fdd80d0b2b92 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 May 2023 20:43:21 +0000 Subject: [PATCH 350/401] 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 5addf7d71..e6b836bc7 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 25aeedd4e..6c605f6ce 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 ed23edb1a..54ff10e4b 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 351/401] 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 e6b836bc7..6cf1e814d 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 6c605f6ce..955547a0e 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 54ff10e4b..12e8015b3 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 e4bd2e65f0a29182f870652d97a91a410bff0e64 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 14:30:15 +0000 Subject: [PATCH 352/401] 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 6cf1e814d..7d8b1d42f 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 955547a0e..95a7cbfbd 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 12e8015b3..be23a6ad2 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 b8721936343cc594471dc0d093dbd7d0277d883f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 15:28:27 +0000 Subject: [PATCH 353/401] 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 7d8b1d42f..32e2719f0 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 95a7cbfbd..80692ddc3 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 be23a6ad2..4c93d9cd3 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 af57c55c7f0cb20fbfa5c148cc91d13a6d3163ef Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 21:28:07 +0000 Subject: [PATCH 354/401] 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 80692ddc3..9c82f3384 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 4c93d9cd3..4b2f93c6e 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 02627d94e213afd3e8c9dc085dbf652399590f51 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 22:23:16 +0000 Subject: [PATCH 355/401] 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 32e2719f0..fb5f93c07 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 9c82f3384..28470fa9b 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 4b2f93c6e..437ca086f 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 356/401] 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 fb5f93c07..8e5a345de 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 28470fa9b..d3289d5b4 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 437ca086f..14811a9e4 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 35376d26f102a4446d5b1fae21ef37b1ba60161e Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Jun 2023 13:10:53 -0700 Subject: [PATCH 357/401] 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 1fe96be53..84717c399 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 c9f58f8391c90df2c65d89d8b3383e1004c424d8 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 13 Jun 2023 11:26:29 -0700 Subject: [PATCH 358/401] 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 2bf456f30..fb41f0bad 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 298f1196d19c18952566381428b06260fb4b1d1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 20:46:29 +0000 Subject: [PATCH 359/401] 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 8e5a345de..7dd0c5e03 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 d3289d5b4..e3a560abf 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 c9da3f850..3fbf82613 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 547d878da..0e10e7db6 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 000000000..babc2757d --- /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 1f0711594..b358f87d3 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 f2c3021a191dd372625cd073d9630252ec1c26ed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Jun 2023 22:40:28 +0000 Subject: [PATCH 360/401] 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 7dd0c5e03..85cbee834 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 e3a560abf..ad7b66fe2 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 3fbf82613..10532ddac 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 4359922858a58e60c62804abe186cebc15fc389c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 19 Jun 2023 10:36:43 -0700 Subject: [PATCH 361/401] 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 3fbf82613..4083592e2 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 9dbd715de3b00bbf659eeb96681cfd173d09e2a7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 19:19:00 +0000 Subject: [PATCH 362/401] 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 85cbee834..1830d5f48 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 ad7b66fe2..803276a6c 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 240166714..066f0b330 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 908566b3a2e422029b7bd8b14aedd13f9e946937 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 04:45:50 +0000 Subject: [PATCH 363/401] 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 1830d5f48..2d1e748e3 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 803276a6c..d1fa89201 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 066f0b330..e840acb81 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 364/401] 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 2d1e748e3..7eebbc30b 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 d1fa89201..a9b4d7bb0 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 e840acb81..9e235edf1 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 ee124f7fe1946ba82febd79ef25c3040de461d3a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 23 Jun 2023 00:23:54 +0000 Subject: [PATCH 365/401] 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 a9b4d7bb0..9983da94a 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 9e235edf1..df96cf839 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 c6222f0702596c999af7cfe453f95135bbcd821f Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 5 Jul 2023 14:38:50 -0700 Subject: [PATCH 366/401] 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 4083592e2..21add4a97 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 367/401] [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 21add4a97..f9d19a1e0 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 b358f87d3..31e65ea4d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.118", + "dotnet": "6.0.119", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" From 65db63eb44f459af9c57a288c4b49e0147ad6cc3 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 10 Jul 2023 08:06:04 -0500 Subject: [PATCH 368/401] 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 b82faadcd..70f2cdd0f 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 369/401] 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 70f2cdd0f..3176d939b 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 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 370/401] [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 7eebbc30b..03d3587a6 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 9983da94a..e89c33bea 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 dc8513d92..1c288da7d 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 31e65ea4d..3364ad030 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 310c694977bdbf1754c5ee8b396785eea7b223f3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jul 2023 13:06:23 +0000 Subject: [PATCH 371/401] 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 03d3587a6..3d8f2fb68 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 e89c33bea..1f6d6250d 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 a1ce0ea15..bd1118896 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 10710f7d8e8fa29aea83b7ba59c0e169a7afc008 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Jul 2023 21:13:18 +0000 Subject: [PATCH 372/401] 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 3d8f2fb68..adbb45577 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 1f6d6250d..a5554bca6 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 bd1118896..97effa0a5 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 74e217fbe..000000000 --- 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 eccb361192f2f1e70224c47be9579afe12c07b5c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Aug 2023 11:01:05 -0700 Subject: [PATCH 373/401] 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 a1ce0ea15..b4f44346e 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 374/401] 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 adbb45577..36c723357 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 a5554bca6..bd159ad10 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 97effa0a5..3d2372ddc 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 10caa4a7f128d436eb91b5fa081787c36d6a8568 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Aug 2023 21:55:54 +0000 Subject: [PATCH 375/401] 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 bd159ad10..26beb5cd6 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 3d2372ddc..6e6c35af7 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 376/401] 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 36c723357..f27f973a5 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 26beb5cd6..606e014f2 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 6e6c35af7..bd4f80d85 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 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 377/401] [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 adbb45577..f27f973a5 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 a5554bca6..9c3d54c5e 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 384dc7844..891c7b729 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 3364ad030..327cfe027 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 378/401] 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 606e014f2..024d08ad0 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 bd4f80d85..93c78b957 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 14f5e6b15b38d00384047f85bd4ac669457a1231 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 17:49:53 +0000 Subject: [PATCH 379/401] 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 f27f973a5..98c2f6245 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 d9a07d567..62d6bee3a 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 76663d25f..a10ada7e5 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 9496edd76d185be0be2375b23c06a6d5bba008c6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 21:51:17 +0000 Subject: [PATCH 380/401] 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 98c2f6245..770aaf731 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 62d6bee3a..b2e17d560 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 a10ada7e5..0002da27c 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 18862d431c696379569985e36be608b3b97f0b14 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 23:47:21 +0000 Subject: [PATCH 381/401] 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 770aaf731..c537de642 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 b2e17d560..05893bc10 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 0002da27c..362ce3c9b 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 59f938949d658dce176aa88d81c2482539ea43c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 18:51:57 +0000 Subject: [PATCH 382/401] 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 c537de642..61be111e9 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 05893bc10..e3e33729b 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 362ce3c9b..54b7f57fb 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 383/401] 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 61be111e9..434639dcd 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 e3e33729b..1da055bfe 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 54b7f57fb..6c627b3e6 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 384/401] 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 434639dcd..3a4103200 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 1da055bfe..1c26110b6 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 6c627b3e6..27b45b91b 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 7806d7511ad97589e42ad415e1d740131fc451a1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 18:40:03 +0000 Subject: [PATCH 385/401] 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 3a4103200..19715c85a 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 1c26110b6..2dbb1a3e0 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 27b45b91b..4ff72a28c 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 c0954c6acae2cc7ef58ad877382e593deaf1659f Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:26:58 -0700 Subject: [PATCH 386/401] 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 10e567eb8..583c355f0 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 03c33a186a1ff4982c846da5c3959661227e07dc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 00:05:59 +0000 Subject: [PATCH 387/401] 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 f27f973a5..99b3e6dd7 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 9c3d54c5e..f67f720d0 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 583c355f0..5040b1d4c 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 d1579c4f20e5f83e8a5a61dbd08b958a8ac7a0d2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:19 +0000 Subject: [PATCH 388/401] 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 f67f720d0..4b55484dc 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 5040b1d4c..2c7878bd4 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 389/401] 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 4b55484dc..8ca09bc8a 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 2c7878bd4..49d76812f 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 390/401] 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 8ca09bc8a..f82d016f4 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 49d76812f..dca8bdc9e 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 391/401] 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 99b3e6dd7..b92191712 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 f82d016f4..f7baaa280 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 dca8bdc9e..ed174f841 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 7e2be1f5074f3df4b492d2f08181a23d041b4c68 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:04:00 +0000 Subject: [PATCH 392/401] 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 b92191712..a14489bf7 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 f7baaa280..2c06860d8 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 ed174f841..77d04c9bf 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 393/401] 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 2c06860d8..c727f2dcc 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 77d04c9bf..94567f8c9 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 76985f56fb3dba1609c07f38a96da85069959957 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:10 +0000 Subject: [PATCH 394/401] 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 c727f2dcc..9e254f0b3 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 94567f8c9..f8f42a414 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 f68ad03f61c60c15f139226c4aae0119b7d35e60 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:17 +0000 Subject: [PATCH 395/401] 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 9e254f0b3..aa6ea5906 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 f8f42a414..c56f8747d 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 68bd681d7c03f3c7c61c66ebc18bb4c8539d11d0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:24 +0000 Subject: [PATCH 396/401] 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 aa6ea5906..dc6793b95 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 c56f8747d..6e00936c8 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 d93ea239eefc0c499f3e92060ac88bbb121df4ed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:31 +0000 Subject: [PATCH 397/401] 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 dc6793b95..2c06860d8 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 6e00936c8..77d04c9bf 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 462a63808716c6525ede956568cdd8df6d25f575 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 30 Sep 2023 17:58:22 +0000 Subject: [PATCH 398/401] 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 a14489bf7..23ad3ebc8 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 2c06860d8..e4e428567 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 77d04c9bf..fae520d6b 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 6963d2d1e0eb7c42b773f62b1d34fe34a7182d17 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:15:18 +0000 Subject: [PATCH 399/401] 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 e4e428567..05566786f 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 fae520d6b..ef5eb1b77 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 b29045dcd48dbbf1944d5de492a12245900ea5f1 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:44 -0700 Subject: [PATCH 400/401] 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 ff1a589ee..865235900 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 401/401] [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 23ad3ebc8..9401b3f64 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 05566786f..688060474 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 f4ece0e92..fac630493 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 000000000..e7ba975ad --- /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 000000000..83d97a26a --- /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 327cfe027..eeff7fa00 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" } }