Merge branch 'main' into ApiDiff

Author: carlossanlop

.vsts-ci.yml

@@ -113,13 +113,13 @@ extends:
           - powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force
             displayName: Create artifacts/bin directory
           ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
-            timeoutInMinutes: 90
+            timeoutInMinutes: 180
             windowsJobParameterSets:
             ### OFFICIAL ###
             - categoryName: Official
               publishArgument: $(_publishArgument)
               signArgument: $(_signArgument)
-              officialBuildProperties: $(_officialBuildProperties)
+              officialBuildProperties: $(_officialBuildProperties) /p:BuildWorkloads=true
               enableDefaultArtifacts: true
               runTests: false
               publishRetryConfig: true
@@ -133,6 +133,8 @@ extends:
               runTests: false
               variables:
                 _SignType: real
+              dependsOn: Official_windows_x64
+              downloadManifestMsiPackages: true
             - categoryName: Official
               targetArchitecture: arm64
               publishArgument: $(_publishArgument)
@@ -141,6 +143,8 @@ extends:
               runTests: false
               variables:
                 _SignType: real
+              dependsOn: Official_windows_x64
+              downloadManifestMsiPackages: true
             ### PGO ###
             - categoryName: PGO
               pgoInstrument: true

Directory.Packages.props

@@ -8,6 +8,7 @@
   <ItemGroup>
     <PackageVersion Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
     <PackageVersion Include="AwesomeAssertions.Json" Version="$(AwesomeAssertionsJsonVersion)" />
+    <PackageVersion Include="MicroBuild.Plugins.SwixBuild.Dotnet" Version="1.1.87-gba258badda" />
     <PackageVersion Include="Microsoft.ApplicationInsights" Version="$(MicrosoftApplicationInsightsPackageVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion)" />
@@ -33,6 +34,8 @@
     <PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
     <PackageVersion Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
     <PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersPackageVersion)" />
+    <PackageVersion Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)" />
+    <PackageVersion Include="Microsoft.DotNet.Build.Tasks.Workloads" Version="$(MicrosoftDotNetBuildTasksWorkloadsPackageVersion)" />
     <PackageVersion Include="Microsoft.DotNet.DarcLib" Version="$(MicrosoftDotNetDarcLibVersion)" />
     <PackageVersion Include="Microsoft.DotNet.Installer.Windows.Security.TestData" Version="$(MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion)" />
     <PackageVersion Include="Microsoft.DotNet.SignCheck" Version="$(ArcadeSdkVersion)" />
@@ -46,7 +49,6 @@
     <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Ini" Version="$(MicrosoftExtensionsConfigurationIniVersion)" />
     <PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
-    <PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistPackageVersion)" />
     <PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
     <PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
     <PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />

eng/Build.props

@@ -4,16 +4,26 @@
        they depend on assets from other verticals that are built in the first build pass. -->
   <ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
                         '$(OS)' == 'Windows_NT' and
-                        '$(TargetArchitecture)' == 'x64'">
+                        '$(TargetArchitecture)' == 'x64' and
+                        '$(BuildWorkloads)' != 'true'">
     <ProjectToBuild Include="$(RepoRoot)src\Layout\VS.Redist.Common.Net.Core.SDK.MSBuildExtensions\VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.proj" DotNetBuildPass="2" />
     <ProjectToBuild Include="$(RepoRoot)src\Layout\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj" DotNetBuildPass="2" />
   </ItemGroup>
 
-  <!-- For product build, build the sdk bundle in the second build pass on windows as
+  <!-- For product build, build the Workloads in the second build pass on windows as
        it depends on assets from other verticals that are built in the first build pass. -->
   <ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
+                        '$(OS)' == 'Windows_NT' and
+                        '$(TargetArchitecture)' == 'x64' and
+                        '$(BuildWorkloads)' == 'true'">
+    <ProjectToBuild Include="$(RepoRoot)src\Workloads\VSInsertion\workloads.csproj" DotNetBuildPass="2" />
+  </ItemGroup>
+
+  <!-- For product build, build the sdk bundle in the third build pass on windows as
+       it depends on assets from other verticals that are built in the second build pass. -->
+  <ItemGroup Condition="'$(DotNetBuildPass)' == '3' and
                         '$(OS)' == 'Windows_NT'">
-    <ProjectToBuild Include="$(RepoRoot)src\Layout\redist\redist.csproj" DotNetBuildPass="2" />
+    <ProjectToBuild Include="$(RepoRoot)src\Layout\redist\redist.csproj" DotNetBuildPass="3" />
   </ItemGroup>
 
 </Project>

eng/Signing.props

@@ -34,15 +34,25 @@
     <FileSignInfo Include="comhost.dll" CertificateName="None" />
     <FileSignInfo Include="singlefilehost.exe" CertificateName="None" />
 
-    <!-- .ttf and .js files come in from some older aspnetcore packages (e.g. 2.1).
+    <!-- .ttf and .otf files come in from some older aspnetcore packages (e.g. 2.1).
           These files in the 5.0 packages are NOT signed. When doing postbuild signing,
           SignTool will recognize that the files in the installer zips came from the 5.0 packages
           pulled in from aspnetcore, and aspnetcore said not to sign them. This info is not
           available for the 2.1 packages, so we need to avoid signing these in this repo. -->
     <FileExtensionSignInfo Include=".ttf" CertificateName="None" />
     <FileExtensionSignInfo Include=".otf" CertificateName="None" />
-    <FileExtensionSignInfo Remove=".js" />
-    <FileExtensionSignInfo Include=".js" CertificateName="None" />
+
+    <!-- We don't need to code sign .js files because they are not used in Windows Script Host. -->
+    <FileExtensionSignInfo Update=".js" CertificateName="None" />
+
+    <!-- Skip signing .py files because they are already signed -->
+    <FileExtensionSignInfo Update=".py" CertificateName="None" />
+    <FileExtensionSignInfo Include=".pyd" CertificateName="None" />
+    <FileExtensionSignInfo Include=".cat" CertificateName="None" />
+
+    <!-- Zero length files should not be signed because it breaks signing/ESRP. -->
+    <FileSignInfo Include="__init__.py" CertificateName="None" />
+    <FileSignInfo Include="eggs.py" CertificateName="None" />
   </ItemGroup>
 
   <!--
@@ -55,6 +65,10 @@
     <FileSignInfo Include="Nerdbank.Streams.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="Valleysoft.DockerCredsProvider.dll" CertificateName="$(ExternalCertificateId)" />
+
+    <!-- Additionally, we need to notarize any .pkg files -->
+    <MacOSPkg Include="$(ArtifactsShippingPackagesDir)**/dotnet-sdk*.pkg" Exclude="$(ArtifactsShippingPackagesDir)**/dotnet-sdk-internal*.pkg" />
+    <FileSignInfo Include="@(MacOSPkg->'%(Filename)%(Extension)')" CertificateName="MacDeveloperWithNotarization" />
   </ItemGroup>
 
   <!-- Third party DLLs used in src projects that are not participating in source-build -->
@@ -84,6 +98,12 @@
               Kind="Package" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DotNetBuild)' != 'true' or '$(BuildWorkloads)' == 'true'">
+    <Artifact Include="$(VisualStudioSetupInsertionPath)\**\*.zip"
+              IsShipping="true"
+              Kind="Blob" />
+  </ItemGroup>
+
   <!-- Only publish this file from win-x64 so that we don't end up with duplicates. -->
   <ItemGroup Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(TargetArchitecture)' == 'x64' and '$(PgoInstrument)' != 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">
     <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productVersion.txt" />