Skip to content

Commit 082634c

Browse files
ForgindForgind
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into deps-json-has-extant-assemblies
2 parents 6e201bf + d3af530 commit 082634c

File tree

332 files changed

+6858
-2389
lines changed

Some content is hidden

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

332 files changed

+6858
-2389
lines changed

‎.github/workflows/pr-analysis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: PR Analysis
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, labeled, unlabeled]
5+
permissions:
6+
contents: read
7+
pull-requests: read
8+
jobs:
9+
allowed-labels:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Return error if branch is in lockdown or 'do not merge' label is present
13+
run: echo "Labels on this PR prevent it from being merged. Please contact the repo owners for more information." && exit 1
14+
if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') }}

‎.vsts-ci.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ trigger:
55
branches:
66
include:
77
- main
8-
- release/9.0.2xx
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
@@ -57,10 +61,7 @@ resources:
5761
ref: refs/tags/release
5862

5963
extends:
60-
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
61-
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
62-
${{ else }}:
63-
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
64+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
6465
parameters:
6566
containers:
6667
alpine319WithNode:
@@ -104,7 +105,7 @@ extends:
104105
templateFolderName: templates-official
105106
publishTaskPrefix: 1ES.
106107
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
107-
locBranch: release/9.0.2xx
108+
locBranch: release/9.0.3xx
108109
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
109110
timeoutInMinutes: 90
110111
windowsJobParameterSets:
@@ -292,7 +293,7 @@ extends:
292293
officialBuildProperties: $(_officialBuildProperties)
293294
runTests: false
294295
### ARM64 TESTBUILD ###
295-
- ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:
296+
- ${{ if and(or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')), eq(parameters.enableArm64Job, true)) }}:
296297
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
297298
parameters:
298299
pool:

‎.vsts-pr.yml

Lines changed: 19 additions & 12 deletions
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
@@ -39,7 +45,7 @@ stages:
3945
name: $(DncEngPublicBuildPool)
4046
demands: ImageOverride -equals windows.vs2022.amd64.open
4147
os: windows
42-
helixTargetQueue: windows.amd64.vs2022.pre.scout.open
48+
helixTargetQueue: windows.amd64.vs2022.pre.open
4349

4450
############### LINUX ###############
4551
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
@@ -59,17 +65,18 @@ stages:
5965
os: macOS
6066
helixTargetQueue: osx.13.amd64.open
6167
### 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
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
7380

7481
############### SOURCE BUILD ###############
7582
- template: /eng/common/templates/job/source-build.yml

‎Directory.Packages.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@
6565
<PackageVersion Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
6666
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
6767
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
68+
<PackageVersion Include="Microsoft.VisualStudio.Sdk" Version="17.2.32505.173" />
69+
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.11.435" />
6870
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
69-
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.28" />
71+
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.52" />
7072
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
7173
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
7274
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />

‎NuGet.config

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,21 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-deployment-tools -->
77
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-9/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-8/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-7/nuget/v3/index.json" />
11+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-6/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-5/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-4/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-3/nuget/v3/index.json" />
15+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-2/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-15/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-14/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-13" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-13/nuget/v3/index.json" />
19+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-12/nuget/v3/index.json" />
20+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-11/nuget/v3/index.json" />
21+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-10/nuget/v3/index.json" />
22+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-1/nuget/v3/index.json" />
823
<!-- End: Package sources from dotnet-deployment-tools -->
924
<!-- Begin: Package sources from dotnet-aspire -->
1025
<!-- End: Package sources from dotnet-aspire -->
@@ -19,7 +34,6 @@
1934
<!-- Begin: Package sources from dotnet-runtime -->
2035
<!-- End: Package sources from dotnet-runtime -->
2136
<!-- Begin: Package sources from dotnet-templating -->
22-
<add key="darc-pub-dotnet-templating-aaebde7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-aaebde79/nuget/v3/index.json" />
2337
<!-- End: Package sources from dotnet-templating -->
2438
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2539
<!-- End: Package sources from dotnet-windowsdesktop -->
@@ -39,6 +53,8 @@
3953
<add key="dotnet-tools-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json" />
4054
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
4155
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
56+
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
57+
<add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
4258
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
4359
<!-- Used for Rich Navigation indexing task -->
4460
<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: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,32 @@
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*" />
4244

4345
<!-- Transitive dependencies from roslyn -->
4446
<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" />
47+
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/9.0.0" />
48+
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/9.0.0" />
49+
<UsagePattern IdentityGlob="Microsoft.Extensions.Options/9.0.0" />
50+
<UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/9.0.0" />
4851
<UsagePattern IdentityGlob="System.Buffers/4.6.0" />
4952
<UsagePattern IdentityGlob="System.Memory/4.6.0" />
5053
<UsagePattern IdentityGlob="System.Numerics.Vectors/4.6.0" />
@@ -57,8 +60,8 @@
5760
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
5861
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.0.*" />
5962

60-
<UsagePattern IdentityGlob="System.IO.Pipelines/*8.0.0*" />
61-
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
63+
<UsagePattern IdentityGlob="System.IO.Pipelines/*9.0.0*" />
64+
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*9.0.0*" />
6265
</IgnorePatterns>
6366

6467
</UsageData>

0 commit comments

Comments
 (0)