From 407e1ca13652d79504d81e9d4fa380216f9a46a0 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Sun, 24 Apr 2022 21:27:50 -0700 Subject: [PATCH 01/16] 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 02/16] 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 03/16] 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 04/16] 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 05/16] 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 06/16] 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 07/16] 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 08/16] 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 09/16] 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 10/16] 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 11/16] 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 12/16] 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 13/16] 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 14/16] 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 15/16] 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 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 16/16] 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)