Skip to content

Commit b9f973f

Browse files
v-wuzhaiv-wuzhai
committed
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into merge/release/9.0.1xx-to-release/9.0.2xx
2 parents fe6d1ce + 06f4989 commit b9f973f

File tree

1,089 files changed

+27545
-10541
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,089 files changed

+27545
-10541
lines changed

‎.vsts-ci.yml

+20-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ trigger:
55
branches:
66
include:
77
- main
8-
- release/9.0.1xx
8+
- release/9.0.3xx
99
- internal/release/*
1010
- exp/*
1111

@@ -22,6 +22,10 @@ parameters:
2222
displayName: Run A Test Build
2323
type: boolean
2424
default: false
25+
- name: enableArm64Job
26+
displayName: Enables the ARM64 job
27+
type: boolean
28+
default: false
2529

2630
variables:
2731
- template: /eng/pipelines/templates/variables/sdk-defaults.yml
@@ -94,14 +98,14 @@ extends:
9498
parameters:
9599
pool:
96100
name: $(DncEngInternalBuildPool)
97-
image: 1es-windows-2022
101+
image: windows.vs2022.amd64
98102
os: windows
99103
helixTargetQueue: windows.amd64.vs2022.pre
100104
oneESCompat:
101105
templateFolderName: templates-official
102106
publishTaskPrefix: 1ES.
103107
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
104-
locBranch: release/9.0.2xx
108+
locBranch: release/9.0.3xx
105109
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
106110
timeoutInMinutes: 90
107111
windowsJobParameterSets:
@@ -288,6 +292,19 @@ extends:
288292
publishArgument: $(_publishArgument)
289293
officialBuildProperties: $(_officialBuildProperties)
290294
runTests: false
295+
### ARM64 TESTBUILD ###
296+
- ${{ if and(or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')), eq(parameters.enableArm64Job, true)) }}:
297+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
298+
parameters:
299+
pool:
300+
name: Azure Pipelines
301+
vmImage: macOS-latest
302+
os: macOS
303+
helixTargetQueue: osx.13.arm64
304+
macOSJobParameterSets:
305+
- categoryName: TestBuild
306+
buildArchitecture: arm64
307+
runtimeIdentifier: osx-arm64
291308

292309
############### SOURCE BUILD ###############
293310
- template: /eng/common/templates-official/job/source-build.yml@self

‎.vsts-pr.yml

+19
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ pr:
99
- release/*
1010
- internal/release/*
1111

12+
parameters:
13+
- name: enableArm64Job
14+
displayName: Enables the ARM64 job
15+
type: boolean
16+
default: false
17+
1218
variables:
1319
- template: /eng/pipelines/templates/variables/sdk-defaults.yml
1420
# Variables used: DncEngPublicBuildPool
@@ -58,6 +64,19 @@ stages:
5864
vmImage: macOS-latest
5965
os: macOS
6066
helixTargetQueue: osx.13.amd64.open
67+
### ARM64 ###
68+
- ${{ if eq(parameters.enableArm64Job, true) }}:
69+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
70+
parameters:
71+
pool:
72+
name: Azure Pipelines
73+
vmImage: macOS-latest
74+
os: macOS
75+
helixTargetQueue: osx.13.arm64.open
76+
macOSJobParameterSets:
77+
- categoryName: TestBuild
78+
buildArchitecture: arm64
79+
runtimeIdentifier: osx-arm64
6180

6281
############### SOURCE BUILD ###############
6382
- template: /eng/common/templates/job/source-build.yml

‎CODEOWNERS

+4
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
/src/Cli/dotnet/commands/dotnet-vstest @dotnet/dotnet-testing-admin
5151
/test/dotnet-test.Tests @dotnet/dotnet-testing-admin
5252
/test/dotnet-vstest.Tests @dotnet/dotnet-testing-admin
53+
/test/dotnet-new.Tests @dotnet/dotnet-testing-admin
54+
/template_feed/Microsoft.DotNet.Common.*/content/MSTest* @dotnet/dotnet-testing-admin
55+
/template_feed/Microsoft.DotNet.Common.*/content/NUnit* @dotnet/dotnet-testing-admin
56+
/template_feed/Microsoft.DotNet.Common.*/content/XUnit* @dotnet/dotnet-testing-admin
5357

5458
# Area-Templates
5559
/src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers

‎Directory.Packages.props

+13-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
2-
<Import Project="$(RepositoryEngineeringDir)\dependabot\Packages.props" Condition="'$(RepositoryEngineeringDir)' != ''"/>
2+
<Import Project="$(RepositoryEngineeringDir)\dependabot\Packages.props" Condition="'$(RepositoryEngineeringDir)' != ''" />
33
<PropertyGroup>
44
<!-- Using multiple feeds isn't supported by Maestro: https://github.com/dotnet/arcade/issues/14155. -->
55
<NoWarn>$(NoWarn);NU1507</NoWarn>
@@ -12,7 +12,7 @@
1212
<PackageVersion Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)" />
1313
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion)" />
1414
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
15-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesPackageVersion)"/>
15+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesPackageVersion)" />
1616
<PackageVersion Include="Microsoft.Build.NuGetSdkResolver" Version="$(MicrosoftBuildNuGetSdkResolverPackageVersion)" />
1717
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
1818
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalyzerTestingVersion)" />
@@ -42,7 +42,7 @@
4242
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
4343
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" />
4444
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
45-
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
45+
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
4646
<PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
4747
<PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
4848
<PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistPackageVersion)" />
@@ -66,6 +66,7 @@
6666
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
6767
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
6868
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
69+
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.28" />
6970
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
7071
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
7172
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
@@ -90,15 +91,18 @@
9091
<PackageVersion Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
9192
<PackageVersion Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
9293
<PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" />
94+
<PackageVersion Include="System.Buffers" Version="$(SystemBuffersVersion)" />
95+
<PackageVersion Include="System.Memory" Version="$(SystemMemoryVersion)" />
96+
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
9397
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
9498
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
9599
<PackageVersion Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />
96100
<PackageVersion Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
97-
<PackageVersion Include="System.Composition.AttributedModel" Version="$(SystemCompositionAttributedModelPackageVersion)"/>
98-
<PackageVersion Include="System.Composition.Convention" Version="$(SystemCompositionConventionPackageVersion)"/>
99-
<PackageVersion Include="System.Composition.Hosting" Version="$(SystemCompositionHostingPackageVersion)"/>
100-
<PackageVersion Include="System.Composition.Runtime" Version="$(SystemCompositionRuntimePackageVersion)"/>
101-
<PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)"/>
101+
<PackageVersion Include="System.Composition.AttributedModel" Version="$(SystemCompositionAttributedModelPackageVersion)" />
102+
<PackageVersion Include="System.Composition.Convention" Version="$(SystemCompositionConventionPackageVersion)" />
103+
<PackageVersion Include="System.Composition.Hosting" Version="$(SystemCompositionHostingPackageVersion)" />
104+
<PackageVersion Include="System.Composition.Runtime" Version="$(SystemCompositionRuntimePackageVersion)" />
105+
<PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)" />
102106
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
103107
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
104108
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
@@ -118,7 +122,7 @@
118122
<PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.4" />
119123
<PackageVersion Include="xunit" Version="$(XUnitVersion)" />
120124
<PackageVersion Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
121-
<PackageVersion Include="xunit.console" Version="$(XUnitVersion)"/>
125+
<PackageVersion Include="xunit.console" Version="$(XUnitVersion)" />
122126
</ItemGroup>
123127

124128
<!-- Use different versions of Microsoft.Build.* depending on whether the output will be used in

‎NuGet.config

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@
2323
<!-- End: Package sources from dotnet-deployment-tools -->
2424
<!-- Begin: Package sources from dotnet-aspire -->
2525
<!-- End: Package sources from dotnet-aspire -->
26-
<!-- Begin: Package sources from dotnet-emsdk -->
27-
<add key="darc-pub-dotnet-emsdk-78be8cd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-78be8cdf/nuget/v3/index.json" />
28-
<!-- End: Package sources from dotnet-emsdk -->
2926
<!-- Begin: Package sources from dotnet-aspnetcore -->
3027
<add key="darc-int-dotnet-aspnetcore-d5dc8a1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d5dc8a13/nuget/v3/index.json" />
3128
<!-- End: Package sources from dotnet-aspnetcore -->
29+
<!-- Begin: Package sources from dotnet-emsdk -->
30+
<add key="darc-pub-dotnet-emsdk-78be8cd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-78be8cdf/nuget/v3/index.json" />
31+
<!-- End: Package sources from dotnet-emsdk -->
3232
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
33-
<add key="darc-pub-DotNet-msbuild-Trusted-762d7c2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-762d7c2e/nuget/v3/index.json" />
33+
<add key="darc-pub-DotNet-msbuild-Trusted-7a09d5e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7a09d5ee/nuget/v3/index.json" />
3434
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3535
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3636
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3737
<!-- Begin: Package sources from dotnet-runtime -->
3838
<add key="darc-int-dotnet-runtime-f57e6dc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f57e6dc7/nuget/v3/index.json" />
39+
<add key="darc-int-dotnet-runtime-5da49f4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-5da49f4e/nuget/v3/index.json" />
3940
<!-- End: Package sources from dotnet-runtime -->
4041
<!-- Begin: Package sources from dotnet-templating -->
41-
<add key="darc-pub-dotnet-templating-693a4fd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-693a4fd2/nuget/v3/index.json" />
42-
<add key="darc-pub-dotnet-templating-35eb08d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-35eb08d0/nuget/v3/index.json" />
42+
<add key="darc-pub-dotnet-templating-029cb83" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-029cb834/nuget/v3/index.json" />
4343
<!-- End: Package sources from dotnet-templating -->
4444
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4545
<add key="darc-int-dotnet-windowsdesktop-ef0ddf8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef0ddf89/nuget/v3/index.json" />

‎eng/SourceBuildPrebuiltBaseline.xml

+8
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,19 @@
3737
<UsagePattern IdentityGlob="System.Reflection.Metadata/8.0.0" />
3838
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
3939

40+
<!-- Transitive dependencies from MSBuild -->
41+
<UsagePattern IdentityGlob="Microsoft.VisualStudio.SolutionPersistence/1.0.9" />
42+
4043
<!-- Transitive dependencies from roslyn -->
4144
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
4245
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0.0" />
4346
<UsagePattern IdentityGlob="Microsoft.Extensions.Options/8.0.0" />
4447
<UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/8.0.0" />
48+
<UsagePattern IdentityGlob="System.Buffers/4.6.0" />
49+
<UsagePattern IdentityGlob="System.Memory/4.6.0" />
50+
<UsagePattern IdentityGlob="System.Numerics.Vectors/4.6.0" />
51+
<UsagePattern IdentityGlob="System.Runtime.CompilerServices.Unsafe/6.1.0" />
52+
<UsagePattern IdentityGlob="System.Threading.Tasks.Extensions/4.6.0" />
4553

4654
<!-- Used only for publishing -->
4755
<UsagePattern IdentityGlob="Microsoft.Net.Compilers.Toolset.Framework/*" />

0 commit comments

Comments
 (0)