Installer updates (Merge to SDK Changeset)

.editorconfig

@@ -41,7 +41,7 @@ dotnet_style_qualification_for_event = false:suggestion
 # only use var when it's obvious what the variable type is
 csharp_style_var_for_built_in_types = false:none
 csharp_style_var_when_type_is_apparent = false:none
-csharp_style_var_elsewhere = false:suggestion
+csharp_style_var_elsewhere = false:none
 
 # use language keywords instead of BCL types
 dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion

.gitattributes

@@ -1,13 +1,13 @@
-*.doc  diff=astextplain
-*.DOC	diff=astextplain
-*.docx	diff=astextplain
-*.DOCX	diff=astextplain
-*.dot	diff=astextplain
-*.DOT	diff=astextplain
-*.pdf	diff=astextplain
-*.PDF	diff=astextplain
-*.rtf	diff=astextplain
-*.RTF	diff=astextplain
+*.doc	binary
+*.DOC	binary
+*.docx	binary
+*.DOCX	binary
+*.dot	binary
+*.DOT	binary
+*.pdf	binary
+*.PDF	binary
+*.rtf	binary
+*.RTF	binary
 
 *.jpg  	binary
 *.png 	binary
@@ -52,4 +52,4 @@
 *.fsproj text=auto
 *.dbproj text=auto
 *.xlf text=auto
-*.sln text=auto eol=crlf
+*.sln text=auto eol=crlf

Directory.Build.props

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-
-  <PropertyGroup Condition="'$(CopyrightNetFoundation)' != ''">
-    <Copyright>$(CopyrightNetFoundation)</Copyright>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-  </PropertyGroup>
+<!-- Platform needs to be set with TreatAsLocalProperty since it is a global property and cannot be overridden otherwise. -->
+<Project TreatAsLocalProperty="Platform">
 
   <PropertyGroup>
     <BuildArchitecture Condition="'$(BuildArchitecture)' == ''">$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
@@ -14,7 +9,24 @@
     <Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</Architecture>
     <Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'loongarch64'">$(BuildArchitecture)</Architecture>
     <Architecture Condition="'$(Architecture)' == ''">x64</Architecture>
+
+    <!--
+      The finalizer project needs to have Platform set to build for the correct architecture.
+      Platform needs to be set prior to calling the Arcade SDK, which sets PlatformName in RepoDefaults.props and modifies the OutputPath in ProjectLayout.props to include a PlatformName folder in the path.
+      Currently, build.cmd calls run-build.ps1, which always sets the Architecture.
+      However, if you wanted to build the finalizer project directly, the Architecture will use the logic above to be set properly, and thus maintain the correct OutputPath.
+      Note: The redist project does use Architecture. The Arcade SDK does not use either BuildArchitecture or Architecture.
+    -->
+    <Platform Condition="'$(SetPlatformFromArchitecture)' == 'true' And ('$(Platform)' == '' Or '$(Platform)' == 'AnyCPU')">$(Architecture)</Platform>
   </PropertyGroup>
+
+  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
+  <PropertyGroup Condition="'$(CopyrightNetFoundation)' != ''">
+    <Copyright>$(CopyrightNetFoundation)</Copyright>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(PgoInstrument)' == 'true'">
     <SkipBuildingInstallers>true</SkipBuildingInstallers>
     <PgoTerm>-pgo</PgoTerm>

Microsoft.DotNet.Cli.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28603.18
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34112.27
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}"
 EndProject
@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks", "src\core-
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{78E15EC1-7732-41E3-8591-934E9F583254}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkResolver", "src\SdkResolver\SdkResolver.csproj", "{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dotnet.Sdk.Internal", "src\Microsoft.Dotnet.Sdk.Internal\Microsoft.Dotnet.Sdk.Internal.csproj", "{73F07908-981B-41BB-B9BD-F3420274A6F7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkTests", "test\SdkTests\SdkTests.csproj", "{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}"
@@ -45,10 +43,6 @@ Global
 		{78E15EC1-7732-41E3-8591-934E9F583254}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73F07908-981B-41BB-B9BD-F3420274A6F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73F07908-981B-41BB-B9BD-F3420274A6F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73F07908-981B-41BB-B9BD-F3420274A6F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -70,7 +64,6 @@ Global
 		{1BFF54F9-4E35-49DB-893C-AF2047722FC6} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
-		{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{CB1EE94E-CB83-4071-9DD0-9929AE2B7282} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{658EF9BE-452C-4D31-AA24-B9E2235799A8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 	EndGlobalSection

eng/AfterSigning.targets

@@ -1,24 +1,23 @@
-<Project>  
+<Project>
+
   <PropertyGroup>
     <_SuppressSdkImports>false</_SuppressSdkImports>
   </PropertyGroup>
 
-  <Target Name="PopulateGenerateChecksumItems"
-          AfterTargets="Build"
-          BeforeTargets="GenerateChecksums" >
-
+  <Target Name="PopulateGenerateChecksumItems" AfterTargets="Build" BeforeTargets="GenerateChecksums">
     <ItemGroup>
       <InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.msi" />
       <InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.exe" />
       <InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.zip" Exclude="$(ArtifactsShippingPackagesDir)**\*.wixpack.zip" />
       <InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.tar.gz" />
       <InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.deb" />
       <InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.rpm" />
-      <GenerateChecksumItems Include="%(InstallerFiles.Identity)" >
+      <GenerateChecksumItems Include="%(InstallerFiles.Identity)">
         <DestinationPath>%(FullPath).sha512</DestinationPath>
       </GenerateChecksumItems>
     </ItemGroup>
   </Target>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
 </Project>

eng/Build.props

@@ -12,9 +12,8 @@
         <!-- Regular build -->
         <ItemGroup>
           <ProjectToBuild Include="$(RepoRoot)Microsoft.DotNet.Cli.sln" />
-          <ProjectToBuild Condition="'$(OS)' == 'Windows_NT' And ('$(Architecture)' == 'x86' Or '$(Architecture)' == 'x64' Or '$(Architecture)' == 'arm64' Or '$(Architecture)' == 'arm')"
-                          Include="$(RepoRoot)eng\version.csproj;
-                                   $(RepoRoot)eng\native.proj" />
+          <ProjectToBuild Condition="'$(OS)' == 'Windows_NT' And ('$(Architecture)' == 'x86' Or '$(Architecture)' == 'x64' Or '$(Architecture)' == 'arm64')"
+                          Include="$(RepoRoot)src\finalizer\finalizer-build.csproj" />
         </ItemGroup>
       </Otherwise>
   </Choose>

eng/ManualVersions.props

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
 
-<!-- The following properties (unlike those in version.props) are maintained manually.  So
-     when there is a merge conflict, the highest version should generally be chosen, rather
-     than keeping what's in the branch, which is the usual strategy with version.props merge
-     conflicts.
-
-     Basically: In this file, choose the highest version when resolving merge conflicts.
+<!--
+  The following properties (unlike those in version.props) are maintained manually. So
+  when there is a merge conflict, the highest version should generally be chosen, rather
+  than keeping what's in the branch, which is the usual strategy with version.props merge
+  conflicts.
+
+  Basically: In this file, choose the highest version when resolving merge conflicts.
  -->
   <PropertyGroup>
     <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.31</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
@@ -16,4 +16,5 @@
     <MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.31</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
     <MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.31</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
   </PropertyGroup>
+
 </Project>

eng/Publishing.props

@@ -85,18 +85,15 @@
     <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)productCommit-*.txt.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false'" />
     <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)productVersion.txt.sha512" Condition=" '$(OS)' != 'Windows_NT' or '$(Architecture)' != 'x64'" />
     <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt.sha512" Condition=" '$(OS)' != 'Windows_NT' or '$(Architecture)' != 'x64'" />
-    <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.zip.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false' "/>
-    <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.tar.gz.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false' "/>
+    <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.zip.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false' " />
+    <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.tar.gz.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false' " />
   </ItemGroup>
 
   <Target Name="PublishSdkAssetsAndChecksums"
           BeforeTargets="Publish"
           Condition="$(DotNetPublishUsingPipelines)">
-
     <ReadLinesFromFile File="$(ArtifactsTmpDir)FullNugetVersion.version">
-      <Output
-          TaskParameter="Lines"
-          PropertyName="FullNugetVersion"/>
+      <Output TaskParameter="Lines" PropertyName="FullNugetVersion" />
     </ReadLinesFromFile>
 
     <ItemGroup>

eng/Signing.props

@@ -5,6 +5,7 @@
          custom publishing target. And should not be picked up by arcade's default publishing logic. -->
     <ItemsToSignPostBuild Remove="*.wixpack.zip" />
   </ItemGroup>
+
   <ItemGroup Condition="'$(PostBuildSign)' != 'true'">
     <ItemsToSign Remove="@(ItemsToSign)" />
     <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.exe" />
@@ -17,10 +18,7 @@
     <ExternalCertificateId Condition="'$(ExternalCertificateId)' == ''">3PartySHA2</ExternalCertificateId>
     <InternalCertificateId Condition="'$(InternalCertificateId)' == ''">MicrosoftDotNet500</InternalCertificateId>
 
-    <!--
-      Signing of shipping artifacts (layout, msi, bundle) are handled separately.
-      It is therefore expected that <ItemsToSign> could be an empty set.
-    -->
+    <!-- Signing of shipping artifacts (layout, msi, bundle) are handled separately. It is therefore expected that <ItemsToSign> could be an empty set. -->
     <AllowEmptySignList>true</AllowEmptySignList>
     <AllowEmptySignPostBuildList>true</AllowEmptySignPostBuildList>
 
@@ -33,6 +31,7 @@
     <FileSignInfo Include="MessagePack.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="Nerdbank.Streams.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="StreamJsonRpc.dll" CertificateName="$(ExternalCertificateId)" />
+    <FileSignInfo Include="Valleysoft.DockerCredsProvider.dll" CertificateName="$(ExternalCertificateId)" />
 
     <!-- Files in the layout that should not be signed -->
     <FileSignInfo Include="apphost.exe" CertificateName="None" />

eng/Versions.props

@@ -71,9 +71,9 @@
     <MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.4.24205.2</MicrosoftAspNetCoreAppRefPackageVersion>
     <MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.4.24205.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
     <VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24205.2</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
-    <dotnetdevcertsPackageVersion>9.0.0-preview.4.24205.2</dotnetdevcertsPackageVersion>
-    <dotnetuserjwtsPackageVersion>9.0.0-preview.4.24205.2</dotnetuserjwtsPackageVersion>
-    <dotnetusersecretsPackageVersion>9.0.0-preview.4.24205.2</dotnetusersecretsPackageVersion>
+    <DotnetDevCertsPackageVersion>9.0.0-preview.4.24205.2</DotnetDevCertsPackageVersion>
+    <DotnetUserJwtsPackageVersion>9.0.0-preview.4.24205.2</DotnetUserJwtsPackageVersion>
+    <DotnetUserSecretsPackageVersion>9.0.0-preview.4.24205.2</DotnetUserSecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
@@ -112,8 +112,7 @@
     <MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.4.24204.1</MicrosoftWindowsDesktopAppRefPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64    -->
-    <!-- version above and create aliases without the winx64 here for clarity elsewhere. -->
+    <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
     <MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppHostwinx64PackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
     <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
     <MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>

global.json

@@ -12,6 +12,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24203.1",
-    "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24203.1"
-  }
+    "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24203.1",
+    "Microsoft.Build.NoTargets": "3.7.0"  }
 }

run-build.ps1

@@ -24,9 +24,6 @@ if ($PgoInstrument) {
 
 if ($Sign) {
   $Parameters = "$Parameters -sign /p:SignCoreSdk=true"
-
-  # Workaround https://github.com/dotnet/arcade/issues/1776
-  $WarnAsError = $false
 }
 
 $Parameters = "$Parameters -WarnAsError `$$WarnAsError"

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt

@@ -82,12 +82,12 @@ src/fsharp/setup/resources/eula/*.rtf
 
 # False positive
 src/installer/src/core-sdk-tasks/BuildFPMToolPreReqs.cs|json
-src/installer/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html|cecill-c
+src/installer/src/redist/packaging/osx/resources/en.lproj/welcome.html|cecill-c
 src/installer/THIRD-PARTY-NOTICES|proprietary-license
 
 # Configuration, doesn't apply to source directly
 src/installer/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt
-src/installer/src/redist/targets/packaging/**/*.json
+src/installer/src/redist/packaging/**/*.json
 
 #
 # msbuild

src/core-sdk-tasks/AddMetadataIsPE.cs

@@ -26,16 +26,9 @@ public override bool Execute()
             {
                 var resultItem = new TaskItem(item);
                 item.CopyMetadataTo(resultItem);
-
-                if (File.Exists(resultItem.GetMetadata("FullPath")) &&
-                    HasMetadata(resultItem.GetMetadata("FullPath")))
-                {
-                    resultItem.SetMetadata("IsPE", "True");
-                }
-                else
-                {
-                    resultItem.SetMetadata("IsPE", "False");
-                }
+
+                var isPe = File.Exists(resultItem.GetMetadata("FullPath")) && HasMetadata(resultItem.GetMetadata("FullPath"));
+                resultItem.SetMetadata("IsPE", isPe.ToString());
 
                 resultItemsList.Add(resultItem);
             }