Skip to content

Commit 6d388db

Browse files
sander1095sander1095
authored
Merge branch 'dotnet:main' into main
2 parents d5dae48 + de68d42 commit 6d388db

File tree

466 files changed

+4109
-6394
lines changed

Some content is hidden

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

466 files changed

+4109
-6394
lines changed

‎.azure/pipelines/jobs/default-build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
# See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
107107
pool:
108108
${{ if eq(parameters.agentOs, 'macOS') }}:
109-
vmImage: macOS-12
109+
vmImage: macOS-13
110110
${{ if eq(parameters.agentOs, 'Linux') }}:
111111
${{ if eq(parameters.useHostedUbuntu, true) }}:
112112
vmImage: ubuntu-20.04
@@ -164,8 +164,8 @@ jobs:
164164
- script: df -h
165165
displayName: Disk size
166166
- ${{ if eq(parameters.agentOs, 'macOS') }}:
167-
- script: sudo xcode-select -s /Applications/Xcode_14.2.0.app/Contents/Developer
168-
displayName: Use XCode 14.2.0
167+
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
168+
displayName: Use XCode 15.2.0
169169
- checkout: self
170170
clean: true
171171
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
@@ -323,7 +323,7 @@ jobs:
323323
pool:
324324
${{ if eq(parameters.agentOs, 'macOS') }}:
325325
name: Azure Pipelines
326-
image: macOS-12
326+
image: macOS-13
327327
os: macOS
328328
${{ if eq(parameters.agentOs, 'Linux') }}:
329329
name: $(DncEngInternalBuildPool)
@@ -391,8 +391,8 @@ jobs:
391391
- script: df -h
392392
displayName: Disk size
393393
- ${{ if eq(parameters.agentOs, 'macOS') }}:
394-
- script: sudo xcode-select -s /Applications/Xcode_14.2.0.app/Contents/Developer
395-
displayName: Use XCode 14.2.0
394+
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
395+
displayName: Use XCode 15.2.0
396396
- checkout: self
397397
clean: true
398398
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"remoteEnv": {
3232
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
3333
"DOTNET_MULTILEVEL_LOOKUP": "0",
34-
"TARGET": "net9.0",
34+
"TARGET": "net10.0",
3535
"DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "true"
3636
},
3737
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/eng/common/ @dotnet-maestro-bot
1717
/eng/Versions.props @dotnet-maestro-bot @dotnet/aspnet-build @wtgodbe
1818
/eng/Version.Details.xml @dotnet-maestro-bot @dotnet/aspnet-build @wtgodbe
19-
/eng/SourceBuild* @dotnet/source-build-internal
19+
/eng/SourceBuild* @dotnet/source-build
2020
/src/Caching/ @captainsafia @halter73 @mgravell
2121
/src/Caching/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @captainsafia @halter73 @mgravell
2222
/src/Components/ @dotnet/aspnet-blazor-eng

‎.github/dependabot.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ registries:
66
url: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/
77

88
updates:
9-
- package-ecosystem: npm
9+
- package-ecosystem: NuGet
1010
directory: "/"
1111
# Perform only security updates of our npm dependencies.
1212
open-pull-requests-limit: 0
13-
registries:
14-
- dev.azure.com
1513
# Schedule should be ignored for security updates.
1614
schedule:
17-
interval: monthly
15+
interval: weekly
1816

1917
- package-ecosystem: "github-actions"
2018
directory: "/"

‎.github/policies/resourceManagement.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ configuration:
576576
then:
577577
- removeMilestone
578578
- addMilestone:
579-
milestone: 6.0.34
579+
milestone: 6.0.36
580580
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/6.0 branch'
581581
- if:
582582
- payloadType: Pull_Request
@@ -587,7 +587,7 @@ configuration:
587587
then:
588588
- removeMilestone
589589
- addMilestone:
590-
milestone: 8.0.9
590+
milestone: 8.0.11
591591
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
592592
- if:
593593
- payloadType: Issues

‎AspNetCore.sln‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,6 +1814,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B32FF7A7-9
18141814
EndProject
18151815
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.OpenApi.Tests", "src\OpenApi\test\Microsoft.AspNetCore.OpenApi.Tests\Microsoft.AspNetCore.OpenApi.Tests.csproj", "{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}"
18161816
EndProject
1817+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.App.SourceGenerators", "src\Framework\AspNetCoreAnalyzers\src\SourceGenerators\Microsoft.AspNetCore.App.SourceGenerators.csproj", "{C3928C15-1836-46DB-A09D-9EFBCCA33E08}"
1818+
EndProject
18171819
Global
18181820
GlobalSection(SolutionConfigurationPlatforms) = preSolution
18191821
Debug|Any CPU = Debug|Any CPU
@@ -10959,6 +10961,22 @@ Global
1095910961
{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Release|x64.Build.0 = Release|Any CPU
1096010962
{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Release|x86.ActiveCfg = Release|Any CPU
1096110963
{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Release|x86.Build.0 = Release|Any CPU
10964+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10965+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Debug|Any CPU.Build.0 = Debug|Any CPU
10966+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Debug|arm64.ActiveCfg = Debug|Any CPU
10967+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Debug|arm64.Build.0 = Debug|Any CPU
10968+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Debug|x64.ActiveCfg = Debug|Any CPU
10969+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Debug|x64.Build.0 = Debug|Any CPU
10970+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Debug|x86.ActiveCfg = Debug|Any CPU
10971+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Debug|x86.Build.0 = Debug|Any CPU
10972+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|Any CPU.ActiveCfg = Release|Any CPU
10973+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|Any CPU.Build.0 = Release|Any CPU
10974+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|arm64.ActiveCfg = Release|Any CPU
10975+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|arm64.Build.0 = Release|Any CPU
10976+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|x64.ActiveCfg = Release|Any CPU
10977+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|x64.Build.0 = Release|Any CPU
10978+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|x86.ActiveCfg = Release|Any CPU
10979+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|x86.Build.0 = Release|Any CPU
1096210980
EndGlobalSection
1096310981
GlobalSection(SolutionProperties) = preSolution
1096410982
HideSolutionNode = FALSE
@@ -11855,6 +11873,7 @@ Global
1185511873
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63} = {5FE1FBC1-8CE3-4355-9866-44FE1307C5F1}
1185611874
{B32FF7A7-9CB3-4DCD-AE97-3B2594DB9DAC} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B}
1185711875
{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7} = {B32FF7A7-9CB3-4DCD-AE97-3B2594DB9DAC}
11876+
{C3928C15-1836-46DB-A09D-9EFBCCA33E08} = {B5D98AEB-9409-4280-8225-9C1EC6A791B2}
1185811877
EndGlobalSection
1185911878
GlobalSection(ExtensibilityGlobals) = postSolution
1186011879
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

‎docs/DailyBuilds.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,19 @@ If you want to download the latest daily build and use it in a project, then you
3333
</configuration>
3434
```
3535

36+
## .NET 10
37+
38+
```xml
39+
<?xml version="1.0" encoding="utf-8"?>
40+
<configuration>
41+
<packageSources>
42+
<clear />
43+
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
44+
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
45+
</packageSources>
46+
</configuration>
47+
```
48+
3649
*NOTE: This NuGet.Config should be with your application unless you want nightly packages to potentially start being restored for other apps on the machine.*
3750

3851
Some features, such as new target frameworks, may require prerelease tooling builds for Visual Studio.

‎eng/Dependencies.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ and are generated based on the last package release.
6868
<LatestPackageReference Include="Microsoft.Win32.Registry" />
6969
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
7070
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
71+
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
7172
<LatestPackageReference Include="Microsoft.OpenApi" />
7273
<LatestPackageReference Include="Microsoft.OpenApi.Readers" />
7374
<LatestPackageReference Include="System.Buffers" />
@@ -79,7 +80,6 @@ and are generated based on the last package release.
7980
<LatestPackageReference Include="System.Diagnostics.DiagnosticSource" />
8081
<LatestPackageReference Include="System.Diagnostics.EventLog" />
8182
<LatestPackageReference Include="System.DirectoryServices.Protocols" />
82-
<LatestPackageReference Include="System.Drawing.Common" />
8383
<LatestPackageReference Include="System.IdentityModel.Tokens.Jwt" />
8484
<LatestPackageReference Include="System.IO.Pipelines" />
8585
<LatestPackageReference Include="System.Net.Http" />

‎eng/DotNetBuild.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
1+
<!-- When altering this file, please include @dotnet/product-construction as a reviewer. -->
22

33
<Project>
44

55
<PropertyGroup>
66
<GitHubRepositoryName>aspnetcore</GitHubRepositoryName>
77
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
8-
<SourceBuildTargetFrameworkFilter>netstandard2.0%3bnetstandard2.1%3bnetcoreapp2.1%3bnetcoreapp3.1%3bnet5.0%3bnet6.0%3bnet7.0%3bnet8.0%3bnet9.0</SourceBuildTargetFrameworkFilter>
8+
<SourceBuildTargetFrameworkFilter>netstandard2.0%3bnetstandard2.1%3bnetcoreapp2.1%3bnetcoreapp3.1%3bnet5.0%3bnet6.0%3bnet7.0%3bnet8.0%3bnet9.0%3bnet10.0</SourceBuildTargetFrameworkFilter>
99
</PropertyGroup>
1010

1111
<!--
@@ -64,7 +64,7 @@
6464
BeforeTargets="GetSourceBuildCommandConfiguration">
6565

6666
<PropertyGroup>
67-
<InnerBuildArgs Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:CrossgenOutput=false</InnerBuildArgs>
67+
<InnerBuildArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:CrossgenOutput=false</InnerBuildArgs>
6868
</PropertyGroup>
6969
</Target>
7070

@@ -103,7 +103,7 @@
103103

104104
<PropertyGroup>
105105
<!-- Disable installing puppeteer browsers when running in source build -->
106-
<_AdditionalEnvironmentVariable Condition="$(ArcadeBuildFromSource) == 'true'">PUPPETEER_SKIP_DOWNLOAD=1</_AdditionalEnvironmentVariable>
106+
<_AdditionalEnvironmentVariable Condition="$(DotNetBuildSourceOnly) == 'true'">PUPPETEER_SKIP_DOWNLOAD=1</_AdditionalEnvironmentVariable>
107107
</PropertyGroup>
108108

109109
<Exec

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
1+
<!-- When altering this file or making other Source Build related changes, include @dotnet/source-build as a reviewer. -->
22
<!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->
33

44
<UsageData>
@@ -50,6 +50,7 @@
5050

5151
<!-- Transitive dependencies, suppressed as per https://github.com/dotnet/aspnetcore/pull/57887#issuecomment-2362241518-->
5252
<Usages>
53+
<Usage Id="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.7.24405.7"/>
5354
<Usage Id="Newtonsoft.Json" Version="13.0.1" />
5455
<Usage Id="System.Security.Cryptography.Xml" Version="6.0.0" />
5556
</Usages>

0 commit comments

Comments
 (0)