Skip to content

Commit f026881

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into merge/release/9.0.2xx-to-release/9.0.3xx
2 parents c9b95db + b0eb9cc commit f026881

File tree

284 files changed

+3317
-1797
lines changed

Some content is hidden

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

284 files changed

+3317
-1797
lines changed

‎.vsts-ci.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ extends:
272272
name: Azure Pipelines
273273
image: macOS-latest
274274
os: macOS
275-
helixTargetQueue: osx.13.amd64
275+
helixTargetQueue: osx.15.amd64
276276
oneESCompat:
277277
templateFolderName: templates-official
278278
publishTaskPrefix: 1ES.
@@ -306,15 +306,7 @@ extends:
306306
buildArchitecture: arm64
307307
runtimeIdentifier: osx-arm64
308308

309-
############### SOURCE BUILD ###############
310-
- template: /eng/common/templates-official/job/source-build.yml@self
311-
parameters:
312-
enableInternalSources: true
313-
platform:
314-
name: Managed
315-
container: centosStream9
316-
jobProperties:
317-
timeoutInMinutes: 30
309+
# Remove the source build leg as we don't ship that outside of 1xx feature bands
318310

319311
############### DOTNET-FORMAT ###############
320312
- ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:

‎.vsts-pr.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ stages:
6363
name: Azure Pipelines
6464
vmImage: macOS-latest
6565
os: macOS
66-
helixTargetQueue: osx.13.amd64.open
66+
helixTargetQueue: osx.15.amd64.open
6767
### ARM64 ###
6868
- ${{ if eq(parameters.enableArm64Job, true) }}:
6969
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
@@ -78,15 +78,7 @@ stages:
7878
buildArchitecture: arm64
7979
runtimeIdentifier: osx-arm64
8080

81-
############### SOURCE BUILD ###############
82-
- template: /eng/common/templates/job/source-build.yml
83-
parameters:
84-
enableInternalSources: true
85-
platform:
86-
name: Managed
87-
container: centosStream9
88-
jobProperties:
89-
timeoutInMinutes: 30
81+
# Remove the source build leg as we don't ship that outside of 1xx feature bands
9082

9183
############### DOTNET-FORMAT ###############
9284
- template: /eng/dotnet-format/dotnet-format-integration.yml

‎Directory.Packages.props‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<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)" />
48-
<PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistPackageVersion)" />
4948
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
5049
<PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
5150
<PackageVersion Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" />
@@ -65,8 +64,10 @@
6564
<PackageVersion Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
6665
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
6766
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
67+
<PackageVersion Include="Microsoft.VisualStudio.Sdk" Version="17.2.32505.173" />
68+
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.11.435" />
6869
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
69-
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.28" />
70+
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.52" />
7071
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
7172
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
7273
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
@@ -91,9 +92,6 @@
9192
<PackageVersion Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
9293
<PackageVersion Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
9394
<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)" />
9795
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
9896
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
9997
<PackageVersion Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />

‎NuGet.config‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
<!-- Begin: Package sources from dotnet-emsdk -->
2929
<!-- End: Package sources from dotnet-emsdk -->
3030
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
31-
<add key="darc-pub-DotNet-msbuild-Trusted-7ad4e1c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7ad4e1c7/nuget/v3/index.json" />
31+
<add key="darc-pub-DotNet-msbuild-Trusted-fc19b05" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-fc19b051/nuget/v3/index.json" />
3232
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3333
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3434
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3535
<!-- Begin: Package sources from dotnet-runtime -->
3636
<!-- End: Package sources from dotnet-runtime -->
3737
<!-- Begin: Package sources from dotnet-templating -->
38-
<add key="darc-pub-dotnet-templating-ad75e8e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ad75e8e2/nuget/v3/index.json" />
38+
<add key="darc-pub-dotnet-templating-71d6ad5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-71d6ad51/nuget/v3/index.json" />
3939
<!-- End: Package sources from dotnet-templating -->
4040
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4141
<!-- End: Package sources from dotnet-windowsdesktop -->
@@ -55,6 +55,8 @@
5555
<add key="dotnet-tools-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json" />
5656
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
5757
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
58+
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
59+
<add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
5860
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
5961
<!-- Used for Rich Navigation indexing task -->
6062
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />

‎eng/Signing.props‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
<FileSignInfo Include="MessagePack.Annotations.dll" CertificateName="$(ExternalCertificateId)" />
6868
<FileSignInfo Include="MessagePack.dll" CertificateName="$(ExternalCertificateId)" />
6969
<FileSignInfo Include="Nerdbank.Streams.dll" CertificateName="$(ExternalCertificateId)" />
70-
<FileSignInfo Include="StreamJsonRpc.dll" CertificateName="$(ExternalCertificateId)" />
7170
<FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="$(ExternalCertificateId)" />
7271
<FileSignInfo Include="CommandLine.dll" CertificateName="$(ExternalCertificateId)" />
7372
<FileSignInfo Include="FluentAssertions.dll" CertificateName="$(ExternalCertificateId)" />
@@ -81,6 +80,10 @@
8180
<FileSignInfo Include="Valleysoft.DockerCredsProvider.dll" CertificateName="$(ExternalCertificateId)" />
8281
</ItemGroup>
8382

83+
<ItemGroup>
84+
<FileSignInfo Include="StreamJsonRpc.dll" CertificateName="MicrosoftSHA2" />
85+
</ItemGroup>
86+
8487
<!-- Filter out any test packages from ItemsToSign -->
8588
<ItemGroup>
8689
<ItemsToSignPostBuild Remove="*tests*.nupkg" />

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,43 +22,49 @@
2222
<UsagePattern IdentityGlob="Microsoft.Extensions.FileSystemGlobbing/*6.0.0*" />
2323
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.7.2" />
2424
<UsagePattern IdentityGlob="Microsoft.VisualStudio.Setup.Configuration.Interop/3.2.2146" />
25-
<UsagePattern IdentityGlob="System.Collections.Immutable/8.0.0" />
25+
<UsagePattern IdentityGlob="System.Collections.Immutable/9.0.0" />
2626
<UsagePattern IdentityGlob="System.CommandLine.Rendering/0.4.0-alpha.24112.1" />
27-
<UsagePattern IdentityGlob="System.Composition/*8.0.0*" />
27+
<UsagePattern IdentityGlob="System.Composition/*9.0.0*" />
2828
<UsagePattern IdentityGlob="System.Composition.AttributedModel/*7.0.0*" />
2929
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*7.0.0*" />
3030
<UsagePattern IdentityGlob="System.Composition.Convention/*7.0.0*" />
3131
<UsagePattern IdentityGlob="System.Composition.Hosting/*7.0.0*" />
3232
<UsagePattern IdentityGlob="System.Composition.Runtime/*7.0.0*" />
3333
<UsagePattern IdentityGlob="System.Composition.TypedParts/*7.0.0*" />
34-
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
34+
<UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/*9.0.0*" />
35+
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*9.0.0*" />
3536
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
3637
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
37-
<UsagePattern IdentityGlob="System.Reflection.Metadata/8.0.0" />
38+
<UsagePattern IdentityGlob="System.Reflection.Metadata/9.0.0" />
3839
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
3940

4041
<!-- Transitive dependencies from MSBuild -->
41-
<UsagePattern IdentityGlob="Microsoft.VisualStudio.SolutionPersistence/1.0.9" />
42+
<UsagePattern IdentityGlob="Microsoft.VisualStudio.SolutionPersistence/1.0.9" />
43+
<UsagePattern IdentityGlob="System.Formats.Nrbf/*9.0.0*" />
44+
<UsagePattern IdentityGlob="System.Buffers/*4.6.0*" />
45+
<UsagePattern IdentityGlob="System.Memory/*4.6.0*" />
46+
<UsagePattern IdentityGlob="System.Numerics.Vectors/*4.6.0*" />
4247

4348
<!-- Transitive dependencies from roslyn -->
4449
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
45-
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0.0" />
46-
<UsagePattern IdentityGlob="Microsoft.Extensions.Options/8.0.0" />
47-
<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" />
50+
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/9.0.0" />
51+
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/9.0.0" />
52+
<UsagePattern IdentityGlob="Microsoft.Extensions.Options/9.0.0" />
53+
<UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/9.0.0" />
54+
<UsagePattern IdentityGlob="System.Buffers/4.6.1" />
55+
<UsagePattern IdentityGlob="System.Memory/4.6.2" />
56+
<UsagePattern IdentityGlob="System.Numerics.Vectors/4.6.1" />
57+
<UsagePattern IdentityGlob="System.Runtime.CompilerServices.Unsafe/6.1.*" />
58+
<UsagePattern IdentityGlob="System.Threading.Tasks.Extensions/4.6.2" />
5359

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

5763
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
5864
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.0.*" />
5965

60-
<UsagePattern IdentityGlob="System.IO.Pipelines/*8.0.0*" />
61-
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
66+
<UsagePattern IdentityGlob="System.IO.Pipelines/*9.0.0*" />
67+
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*9.0.0*" />
6268
</IgnorePatterns>
6369

6470
</UsageData>

0 commit comments

Comments
 (0)