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..1e7c4d0d4 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
- 8963eb7d0f371d688809146cf75c847987420b86
+ 96158ed63a3e3292a70d2e433accd04abd37e8f3
-
+
https://github.com/dotnet/sdk
- 8963eb7d0f371d688809146cf75c847987420b86
+ 96158ed63a3e3292a70d2e433accd04abd37e8f3
@@ -121,13 +121,13 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
fcb07d637abf53791e2c55c63d9207fc3232fe83
-
+
https://github.com/dotnet/fsharp
- 8854f5d1f3bd7e60d42565a18a2f8c06ae307474
+ ce3bef742571a73fd3cda862b6b07e1431819b06
-
+
https://github.com/dotnet/fsharp
- 8854f5d1f3bd7e60d42565a18a2f8c06ae307474
+ ce3bef742571a73fd3cda862b6b07e1431819b06
@@ -141,19 +141,19 @@
linker
-
+
https://github.com/dotnet/roslyn
- 8b5c5b8e817c4299f2693ce7a16fe1465de1d9c4
+ afe689ab1a902bde4af3c6c5e419f898b9347fb3
-
+
https://github.com/dotnet/msbuild
- 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b
+ 7c4597ea0ba65a2702f9f93016de94999c2a3c2c
-
+
https://github.com/nuget/nuget.client
- 6f54dbd49fcda01ca8d71eb4fa4eea6ef54379ab
+ 5ac16d75a58665c240cd8ac267c0382a5d34cb75
diff --git a/eng/Versions.props b/eng/Versions.props
index f800c1c27..c264dee60 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -7,14 +7,14 @@
6
0
- 3
- 01
+ 4
+ 00
$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)
- rtm
+ preview
$(VersionMajor).$(VersionMinor)
$(MajorMinorVersion).$(VersionSDKMinor)
- true
+ false
release
@@ -31,7 +31,7 @@
- 6.0.300-preview.22208.4
+ 6.0.400-preview.22223.2
@@ -56,8 +56,8 @@
- 6.0.300-preview.22212.3
- 6.0.300-preview.22212.3
+ 6.0.400-preview.22253.2
+ 6.0.400-preview.22253.2
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -113,7 +113,7 @@
$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)
$(NUnit3DotNetNewTemplatePackageVersion)
$(MicrosoftDotNetCommonItemTemplatesPackageVersion)
- 6.0.300-preview.22208.4
+ 6.0.400-preview.22223.2
$(MicrosoftAspNetCoreAppRuntimePackageVersion)
$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)
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);