diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 4a2f5d8bf..c2af3ac8d 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/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 229d3fa85..877fb6bcc 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 - 416d9a7ab914340b357cff31bf49ba7e708f5a41 + + https://github.com/dotnet/templating + d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 416d9a7ab914340b357cff31bf49ba7e708f5a41 + + https://github.com/dotnet/templating + d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 416d9a7ab914340b357cff31bf49ba7e708f5a41 + + https://github.com/dotnet/templating + d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc262f0c444d57181e580d4d5b9a517ea558c64a + + https://github.com/dotnet/sdk + 4445b8be251722225295d23ad8c7607b294ba353 - - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc262f0c444d57181e580d4d5b9a517ea558c64a + + https://github.com/dotnet/sdk + 4445b8be251722225295d23ad8c7607b294ba353 @@ -121,18 +121,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 5063a17b211e70ca0ff6fed1b57e9d04727c25a8 - + https://github.com/dotnet/fsharp - 211fd760c2315d73cfa0d375fe64abb346bc1096 + 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 - + https://github.com/dotnet/fsharp - 211fd760c2315d73cfa0d375fe64abb346bc1096 + 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 - + https://github.com/microsoft/vstest - 717d0cf94925e9cf67466dbee46c1019930eb212 + c7ba2ca721808f830482ace6be06ae93077e0e7b @@ -141,19 +141,19 @@ linker - + https://github.com/dotnet/roslyn - 432d17a83aa5623e4581756f4d642997048056bd + 8b86c2058266c6069e71705623fe9f3b26b648cf - + https://github.com/dotnet/msbuild - 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b + 77c72dd0f1758e994cf2ebd2ddd6d1ada695d261 - + https://github.com/nuget/nuget.client - 4be14ee6b6587a02f05337505bd840fbcbe898f6 + 222ff7a5329be15520034b76fa1a84098d2ae9fd @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/source-build-reference-packages - bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b + 08e4967761f81c4c40b6872a0e639b4f588b4f00 diff --git a/eng/Versions.props b/eng/Versions.props index 537a5f54a..736bf9635 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,8 +7,8 @@ 6 0 - 3 - 04 + 4 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) @@ -31,7 +31,7 @@ - 6.0.302 + 6.0.400-preview.22358.2 @@ -56,8 +56,8 @@ - 6.0.302-servicing.22323.12 - 6.0.302-servicing.22323.12 + 6.0.400-preview.22364.3 + 6.0.400-preview.22364.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.302 + 6.0.400-preview.22358.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-release-20220408-11 + 17.3.0-release-20220708-01 @@ -178,13 +178,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) 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 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 @@ - - - - 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 - - - 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); diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 7b8536e48..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)"/> 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 @@ - + + + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 840a2133b..6fd052fb0 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), 28)) 17 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 88a053b61..60a6c6c5b 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -120,6 +120,12 @@ win-arm64 + + win-x86 + win-x64 + win-arm + + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) @@ -177,6 +183,13 @@ packs/%(PackageName)/%(PackageVersion) + + Microsoft.NETCore.App.Host.$(x64AppHostRid) + $(MicrosoftNETCoreAppHostPackageVersion) + $(TargetFramework) + packs/%(PackageName)/%(PackageVersion) + + $(CoreSetupRootUrl)$(CoreSetupBlobVersion)