Merge branch 'release/9.0.3xx' into merge/release/9.0.1xx-to-release/9.0.3xx

Author: DonnaChen888

.vsts-ci.yml

@@ -5,7 +5,7 @@ trigger:
   branches:
     include:
     - main
-    - release/9.0.1xx
+    - release/9.0.3xx
     - internal/release/*
     - exp/*
 
@@ -22,6 +22,10 @@ parameters:
   displayName: Run A Test Build
   type: boolean
   default: false
+- name: enableArm64Job
+  displayName: Enables the ARM64 job
+  type: boolean
+  default: false
 
 variables:
 - template: /eng/pipelines/templates/variables/sdk-defaults.yml
@@ -99,14 +103,14 @@ extends:
         parameters:
           pool:
             name: $(DncEngInternalBuildPool)
-            image: 1es-windows-2022
+            image: windows.vs2022.amd64
             os: windows
           helixTargetQueue: windows.amd64.vs2022.pre
           oneESCompat:
             templateFolderName: templates-official
             publishTaskPrefix: 1ES.
           runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
-          locBranch: release/9.0.2xx
+          locBranch: main
           ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
             timeoutInMinutes: 90
             windowsJobParameterSets:
@@ -273,7 +277,7 @@ extends:
             name: Azure Pipelines
             image: macOS-latest
             os: macOS
-          helixTargetQueue: osx.13.amd64
+          helixTargetQueue: osx.15.amd64
           oneESCompat:
             templateFolderName: templates-official
             publishTaskPrefix: 1ES.
@@ -293,16 +297,21 @@ extends:
               publishArgument: $(_publishArgument)
               officialBuildProperties: $(_officialBuildProperties)
               runTests: false
+      ### ARM64 TESTBUILD ###
+      - ${{ if and(or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')), eq(parameters.enableArm64Job, true)) }}:
+        - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
+          parameters:
+            pool:
+              name: Azure Pipelines
+              vmImage: macOS-latest
+              os: macOS
+            helixTargetQueue: osx.13.arm64
+            macOSJobParameterSets:
+            - categoryName: TestBuild
+              buildArchitecture: arm64
+              runtimeIdentifier: osx-arm64
 
-      ############### SOURCE BUILD ###############
-      - template: /eng/common/templates-official/job/source-build.yml@self
-        parameters:
-          enableInternalSources: true
-          platform:
-            name: Managed
-            container: centosStream9
-            jobProperties:
-              timeoutInMinutes: 30
+# Remove the source build leg as we don't ship that outside of 1xx feature bands
 
       ############### DOTNET-FORMAT ###############
       - ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:

.vsts-pr.yml

@@ -9,6 +9,12 @@ pr:
     - release/*
     - internal/release/*
 
+parameters:
+- name: enableArm64Job
+  displayName: Enables the ARM64 job
+  type: boolean
+  default: false
+
 variables:
 - template: /eng/pipelines/templates/variables/sdk-defaults.yml
 # Variables used: DncEngPublicBuildPool
@@ -57,17 +63,22 @@ stages:
         name: Azure Pipelines
         vmImage: macOS-latest
         os: macOS
-      helixTargetQueue: osx.13.amd64.open
+      helixTargetQueue: osx.15.amd64.open
+  ### ARM64 ###
+  - ${{ if eq(parameters.enableArm64Job, true) }}:
+    - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
+      parameters:
+        pool:
+          name: Azure Pipelines
+          vmImage: macOS-latest
+          os: macOS
+        helixTargetQueue: osx.13.arm64.open
+        macOSJobParameterSets:
+        - categoryName: TestBuild
+          buildArchitecture: arm64
+          runtimeIdentifier: osx-arm64
 
-  ############### SOURCE BUILD ###############
-  - template: /eng/common/templates/job/source-build.yml
-    parameters:
-      enableInternalSources: true
-      platform:
-        name: Managed
-        container: centosStream9
-        jobProperties:
-          timeoutInMinutes: 30
+# Remove the source build leg as we don't ship that outside of 1xx feature bands
 
   ############### DOTNET-FORMAT ###############
   - template: /eng/dotnet-format/dotnet-format-integration.yml

CODEOWNERS

@@ -50,6 +50,10 @@
 /src/Cli/dotnet/commands/dotnet-vstest @dotnet/dotnet-testing-admin
 /test/dotnet-test.Tests @dotnet/dotnet-testing-admin
 /test/dotnet-vstest.Tests @dotnet/dotnet-testing-admin
+/test/dotnet-new.Tests @dotnet/dotnet-testing-admin
+/template_feed/Microsoft.DotNet.Common.*/content/MSTest* @dotnet/dotnet-testing-admin
+/template_feed/Microsoft.DotNet.Common.*/content/NUnit* @dotnet/dotnet-testing-admin
+/template_feed/Microsoft.DotNet.Common.*/content/XUnit* @dotnet/dotnet-testing-admin
 
 # Area-Templates
 /src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers

Directory.Packages.props

@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="$(RepositoryEngineeringDir)\dependabot\Packages.props" Condition="'$(RepositoryEngineeringDir)' != ''"/>
+  <Import Project="$(RepositoryEngineeringDir)\dependabot\Packages.props" Condition="'$(RepositoryEngineeringDir)' != ''" />
   <PropertyGroup>
     <!-- Using multiple feeds isn't supported by Maestro: https://github.com/dotnet/arcade/issues/14155. -->
     <NoWarn>$(NoWarn);NU1507</NoWarn>
@@ -8,11 +8,12 @@
   <ItemGroup>
     <PackageVersion Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     <PackageVersion Include="FluentAssertions.Json" Version="$(FluentAssertionsJsonVersion)" />
+    <PackageVersion Include="MessagePack" Version="2.5.187" />
     <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)" />
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesPackageVersion)"/>
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesPackageVersion)" />
     <PackageVersion Include="Microsoft.Build.NuGetSdkResolver" Version="$(MicrosoftBuildNuGetSdkResolverPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalyzerTestingVersion)" />
@@ -42,10 +43,9 @@
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
     <PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
     <PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
-    <PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistPackageVersion)" />
     <PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
     <PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
     <PackageVersion Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" />
@@ -65,7 +65,10 @@
     <PackageVersion Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
+    <PackageVersion Include="Microsoft.VisualStudio.Sdk" Version="17.2.32505.173" />
+    <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.11.435" />
     <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
+    <PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.52" />
     <PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
     <PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
     <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
@@ -94,11 +97,11 @@
     <PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
     <PackageVersion Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />
     <PackageVersion Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
-    <PackageVersion Include="System.Composition.AttributedModel" Version="$(SystemCompositionAttributedModelPackageVersion)"/>
-    <PackageVersion Include="System.Composition.Convention" Version="$(SystemCompositionConventionPackageVersion)"/>
-    <PackageVersion Include="System.Composition.Hosting" Version="$(SystemCompositionHostingPackageVersion)"/>
-    <PackageVersion Include="System.Composition.Runtime" Version="$(SystemCompositionRuntimePackageVersion)"/>
-    <PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)"/>
+    <PackageVersion Include="System.Composition.AttributedModel" Version="$(SystemCompositionAttributedModelPackageVersion)" />
+    <PackageVersion Include="System.Composition.Convention" Version="$(SystemCompositionConventionPackageVersion)" />
+    <PackageVersion Include="System.Composition.Hosting" Version="$(SystemCompositionHostingPackageVersion)" />
+    <PackageVersion Include="System.Composition.Runtime" Version="$(SystemCompositionRuntimePackageVersion)" />
+    <PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
     <PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
@@ -118,7 +121,7 @@
     <PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.4" />
     <PackageVersion Include="xunit" Version="$(XUnitVersion)" />
     <PackageVersion Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
-    <PackageVersion Include="xunit.console" Version="$(XUnitVersion)"/>
+    <PackageVersion Include="xunit.console" Version="$(XUnitVersion)" />
   </ItemGroup>
 
   <!-- Use different versions of Microsoft.Build.* depending on whether the output will be used in

eng/Signing.props

@@ -67,7 +67,6 @@
     <FileSignInfo Include="MessagePack.Annotations.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="MessagePack.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="Nerdbank.Streams.dll" CertificateName="$(ExternalCertificateId)" />
-    <FileSignInfo Include="StreamJsonRpc.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="CommandLine.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="FluentAssertions.dll" CertificateName="$(ExternalCertificateId)" />
@@ -81,6 +80,10 @@
     <FileSignInfo Include="Valleysoft.DockerCredsProvider.dll" CertificateName="$(ExternalCertificateId)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <FileSignInfo Include="StreamJsonRpc.dll" CertificateName="MicrosoftSHA2" />
+  </ItemGroup>
+
   <!-- Filter out any test packages from ItemsToSign -->
   <ItemGroup>
     <ItemsToSignPostBuild Remove="*tests*.nupkg" />

eng/SourceBuildPrebuiltBaseline.xml

@@ -22,53 +22,49 @@
     <UsagePattern IdentityGlob="Microsoft.Extensions.FileSystemGlobbing/*6.0.0*" />
     <UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.7.2" />
     <UsagePattern IdentityGlob="Microsoft.VisualStudio.Setup.Configuration.Interop/3.2.2146" />
-    <UsagePattern IdentityGlob="System.Collections.Immutable/8.0.0" />
+    <UsagePattern IdentityGlob="System.Collections.Immutable/9.0.0" />
     <UsagePattern IdentityGlob="System.CommandLine.Rendering/0.4.0-alpha.24112.1" />
-    <UsagePattern IdentityGlob="System.Composition/*8.0.0*" />
+    <UsagePattern IdentityGlob="System.Composition/*9.0.0*" />
     <UsagePattern IdentityGlob="System.Composition.AttributedModel/*7.0.0*" />
     <UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*7.0.0*" />
     <UsagePattern IdentityGlob="System.Composition.Convention/*7.0.0*" />
     <UsagePattern IdentityGlob="System.Composition.Hosting/*7.0.0*" />
     <UsagePattern IdentityGlob="System.Composition.Runtime/*7.0.0*" />
     <UsagePattern IdentityGlob="System.Composition.TypedParts/*7.0.0*" />
-    <UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
+    <UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/*9.0.0*" />
+    <UsagePattern IdentityGlob="System.Diagnostics.EventLog/*9.0.0*" />
     <UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
     <UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
-    <UsagePattern IdentityGlob="System.Reflection.Metadata/8.0.0" />
+    <UsagePattern IdentityGlob="System.Reflection.Metadata/9.0.0" />
     <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
 
-    <!-- (Don't include these for 9.0) Allow 8.0.2xx and higher to use any version of these packages since source build
-         is only applicable to 8.0.1xx. -->
-    <UsagePattern IdentityGlob="Microsoft.DotNet.Arcade.Sdk/*8.0.0*" />
-    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/*8.0.0*" />
-    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/8.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.DotNet.SourceBuild.Tasks/*8.0.0*" />
-    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Abstractions/8.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core/8.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core.Contracts/8.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Edge/8.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Orchestrator.RunnableProjects/8.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Utils/8.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.TemplateSearch.Common/8.0.*" />
-    <UsagePattern IdentityGlob="System.Drawing.Common/8.0.*" />
-    <UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
-    <UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
-    <UsagePattern IdentityGlob="Valleysoft.DockerCredsProvider/*" />
+    <!-- Transitive dependencies from MSBuild -->
+    <UsagePattern IdentityGlob="Microsoft.VisualStudio.SolutionPersistence/1.0.9" />
+    <UsagePattern IdentityGlob="System.Formats.Nrbf/*9.0.0*" />
+    <UsagePattern IdentityGlob="System.Buffers/*4.6.0*" />
+    <UsagePattern IdentityGlob="System.Memory/*4.6.0*" />
+    <UsagePattern IdentityGlob="System.Numerics.Vectors/*4.6.0*" />
 
     <!-- Transitive dependencies from roslyn -->
     <UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
-    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0.0" />
-    <UsagePattern IdentityGlob="Microsoft.Extensions.Options/8.0.0" />
-    <UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/8.0.0" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/9.0.0" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/9.0.0" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.Options/9.0.0" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/9.0.0" />
+    <UsagePattern IdentityGlob="System.Buffers/4.6.1" />
+    <UsagePattern IdentityGlob="System.Memory/4.6.2" />
+    <UsagePattern IdentityGlob="System.Numerics.Vectors/4.6.1" />
+    <UsagePattern IdentityGlob="System.Runtime.CompilerServices.Unsafe/6.1.*" />
+    <UsagePattern IdentityGlob="System.Threading.Tasks.Extensions/4.6.2" />
 
     <!-- Used only for publishing -->
     <UsagePattern IdentityGlob="Microsoft.Net.Compilers.Toolset.Framework/*" />
 
     <!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
     <UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.0.*" />
 
-    <UsagePattern IdentityGlob="System.IO.Pipelines/*8.0.0*" />
-    <UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
+    <UsagePattern IdentityGlob="System.IO.Pipelines/*9.0.0*" />
+    <UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*9.0.0*" />
   </IgnorePatterns>
 
 </UsageData>

eng/pipelines/templates/jobs/sdk-job-matrix.yml

@@ -12,9 +12,10 @@ parameters:
     runTestsAsTool: true
     # This job uses the build step for testing, so the extra test step is not necessary.
     runTests: false
-  - categoryName: TemplateEngine
-    testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
-    publishXunitResults: true
+  # Turn off template engine runs on Windows temporarily until agent images are updated
+  #- categoryName: TemplateEngine
+  #  testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
+  #  publishXunitResults: true
   - categoryName: AoT
     runAoTTests: true
   ### LINUX ###