Skip to content

Commit d5e05e8

Browse files
DeagleGrossDeagleGross
committed
merge main
2 parents ff43fb2 + 8d0f798 commit d5e05e8

File tree

140 files changed

+1035
-921
lines changed

Some content is hidden

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

140 files changed

+1035
-921
lines changed

‎.azure/pipelines/ci-public.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,7 @@ stages:
646646
jobName: Local_Windows
647647
jobDisplayName: 'Test: Windows local development validation'
648648
agentOs: Windows
649+
isAzDOTestingJob: true
649650
timeoutInMinutes: 240
650651
steps:
651652
- script: git submodule update --init

‎.azure/pipelines/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,7 @@ extends:
712712
jobName: Local_Windows
713713
jobDisplayName: 'Test: Windows local development validation'
714714
agentOs: Windows
715+
isAzDOTestingJob: true
715716
timeoutInMinutes: 240
716717
steps:
717718
- script: git submodule update --init

‎.github/dependabot.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
version: 2
2-
registries:
3-
dev.azure.com:
4-
token: ${{secrets.DEPENDABOT_NPM_TOKEN}}
5-
type: npm-registry
6-
url: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/
72

83
updates:
9-
- package-ecosystem: NuGet
4+
- package-ecosystem: nuget
105
directory: "/"
116
# Perform only security updates of our npm dependencies.
127
open-pull-requests-limit: 0

‎.github/policies/resourceManagement.yml‎

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -379,17 +379,6 @@ configuration:
379379
- addMilestone:
380380
milestone: 10.0-preview1
381381
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
382-
- if:
383-
- payloadType: Pull_Request
384-
- isAction:
385-
action: Closed
386-
- targetsBranch:
387-
branch: release/9.0
388-
then:
389-
- removeMilestone
390-
- addMilestone:
391-
milestone: 9.0.1
392-
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
393382
- if:
394383
- payloadType: Issues
395384
- isAction:
@@ -487,21 +476,6 @@ configuration:
487476
488477
Otherwise, please add `tell-mode` label.
489478
description: Add release/8.0 targeting PRs to the servicing project
490-
- if:
491-
- payloadType: Pull_Request
492-
- isAction:
493-
action: Opened
494-
- targetsBranch:
495-
branch: release/6.0
496-
then:
497-
- addMilestone:
498-
milestone: 6.0.x
499-
- addReply:
500-
reply: >-
501-
Hi @${issueAuthor}. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the [servicing process](https://aka.ms/aspnet/servicing) document.
502-
503-
Otherwise, please add `tell-mode` label.
504-
description: Add release/6.0 targeting PRs to the servicing project
505479
- if:
506480
- payloadType: Pull_Request
507481
- isAction:
@@ -561,12 +535,12 @@ configuration:
561535
- isAction:
562536
action: Closed
563537
- targetsBranch:
564-
branch: release/6.0
538+
branch: release/9.0
565539
then:
566540
- removeMilestone
567541
- addMilestone:
568-
milestone: 6.0.36
569-
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/6.0 branch'
542+
milestone: 9.0.1
543+
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
570544
- if:
571545
- payloadType: Pull_Request
572546
- isAction:

‎AspNetCore.sln‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1816,6 +1816,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.OpenAp
18161816
EndProject
18171817
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}"
18181818
EndProject
1819+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{2B858B82-5F0B-4A24-B3C0-5E99149F70D6}"
1820+
EndProject
1821+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.App.Internal.Assets", "src\Assets\Microsoft.AspNetCore.App.Internal.Assets.csproj", "{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}"
1822+
EndProject
18191823
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinimalSampleOwin", "src\Http\samples\MinimalSampleOwin\MinimalSampleOwin.csproj", "{95032BC4-8BE5-4703-8075-93CB9DFF93EF}"
18201824
EndProject
18211825
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Owin.Microbenchmarks", "src\Http\Owin\benchmarks\Microsoft.AspNetCore.Owin.Microbenchmarks\Microsoft.AspNetCore.Owin.Microbenchmarks.csproj", "{E0FBCBF6-030C-4F15-A58A-F0F33DCC26E9}"
@@ -10981,6 +10985,22 @@ Global
1098110985
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|x64.Build.0 = Release|Any CPU
1098210986
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|x86.ActiveCfg = Release|Any CPU
1098310987
{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|x86.Build.0 = Release|Any CPU
10988+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10989+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|Any CPU.Build.0 = Debug|Any CPU
10990+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|arm64.ActiveCfg = Debug|Any CPU
10991+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|arm64.Build.0 = Debug|Any CPU
10992+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|x64.ActiveCfg = Debug|Any CPU
10993+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|x64.Build.0 = Debug|Any CPU
10994+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|x86.ActiveCfg = Debug|Any CPU
10995+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|x86.Build.0 = Debug|Any CPU
10996+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|Any CPU.ActiveCfg = Release|Any CPU
10997+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|Any CPU.Build.0 = Release|Any CPU
10998+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|arm64.ActiveCfg = Release|Any CPU
10999+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|arm64.Build.0 = Release|Any CPU
11000+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|x64.ActiveCfg = Release|Any CPU
11001+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|x64.Build.0 = Release|Any CPU
11002+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|x86.ActiveCfg = Release|Any CPU
11003+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|x86.Build.0 = Release|Any CPU
1098411004
{95032BC4-8BE5-4703-8075-93CB9DFF93EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1098511005
{95032BC4-8BE5-4703-8075-93CB9DFF93EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
1098611006
{95032BC4-8BE5-4703-8075-93CB9DFF93EF}.Debug|arm64.ActiveCfg = Debug|Any CPU
@@ -11910,6 +11930,8 @@ Global
1191011930
{B32FF7A7-9CB3-4DCD-AE97-3B2594DB9DAC} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B}
1191111931
{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7} = {B32FF7A7-9CB3-4DCD-AE97-3B2594DB9DAC}
1191211932
{C3928C15-1836-46DB-A09D-9EFBCCA33E08} = {B5D98AEB-9409-4280-8225-9C1EC6A791B2}
11933+
{2B858B82-5F0B-4A24-B3C0-5E99149F70D6} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
11934+
{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62} = {2B858B82-5F0B-4A24-B3C0-5E99149F70D6}
1191311935
{95032BC4-8BE5-4703-8075-93CB9DFF93EF} = {EB5E294B-9ED5-43BF-AFA9-1CD2327F3DC1}
1191411936
{E0FBCBF6-030C-4F15-A58A-F0F33DCC26E9} = {AA465A56-D9D0-4684-95B0-192F4436C582}
1191511937
EndGlobalSection

‎NuGet.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
1212
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
1313
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
14-
<!-- Used for the SiteExtension bits -->
15-
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
1614
<!-- Used for the Rich Navigation indexing task -->
1715
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
1816
</packageSources>

‎eng/Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
$(RepoRoot)src\Framework\App.Ref.Internal\src\Microsoft.AspNetCore.App.Ref.Internal.csproj;
178178
$(RepoRoot)src\Framework\AspNetCoreAnalyzers\test\Microsoft.AspNetCore.App.Analyzers.Test.csproj;
179179
$(RepoRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj;
180+
$(RepoRoot)src\Assets\**\*.*proj;
180181
$(RepoRoot)src\Caching\**\*.*proj;
181182
$(RepoRoot)src\DefaultBuilder\**\*.*proj;
182183
$(RepoRoot)src\Features\JsonPatch\**\*.*proj;
@@ -225,6 +226,7 @@
225226
$(RepoRoot)**\obj\**\*;"
226227
Condition=" '$(BuildMainlyReferenceProviders)' != 'true' " />
227228
<DotNetProjects Include="
229+
$(RepoRoot)src\Assets\**\*.*proj;
228230
$(RepoRoot)src\Caching\**\src\*.csproj;
229231
$(RepoRoot)src\DefaultBuilder\**\src\*.csproj;
230232
$(RepoRoot)src\Features\JsonPatch\**\src\*.csproj;

‎eng/Dependencies.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ and are generated based on the last package release.
141141

142142
<ItemGroup Label=".NET team dependencies (Non-source-build)" Condition="'$(DotNetBuildSourceOnly)' != 'true'">
143143
<LatestPackageReference Include="Microsoft.AspNet.WebApi.Client" />
144-
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x64" />
145-
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x86" />
146144
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.8.0.x64" />
147145
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.8.0.x86" />
146+
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x64" />
147+
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x86" />
148148
<LatestPackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" />
149149
<LatestPackageReference Include="Microsoft.Internal.Runtime.AspNetCore.Transport" />
150150
<LatestPackageReference Include="Microsoft.Bcl.AsyncInterfaces" />

‎eng/ProjectReferences.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
-->
66
<Project>
77
<ItemGroup>
8+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.App.Internal.Assets" ProjectPath="$(RepoRoot)src\Assets\Microsoft.AspNetCore.App.Internal.Assets.csproj" />
89
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.SqlServer" ProjectPath="$(RepoRoot)src\Caching\SqlServer\src\Microsoft.Extensions.Caching.SqlServer.csproj" />
910
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.StackExchangeRedis" ProjectPath="$(RepoRoot)src\Caching\StackExchangeRedis\src\Microsoft.Extensions.Caching.StackExchangeRedis.csproj" />
1011
<ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" />

‎eng/ShippingAssemblies.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
<AspNetCoreShippingAssembly Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
106106
<AspNetCoreShippingAssembly Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
107107
<AspNetCoreShippingAssembly Include="Microsoft.Extensions.Features" />
108+
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.App.Internal.Assets" />
108109
<AspNetCoreShippingAssembly Include="Microsoft.Extensions.Caching.SqlServer" />
109110
<AspNetCoreShippingAssembly Include="Microsoft.Extensions.Caching.StackExchangeRedis" />
110111
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.JsonPatch" />

0 commit comments

Comments
 (0)