Skip to content

Commit 30078a2

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'release/9.0.2xx' into merge/release/9.0.1xx-to-release/9.0.2xx
2 parents cb195da + f6b778f commit 30078a2

File tree

1,034 files changed

+24676
-6954
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,034 files changed

+24676
-6954
lines changed

‎.vsts-ci.yml

Lines changed: 15 additions & 2 deletions
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.2xx
99
- internal/release/*
1010
- exp/*
1111

@@ -97,7 +97,7 @@ extends:
9797
parameters:
9898
pool:
9999
name: $(DncEngInternalBuildPool)
100-
image: 1es-windows-2022
100+
image: windows.vs2022.amd64
101101
os: windows
102102
helixTargetQueue: windows.amd64.vs2022.pre
103103
oneESCompat:
@@ -291,6 +291,19 @@ extends:
291291
publishArgument: $(_publishArgument)
292292
officialBuildProperties: $(_officialBuildProperties)
293293
runTests: false
294+
### ARM64 TESTBUILD ###
295+
- ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:
296+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
297+
parameters:
298+
pool:
299+
name: Azure Pipelines
300+
vmImage: macOS-latest
301+
os: macOS
302+
helixTargetQueue: osx.13.arm64
303+
macOSJobParameterSets:
304+
- categoryName: TestBuild
305+
buildArchitecture: arm64
306+
runtimeIdentifier: osx-arm64
294307

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

‎.vsts-pr.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ stages:
3939
name: $(DncEngPublicBuildPool)
4040
demands: ImageOverride -equals windows.vs2022.amd64.open
4141
os: windows
42-
helixTargetQueue: windows.amd64.vs2022.pre.open
42+
helixTargetQueue: windows.amd64.vs2022.pre.scout.open
4343

4444
############### LINUX ###############
4545
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
@@ -58,6 +58,18 @@ stages:
5858
vmImage: macOS-latest
5959
os: macOS
6060
helixTargetQueue: osx.13.amd64.open
61+
### ARM64 ###
62+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
63+
parameters:
64+
pool:
65+
name: Azure Pipelines
66+
vmImage: macOS-latest
67+
os: macOS
68+
helixTargetQueue: osx.13.arm64.open
69+
macOSJobParameterSets:
70+
- categoryName: TestBuild
71+
buildArchitecture: arm64
72+
runtimeIdentifier: osx-arm64
6173

6274
############### SOURCE BUILD ###############
6375
- template: /eng/common/templates/job/source-build.yml

‎CODEOWNERS

Lines changed: 4 additions & 0 deletions
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

Lines changed: 10 additions & 9 deletions
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)" />
@@ -94,11 +95,11 @@
9495
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
9596
<PackageVersion Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />
9697
<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)"/>
98+
<PackageVersion Include="System.Composition.AttributedModel" Version="$(SystemCompositionAttributedModelPackageVersion)" />
99+
<PackageVersion Include="System.Composition.Convention" Version="$(SystemCompositionConventionPackageVersion)" />
100+
<PackageVersion Include="System.Composition.Hosting" Version="$(SystemCompositionHostingPackageVersion)" />
101+
<PackageVersion Include="System.Composition.Runtime" Version="$(SystemCompositionRuntimePackageVersion)" />
102+
<PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)" />
102103
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
103104
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
104105
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
@@ -118,7 +119,7 @@
118119
<PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.4" />
119120
<PackageVersion Include="xunit" Version="$(XUnitVersion)" />
120121
<PackageVersion Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
121-
<PackageVersion Include="xunit.console" Version="$(XUnitVersion)"/>
122+
<PackageVersion Include="xunit.console" Version="$(XUnitVersion)" />
122123
</ItemGroup>
123124

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

‎NuGet.config

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,18 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspire -->
77
<!-- End: Package sources from dotnet-aspire -->
8-
<!-- Begin: Package sources from dotnet-emsdk -->
9-
<!-- End: Package sources from dotnet-emsdk -->
108
<!-- Begin: Package sources from dotnet-aspnetcore -->
119
<!-- End: Package sources from dotnet-aspnetcore -->
10+
<!-- Begin: Package sources from dotnet-emsdk -->
11+
<!-- End: Package sources from dotnet-emsdk -->
1212
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
13-
<add key="darc-pub-DotNet-msbuild-Trusted-f7f4b08" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-f7f4b086/nuget/v3/index.json" />
1413
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1514
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1615
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1716
<!-- Begin: Package sources from dotnet-runtime -->
1817
<!-- End: Package sources from dotnet-runtime -->
1918
<!-- Begin: Package sources from dotnet-templating -->
20-
<add key="darc-pub-dotnet-templating-b1003b4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44/nuget/v3/index.json" />
21-
<add key="darc-pub-dotnet-templating-b1003b4-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-9/nuget/v3/index.json" />
22-
<add key="darc-pub-dotnet-templating-b1003b4-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-7/nuget/v3/index.json" />
23-
<add key="darc-pub-dotnet-templating-b1003b4-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-6/nuget/v3/index.json" />
24-
<add key="darc-pub-dotnet-templating-b1003b4-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-5/nuget/v3/index.json" />
25-
<add key="darc-pub-dotnet-templating-b1003b4-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-4/nuget/v3/index.json" />
26-
<add key="darc-pub-dotnet-templating-b1003b4-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-3/nuget/v3/index.json" />
27-
<add key="darc-pub-dotnet-templating-b1003b4-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-2/nuget/v3/index.json" />
28-
<add key="darc-pub-dotnet-templating-b1003b4-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-1/nuget/v3/index.json" />
29-
<add key="darc-pub-dotnet-templating-cdb776d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-cdb776d3/nuget/v3/index.json" />
30-
<add key="darc-pub-dotnet-templating-5f2c1e5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5f2c1e54/nuget/v3/index.json" />
19+
<add key="darc-pub-dotnet-templating-c612cb7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c612cb73/nuget/v3/index.json" />
3120
<!-- End: Package sources from dotnet-templating -->
3221
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3322
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 8 additions & 0 deletions
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)