Skip to content

Commit 5002a88

Browse files
author
Jason Zhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into merge/release/9.0.2xx-to-main
2 parents 519435d + d593861 commit 5002a88

File tree

355 files changed

+12351
-9666
lines changed

Some content is hidden

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

355 files changed

+12351
-9666
lines changed

.devcontainer/vmr/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// The container supports source-building the SDK
44
{
55
"name": "VMR with PR changes",
6-
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39",
6+
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9",
77
"hostRequirements": {
88
// A completely source built .NET is >64 GB with all the repos/artifacts
99
"storage": "128gb"

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
inputs:
99
daysBeforeStale:
1010
required: true
11-
default: "2192"
11+
default: "1827"
1212
daysBeforeClose:
1313
required: true
1414
default: "30"

.vsts-ci.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -293,14 +293,15 @@ extends:
293293
runTests: false
294294

295295
############### SOURCE BUILD ###############
296-
- template: /eng/common/templates-official/job/source-build.yml@self
297-
parameters:
298-
enableInternalSources: true
299-
platform:
300-
name: Managed
301-
container: centosStream9
302-
jobProperties:
303-
timeoutInMinutes: 30
296+
# Temporarily removed until the SDK can target net10. The assets produced by upstream repos
297+
# are net10, but this repo needs net9.
298+
# - template: /eng/common/templates-official/job/source-build.yml@self
299+
# parameters:
300+
# platform:
301+
# name: Managed
302+
# container: centosStream9
303+
# jobProperties:
304+
# timeoutInMinutes: 30
304305

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

.vsts-pr.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ pr:
88
- main
99
- release/*
1010
- internal/release/*
11+
paths:
12+
exclude:
13+
- documentation/*
14+
- README.md
15+
- CODEOWNERS
1116

1217
variables:
1318
- template: /eng/pipelines/templates/variables/sdk-defaults.yml
@@ -60,14 +65,15 @@ stages:
6065
helixTargetQueue: osx.13.amd64.open
6166

6267
############### SOURCE BUILD ###############
63-
- template: /eng/common/templates/job/source-build.yml
64-
parameters:
65-
enableInternalSources: true
66-
platform:
67-
name: Managed
68-
container: centosStream9
69-
jobProperties:
70-
timeoutInMinutes: 30
68+
# Temporarily removed until the SDK can target net10. The assets produced by upstream repos
69+
# are net10, but this repo needs net9.
70+
# - template: /eng/common/templates-official/job/source-build.yml@self
71+
# parameters:
72+
# platform:
73+
# name: Managed
74+
# container: centosStream9
75+
# jobProperties:
76+
# timeoutInMinutes: 30
7177

7278
############### DOTNET-FORMAT ###############
7379
- template: /eng/dotnet-format/dotnet-format-integration.yml

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<!-- NU1701 Disable implicit package target fallback, and disable warning for when we explicitly add it (currently needed for
4545
Microsoft.ApplicationInsights) -->
4646
<!-- NU1507 Disable multi-feed check as .NET uses multiple internal feeds intentionally -->
47-
<NoWarn>$(NoWarn);NU1701;NU1507</NoWarn>
47+
<NoWarn>$(NoWarn);NU1701;NU1507;NU1202</NoWarn>
4848
<!-- do not enable analyzers on source build-->
4949
<EnforceCodeStyleInBuild Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</EnforceCodeStyleInBuild>
5050
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>

Directory.Packages.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
3434
<PackageVersion Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
3535
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersPackageVersion)" />
36+
<PackageVersion Include="Microsoft.DotNet.DarcLib" Version="$(MicrosoftDotNetDarcLibVersion)" />
3637
<PackageVersion Include="Microsoft.DotNet.Installer.Windows.Security.TestData" Version="$(MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion)" />
3738
<PackageVersion Include="Microsoft.DotNet.SignCheck" Version="$(ArcadeSdkVersion)" />
3839
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
@@ -44,8 +45,8 @@
4445
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
4546
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
4647
<PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
47-
<PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
4848
<PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistPackageVersion)" />
49+
<PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
4950
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
5051
<PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
5152
<PackageVersion Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" />
@@ -101,6 +102,7 @@
101102
<PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)"/>
102103
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
103104
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
105+
<PackageVersion Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
104106
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
105107
<!-- System.Reflection.Metadata and System.Collections.Immutable cannot be pinned here because of hard dependencies within Roslyn on specific versions that have to work both here and in VS -->
106108
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="$(SystemReflectionMetadataLoadContextVersion)" />

NuGet.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspire -->
7-
<add key="darc-pub-dotnet-aspire-137e8dc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspire-137e8dca/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-aspire-137e8dc-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspire-137e8dca-1/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-aspire-a1f7880-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspire-a1f7880a-1/nuget/v3/index.json" />
98
<!-- End: Package sources from dotnet-aspire -->
109
<!-- Begin: Package sources from dotnet-aspnetcore -->
1110
<!-- End: Package sources from dotnet-aspnetcore -->
@@ -34,6 +33,8 @@
3433
<add key="dotnet8-workloads" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-workloads/nuget/v3/index.json" />
3534
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
3635
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
36+
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
37+
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
3738
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
3839
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
3940
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />

documentation/general/workloads/workload-diagnosis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ _Installation rollback failed: Workload manifest dependency 'Microsoft.NET.Workl
2222

2323
## Diagnosing Issues With Installed Workloads
2424

25-
### Common Workload State Failrues
25+
### Common Workload State Failures
2626

2727
1. Workload is not installed. Try running `dotnet workload restore`. If that does not work, try running `dotnet build -getItem:MissingWorkloadPack` to determine what workload packs are missing. Our workload detection logic could be wrong and you could need a different workload than we list. This call should provide the pack we need and file an issue in the SDK repo with this information.
2828
_NETSDK1147: To build this project, the following workloads must be installed:_
2929
2. You installed workloads previously but now your workload templates are missing (Aspire and MAUI templates are installed by the workloads). This could be because your workloads were installed correctly at some point in the past but are now out of sync.
30-
1. You installed a new band of the SDK. Workloads are installed per band so installing a new SDK could lead to your workloads not working. [Workload versions](https://github.com/dotnet/designs/pull/294)s should improve that.
30+
1. You installed a new band of the SDK. Workloads are installed per band so installing a new SDK could lead to your workloads not working. [Workload versions](https://github.com/dotnet/designs/pull/294) should improve that.
3131
2. You installed a different workload from the dotnet CLI. We've improved this a few times but it's still possible to install a different workload which updates your workload manifests without updating your workloads. Please file a bug if this happens to you.
3232
3. You install a new version of Visual Studio that doesn't have worklaods selected. Visual Studio should include all available workloads so make sure to select them in Visual Studio setup.
3333

0 commit comments

Comments
 (0)