Skip to content

Commit a91eda9

Browse files
MatthewSteeplesMatthewSteeples
authored
Merge branch 'dotnet:main' into fix-json-serializer-settings
2 parents 7bac082 + bd6f77d commit a91eda9

File tree

358 files changed

+15681
-1636
lines changed

Some content is hidden

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

358 files changed

+15681
-1636
lines changed

‎.azure/pipelines/ci.yml

+27-26
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ variables:
7979
- name: WindowsArm64InstallersLogArgs
8080
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
8181
- name: _InternalRuntimeDownloadArgs
82-
value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
82+
value: -RuntimeSourceFeed https://ci.dot.net/internal
8383
-RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
8484
/p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)'
8585
# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
8686
# is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
8787
- name: _InternalRuntimeDownloadCodeSignArgs
8888
value: $(_InternalRuntimeDownloadArgs)
89-
/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
89+
/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal
9090
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
9191
- group: DotNet-HelixApi-Access
9292
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
@@ -534,32 +534,33 @@ extends:
534534
parameters:
535535
inputName: Linux_musl_arm64
536536

537+
- template: .azure/pipelines/jobs/default-build.yml@self
538+
parameters:
539+
jobName: Windows_Test
540+
jobDisplayName: "Test: Windows Server x64"
541+
agentOs: Windows
542+
isAzDOTestingJob: true
543+
continueOnError: true
544+
# Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
545+
cancelTimeoutInMinutes: 30
546+
buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
547+
/p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunBlazorPlaywrightTemplateTests=true /p:DoNotCleanUpTemplates=true
548+
$(_InternalRuntimeDownloadArgs)
549+
beforeBuild:
550+
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
551+
displayName: Setup IISExpress test certificates and schema
552+
artifacts:
553+
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
554+
path: artifacts/log/
555+
publishOnError: true
556+
includeForks: true
557+
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
558+
path: artifacts/TestResults/
559+
publishOnError: true
560+
includeForks: true
561+
537562
- ${{ if and(ne(parameters.skipTests, 'true'), in(variables['Build.Reason'], 'PullRequest', 'Manual')) }}:
538563
# Test jobs
539-
- template: .azure/pipelines/jobs/default-build.yml@self
540-
parameters:
541-
jobName: Windows_Test
542-
jobDisplayName: "Test: Windows Server x64"
543-
agentOs: Windows
544-
isAzDOTestingJob: true
545-
# Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
546-
cancelTimeoutInMinutes: 30
547-
buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
548-
/p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false /p:RunBlazorPlaywrightTemplateTests=true
549-
$(_InternalRuntimeDownloadArgs)
550-
beforeBuild:
551-
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
552-
displayName: Setup IISExpress test certificates and schema
553-
artifacts:
554-
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
555-
path: artifacts/log/
556-
publishOnError: true
557-
includeForks: true
558-
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
559-
path: artifacts/TestResults/
560-
publishOnError: true
561-
includeForks: true
562-
563564
- template: .azure/pipelines/jobs/default-build.yml@self
564565
parameters:
565566
jobName: MacOS_Test

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

+5
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ parameters:
6262
isAzDOTestingJob: false
6363
enablePublishTestResults: ''
6464
enableSbom: true
65+
continueOnError: false
6566
variables: []
6667

6768
configuration: 'Release'
@@ -207,13 +208,15 @@ jobs:
207208
- script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
208209
/p:DotNetSignType=$(_SignType)
209210
displayName: Run build.cmd
211+
continueOnError: ${{ parameters.continueOnError }}
210212
env:
211213
COMPlus_DbgEnableMiniDump: 1
212214
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
213215
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
214216
- ${{ if ne(parameters.agentOs, 'Windows') }}:
215217
- script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
216218
displayName: Run build.sh
219+
continueOnError: ${{ parameters.continueOnError }}
217220
env:
218221
COMPlus_DbgEnableMiniDump: 1
219222
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
@@ -443,13 +446,15 @@ jobs:
443446
- script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
444447
/p:DotNetSignType=$(_SignType)
445448
displayName: Run build.cmd
449+
continueOnError: ${{ parameters.continueOnError }}
446450
env:
447451
COMPlus_DbgEnableMiniDump: 1
448452
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
449453
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
450454
- ${{ if ne(parameters.agentOs, 'Windows') }}:
451455
- script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
452456
displayName: Run build.sh
457+
continueOnError: ${{ parameters.continueOnError }}
453458
env:
454459
COMPlus_DbgEnableMiniDump: 1
455460
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"

‎.github/policies/resourceManagement.yml

+10-6
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,13 @@ configuration:
232232
- isActivitySender:
233233
user: dotnet-maestro[bot]
234234
issueAuthor: False
235-
- titleContains:
236-
pattern: Update dependencies
237-
isRegex: False
235+
- or:
236+
- titleContains:
237+
pattern: Update dependencies
238+
isRegex: False
239+
- titleContains:
240+
pattern: Source code updates
241+
isRegex: False
238242
- targetsBranch:
239243
branch: main
240244
then:
@@ -378,18 +382,18 @@ configuration:
378382
branch: main
379383
then:
380384
- addMilestone:
381-
milestone: 10.0-preview4
385+
milestone: 10.0-preview5
382386
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
383387
- if:
384388
- payloadType: Pull_Request
385389
- isAction:
386390
action: Closed
387391
- targetsBranch:
388-
branch: release/10.0-preview3
392+
branch: release/10.0-preview4
389393
then:
390394
- removeMilestone
391395
- addMilestone:
392-
milestone: 10.0-preview3
396+
milestone: 10.0-preview4
393397
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
394398
- if:
395399
- payloadType: Issues

‎.github/workflows/backport.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414

1515
jobs:
1616
backport:
17-
uses: dotnet/arcade/.github/workflows/backport-base.yml@0c0caeb605f7b2b99408bfa6b18b13526d747727 # 2025-01-13
17+
uses: dotnet/arcade/.github/workflows/backport-base.yml@76dd1b4eb3b15881da350de93805ea6ab936364c # 2025-01-13
1818
with:
1919
pr_description_template: |
2020
Backport of #%source_pr_number% to %target_branch%

‎.github/workflows/inter-branch-merge-flow.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ permissions:
1010

1111
jobs:
1212
Merge:
13-
uses: dotnet/arcade/.github/workflows/backport-base.yml@0c0caeb605f7b2b99408bfa6b18b13526d747727 # 2024-06-24
13+
uses: dotnet/arcade/.github/workflows/backport-base.yml@76dd1b4eb3b15881da350de93805ea6ab936364c # 2024-06-24

‎.github/workflows/markdownlint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
- name: Use Node.js
21-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
21+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2222
with:
2323
node-version: 16.x
2424
- name: Run Markdownlint

‎.github/workflows/update-jquery-validate.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020

2121
- name: Setup Node.js
22-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
22+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2323
with:
2424
node-version: '20.x'
2525

‎.github/workflows/validate-npm-package-lock-json.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
submodules: false
2121

2222
- name: Set up Node.js
23-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
23+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2424
with:
2525
node-version: 20.x
2626

‎AspNetCore.slnx

+5
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@
211211
<Project Path="src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj" />
212212
</Folder>
213213
<Folder Name="/src/Features/" Id="e81caa0a-8d6a-e3b6-28b3-ab416e1657a7" />
214+
<Folder Name="/src/Features/JsonPatch.SystemTextJson/" Id="02ea681e-c7d8-13c7-8484-4ac65e1b71e8">
215+
<Project Path="src/Features/JsonPatch.SystemTextJson/src/Microsoft.AspNetCore.JsonPatch.SystemTextJson.csproj" />
216+
<Project Path="src/Features/JsonPatch.SystemTextJson/test/Microsoft.AspNetCore.JsonPatch.SystemTextJson.Tests.csproj" />
217+
</Folder>
214218
<Folder Name="/src/Features/JsonPatch/" Id="077a40ee-d664-9e06-acde-21ca54b47638">
215219
<Project Path="src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj" />
216220
<Project Path="src/Features/JsonPatch/test/Microsoft.AspNetCore.JsonPatch.Tests.csproj" />
@@ -868,6 +872,7 @@
868872
<Project Path="src/Servers/HttpSys/samples/QueueSharing/QueueSharing.csproj" />
869873
<Project Path="src/Servers/HttpSys/samples/SelfHostServer/SelfHostServer.csproj" />
870874
<Project Path="src/Servers/HttpSys/samples/TestClient/TestClient.csproj" />
875+
<Project Path="src/Servers/HttpSys/samples/TlsFeaturesObserve/TlsFeaturesObserve.csproj" />
871876
</Folder>
872877
<Folder Name="/src/Servers/HttpSys/test/" Id="c087a640-2922-1045-1264-5231983559f6">
873878
<Project Path="src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj" />

‎Directory.Build.props

+5-3
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@
107107

108108
<IncludeSymbols>true</IncludeSymbols>
109109
<DefaultNetFxTargetFramework>net462</DefaultNetFxTargetFramework>
110+
111+
<CrossgenOutput Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">false</CrossgenOutput>
110112
</PropertyGroup>
111113

112114
<!-- Warnings and errors -->
@@ -231,10 +233,10 @@
231233
</PropertyGroup>
232234

233235
<PropertyGroup>
234-
<OfficialBaseURL>https://dotnetcli.blob.core.windows.net/dotnet/</OfficialBaseURL>
236+
<OfficialBaseURL>https://builds.dotnet.microsoft.com/dotnet/</OfficialBaseURL>
235237
<!-- Allow overriding the public base URL for Unified Build scenarios to pull assets from a local build. -->
236-
<PublicBaseURL Condition="'$(PublicBaseURL)' == ''">https://dotnetbuilds.blob.core.windows.net/public/</PublicBaseURL>
237-
<InternalBaseURL>https://dotnetbuilds.blob.core.windows.net/internal/</InternalBaseURL>
238+
<PublicBaseURL Condition="'$(PublicBaseURL)' == ''">https://ci.dot.net/public/</PublicBaseURL>
239+
<InternalBaseURL>https://ci.dot.net/internal/</InternalBaseURL>
238240
<!-- Allow overriding where installers are pulled in from previously completed jobs in Unified Build scenarios. -->
239241
<AddVersionToCrossArchitectureInstallerBasePath Condition="'$(CrossArchitectureInstallerBasePath)' != ''">true</AddVersionToCrossArchitectureInstallerBasePath>
240242
<CrossArchitectureInstallerBasePath Condition="'$(CrossArchitectureInstallerBasePath)' == ''">$(ArtifactsShippingPackagesDir)</CrossArchitectureInstallerBasePath>

‎Directory.Build.targets

+2-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<IsPackable Condition="'$(IsPackable)' == '' ">false</IsPackable>
120120

121121
<BuildHelixPayload Condition="'$(BuildHelixPayload)' == '' AND $(IsTestProject) ">true</BuildHelixPayload>
122-
<SkipTests Condition="'$(SkipHelixReadyTests)' == 'true' AND '$(BuildHelixPayload)' == 'true'">true</SkipTests>
122+
<SkipTests Condition="'$(SkipTests)' == '' AND '$(SkipHelixReadyTests)' == 'true' AND '$(BuildHelixPayload)' == 'true'">true</SkipTests>
123123
</PropertyGroup>
124124

125125
<PropertyGroup>
@@ -190,6 +190,7 @@
190190
<Import Project="eng\targets\CSharp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
191191
<Import Project="eng\targets\FSharp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.fsproj'" />
192192
<Import Project="eng\targets\Wix.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
193+
<Import Project="eng\targets\Node.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.nodeproj'" />
193194
<Import Project="eng\targets\Java.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.javaproj'" />
194195
<Import Project="eng\targets\Sfx.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.sfxproj'" />
195196
<Import Project="eng\testing\linker\trimmingTests.targets" Condition="'$(IsPublishedAppTestProject)' == 'true'" />

‎README.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ This table includes links to download the latest builds of the ASP.NET Core Shar
5050

5151
| Platform | Shared Framework (Installer) | Shared Framework (Binaries) | Hosting Bundle (Installer) |
5252
| :--------- | :----------: | :----------: | :----------: |
53-
| **Windows x64** | [Installer](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-win-x64.exe) | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-win-x64.zip) | [Installer](https://aka.ms/dotnet/9.0/daily/dotnet-hosting-win.exe) |
54-
| **Windows x86** | [Installer](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-win-x86.exe) | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-win-x86.zip) | [Installer](https://aka.ms/dotnet/9.0/daily/dotnet-hosting-win.exe) |
55-
| **Windows arm64** | [Installer](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-win-arm64.exe) | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-win-arm64.zip) | [Installer](https://aka.ms/dotnet/9.0/daily/dotnet-hosting-win.exe) |
56-
| **macOS x64** | **N/A** | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-osx-x64.tar.gz) | **N/A** |
57-
| **macOS arm64** | **N/A** | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-osx-arm64.tar.gz) | **N/A** |
58-
| **Linux x64** | [Deb Installer](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-x64.deb) - [RPM Installer](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-x64.rpm) | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-linux-x64.tar.gz) | **N/A** |
59-
| **Linux arm** | **N/A** | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-linux-arm.tar.gz) | **N/A** |
60-
| **Linux arm64** | [RPM Installer](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-aarch64.rpm) | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-linux-arm64.tar.gz) | **N/A** |
61-
| **Linux-musl-x64** | **N/A** | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-linux-musl-x64.tar.gz) | **N/A** |
62-
| **Linux-musl-arm** | **N/A** | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-linux-musl-arm.tar.gz) | **N/A** |
63-
| **Linux-musl-arm64** | **N/A** | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-linux-musl-arm64.tar.gz) | **N/A** |
53+
| **Windows x64** | [Installer](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-win-x64.exe) | [Binaries](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-win-x64.zip) | [Installer](https://aka.ms/dotnet/10.0/daily/dotnet-hosting-win.exe) |
54+
| **Windows x86** | [Installer](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-win-x86.exe) | [Binaries](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-win-x86.zip) | [Installer](https://aka.ms/dotnet/10.0/daily/dotnet-hosting-win.exe) |
55+
| **Windows arm64** | [Installer](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-win-arm64.exe) | [Binaries](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-win-arm64.zip) | [Installer](https://aka.ms/dotnet/10.0/daily/dotnet-hosting-win.exe) |
56+
| **macOS x64** | **N/A** | [Binaries](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-osx-x64.tar.gz) | **N/A** |
57+
| **macOS arm64** | **N/A** | [Binaries](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-osx-arm64.tar.gz) | **N/A** |
58+
| **Linux x64** | [Deb Installer](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-x64.deb) - [RPM Installer](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-x64.rpm) | [Binaries](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-linux-x64.tar.gz) | **N/A** |
59+
| **Linux arm** | **N/A** | [Binaries](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-linux-arm.tar.gz) | **N/A** |
60+
| **Linux arm64** | [RPM Installer](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-aarch64.rpm) | [Binaries](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-linux-arm64.tar.gz) | **N/A** |
61+
| **Linux-musl-x64** | **N/A** | [Binaries](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-linux-musl-x64.tar.gz) | **N/A** |
62+
| **Linux-musl-arm** | **N/A** | [Binaries](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-linux-musl-arm.tar.gz) | **N/A** |
63+
| **Linux-musl-arm64** | **N/A** | [Binaries](https://aka.ms/dotnet/10.0/daily/aspnetcore-runtime-linux-musl-arm64.tar.gz) | **N/A** |

‎eng/Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
$(RepoRoot)src\Assets\**\*.*proj;
163163
$(RepoRoot)src\Caching\**\*.*proj;
164164
$(RepoRoot)src\DefaultBuilder\**\*.*proj;
165-
$(RepoRoot)src\Features\JsonPatch\**\*.*proj;
165+
$(RepoRoot)src\Features\**\*.*proj;
166166
$(RepoRoot)src\DataProtection\**\*.*proj;
167167
$(RepoRoot)src\Antiforgery\**\*.*proj;
168168
$(RepoRoot)src\Hosting\**\*.*proj;
@@ -211,7 +211,7 @@
211211
$(RepoRoot)src\Assets\**\*.*proj;
212212
$(RepoRoot)src\Caching\**\src\*.csproj;
213213
$(RepoRoot)src\DefaultBuilder\**\src\*.csproj;
214-
$(RepoRoot)src\Features\JsonPatch\**\src\*.csproj;
214+
$(RepoRoot)src\Features\**\src\*.csproj;
215215
$(RepoRoot)src\DataProtection\**\src\*.csproj;
216216
$(RepoRoot)src\Antiforgery\**\src\*.csproj;
217217
$(RepoRoot)src\Hosting\**\src\*.csproj;

‎eng/Dependencies.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ and are generated based on the last package release.
7070
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
7171
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
7272
<LatestPackageReference Include="Microsoft.OpenApi" />
73-
<LatestPackageReference Include="Microsoft.OpenApi.Readers" />
73+
<LatestPackageReference Include="Microsoft.OpenApi.YamlReader" />
7474
<LatestPackageReference Include="System.Buffers" />
7575
<LatestPackageReference Include="System.CodeDom" />
7676
<LatestPackageReference Include="System.CommandLine.Experimental" />

0 commit comments

Comments
 (0)