Skip to content

Commit de38479

Browse files
dougbudougbu
authored
Improve build reliability (#20760)
* Improve build reliability - ensure `ResolveCustomReferences` target executes before packages are used - `ResolveAssemblyReferences` and `ResolveAssemblyReferencesDesignTime` targets run too late - e.g. failed builds of Microsoft.AspNetCore.WebUtilities or Microsoft.AspNetCore.Hosting when building from root - add `GetReferenceProjectTargetPathMetadata` for ease of use as well as reliability - avoids extra work to get existing metadata (ref/ projects execute no tasks in this target) nit: rename `@(ReferenceProjectMetadata)` -> `@(ReferenceProjectTargetPathMetadata)` * Ensure `GetTargetPathMetadata` target runs with `$(TargetFramework)` set - ref/ projects all multi-target and otherwise no-op this target * Revert "Fix various "Type or namespace not found" errors (#20736)" - change is no longer needed with other fixes in this PR This reverts commit 8218d6e.
1 parent b194b6c commit de38479

File tree

46 files changed

+135
-200
lines changed

Some content is hidden

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

46 files changed

+135
-200
lines changed

‎eng/scripts/CodeCheck.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@ try {
165165
& $PSScriptRoot\GenerateProjectList.ps1 -ci:$ci
166166
}
167167

168+
Write-Host "Re-generating references assemblies"
169+
Invoke-Block {
170+
& $PSScriptRoot\GenerateReferenceAssemblies.ps1 -ci:$ci
171+
}
172+
168173
Write-Host "Re-generating package baselines"
169174
Invoke-Block {
170175
& dotnet run -p "$repoRoot/eng/tools/BaselineGenerator/"

‎eng/targets/ResolveReferences.targets

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
This executes on NuGet restore and during DesignTimeBuild. It should not run in the outer, cross-targeting build.
145145
-->
146146
<Target Name="ResolveCustomReferences"
147-
BeforeTargets="CollectPackageReferences;ResolveAssemblyReferencesDesignTime;ResolveAssemblyReferences"
147+
BeforeTargets="CheckForImplicitPackageReferenceOverrides;CollectPackageReferences;ResolvePackageAssets"
148148
Condition=" '$(TargetFramework)' != '' AND '$(EnableCustomReferenceResolution)' == 'true' ">
149149
<ItemGroup>
150150
<!-- Ensure only content asset are consumed from .Sources packages -->
@@ -252,20 +252,35 @@
252252
this assembly. Reset properties to avoid error when copying non-existent @(IntermediateRefAssembly) to
253253
$(TargetRefPath).
254254
-->
255-
<GetTargetPathWithTargetPlatformMonikerDependsOn>$(GetTargetPathWithTargetPlatformMonikerDependsOn);AddReferenceProjectMetadata</GetTargetPathWithTargetPlatformMonikerDependsOn>
255+
<GetTargetPathWithTargetPlatformMonikerDependsOn>
256+
$(GetTargetPathWithTargetPlatformMonikerDependsOn);AddReferenceProjectMetadata
257+
</GetTargetPathWithTargetPlatformMonikerDependsOn>
256258
<PrepareForRunDependsOn>RemoveReferenceProjectMetadata;$(PrepareForRunDependsOn)</PrepareForRunDependsOn>
257259
</PropertyGroup>
258260
<ItemGroup Condition=" $(HasReferenceAssembly) AND $(_CompileTfmUsingReferenceAssemblies) ">
259-
<!-- Ensure ref/ project is built prior to the implementation project. Capture its target path. -->
261+
<!-- Ensure ref/ project is built prior to the implementation project. -->
260262
<ProjectReference Include="$(_ReferenceProjectFile)">
261-
<OutputItemType>ReferenceProjectMetadata</OutputItemType>
262263
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
263264
</ProjectReference>
264265
</ItemGroup>
265-
<Target Name="AddReferenceProjectMetadata" DependsOnTargets="ResolveProjectReferences">
266+
<Target Name="GetReferenceProjectTargetPathMetadata">
267+
<Error Condition=" !($(HasReferenceAssembly) AND $(_CompileTfmUsingReferenceAssemblies)) "
268+
Text="GetReferenceProjectTargetPathMetadata called in project without a reference assembly or when targeting non-default TFM." />
269+
<MSBuild Projects="$(_ReferenceProjectFile)" Targets="GetTargetPathMetadata" RebaseOutputs="true" Properties="TargetFramework=$(DefaultNetCoreTargetFramework)">
270+
<Output TaskParameter="TargetOutputs" ItemName="ReferenceProjectTargetPathMetadata" />
271+
</MSBuild>
272+
</Target>
273+
<Target Name="GetTargetPathMetadata" Returns="@(TargetPathMetadata)">
274+
<ItemGroup>
275+
<TargetPathMetadata Include="$(TargetPath)">
276+
<IntermediateAssembly>@(IntermediateAssembly)</IntermediateAssembly>
277+
</TargetPathMetadata>
278+
</ItemGroup>
279+
</Target>
280+
<Target Name="AddReferenceProjectMetadata" DependsOnTargets="GetReferenceProjectTargetPathMetadata">
266281
<PropertyGroup>
267282
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
268-
<TargetRefPath>@(ReferenceProjectMetadata)</TargetRefPath>
283+
<TargetRefPath>@(ReferenceProjectTargetPathMetadata)</TargetRefPath>
269284
</PropertyGroup>
270285
</Target>
271286
<Target Name="RemoveReferenceProjectMetadata">

‎src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,14 @@
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageTags>aspnetcore;antiforgery</PackageTags>
99
<IsPackable>false</IsPackable>
10-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1110
</PropertyGroup>
1211

1312
<ItemGroup>
1413
<Reference Include="Microsoft.AspNetCore.DataProtection" />
1514
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
1615
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
1716
<Reference Include="Microsoft.AspNetCore.WebUtilities" />
18-
19-
20-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
17+
<Reference Include="Microsoft.Extensions.ObjectPool" />
2118
</ItemGroup>
2219

2320
</Project>

‎src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<NoWarn>CS0436;$(NoWarn)</NoWarn>
1111
<DefineConstants>$(DefineConstants);MESSAGEPACK_INTERNAL;COMPONENTS_SERVER</DefineConstants>
1212
<IsPackable>false</IsPackable>
13-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1413
</PropertyGroup>
1514

1615
<ItemGroup>
@@ -19,12 +18,11 @@
1918
<Reference Include="Microsoft.AspNetCore.DataProtection.Extensions" />
2019
<Reference Include="Microsoft.AspNetCore.SignalR" />
2120
<Reference Include="Microsoft.AspNetCore.StaticFiles" />
22-
23-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)"/>
24-
<PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="$(MicrosoftExtensionsFileProvidersCompositePackageVersion)"/>
25-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)"/>
26-
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)"/>
27-
<PackageReference Include="Microsoft.Extensions.ValueStopwatch.Sources" Version="$(MicrosoftExtensionsValueStopwatchSourcesPackageVersion)" PrivateAssets="All" />
21+
<Reference Include="Microsoft.Extensions.Caching.Memory" />
22+
<Reference Include="Microsoft.Extensions.FileProviders.Composite" />
23+
<Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
24+
<Reference Include="Microsoft.Extensions.Logging" />
25+
<Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" PrivateAssets="All" />
2826

2927
<!-- Add a project dependency without reference output assemblies to enforce build order -->
3028
<!-- Applying workaround for https://github.com/microsoft/msbuild/issues/2661 and https://github.com/dotnet/sdk/issues/952 -->

‎src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<PackageTags>aspnetcore;hosting</PackageTags>
1010
<IsPackable>false</IsPackable>
11-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1211
</PropertyGroup>
1312

1413
<ItemGroup>
1514
<Reference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" />
1615
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
17-
18-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)"/>
16+
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
1917
</ItemGroup>
2018

2119
</Project>

‎src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<PackageTags>aspnetcore;hosting</PackageTags>
1010
<IsPackable>false</IsPackable>
11-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1211
</PropertyGroup>
1312

1413
<ItemGroup>
@@ -21,17 +20,16 @@
2120
<Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
2221
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
2322
<Reference Include="Microsoft.AspNetCore.Http" />
24-
25-
<PackageReference Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="$(MicrosoftExtensionsTypeNameHelperSourcesPackageVersion)" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsConfigurationFileExtensionsPackageVersion)"/>
27-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)"/>
28-
<PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="$(MicrosoftExtensionsFileProvidersCompositePackageVersion)"/>
29-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)"/>
30-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)"/>
31-
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)"/>
32-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)"/>
33-
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)"/>
34-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)"/>
23+
<Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
24+
<Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
25+
<Reference Include="Microsoft.Extensions.Configuration" />
26+
<Reference Include="Microsoft.Extensions.DependencyInjection" />
27+
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
28+
<Reference Include="Microsoft.Extensions.FileProviders.Composite" />
29+
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
30+
<Reference Include="Microsoft.Extensions.Logging" />
31+
<Reference Include="Microsoft.Extensions.Options" />
32+
<Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
3533
</ItemGroup>
3634

3735
</Project>

‎src/Hosting/Server.Abstractions/src/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<PackageTags>aspnetcore;hosting</PackageTags>
1010
<IsPackable>false</IsPackable>
11-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1211
</PropertyGroup>
1312

1413
<ItemGroup>
1514
<Reference Include="Microsoft.AspNetCore.Http.Features" />
16-
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)"/>
15+
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
1816
</ItemGroup>
1917

2018
</Project>

‎src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageTags>aspnetcore;authentication;security</PackageTags>
99
<IsPackable>false</IsPackable>
10-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1110
</PropertyGroup>
1211

1312
<ItemGroup>
1413
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
15-
16-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)"/>
17-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)"/>
14+
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
15+
<Reference Include="Microsoft.Extensions.Options" />
1816
</ItemGroup>
1917

2018
</Project>

‎src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<PackageTags>http</PackageTags>
1111
<IsPackable>false</IsPackable>
12-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1312
</PropertyGroup>
1413

1514
<ItemGroup>
16-
<PackageReference Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesPackageVersion)"/>
15+
<Reference Include="Microsoft.Extensions.Primitives" />
1716
</ItemGroup>
1817

1918
</Project>

‎src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Microsoft.AspNetCore.Http.HttpResponse</Description>
1414
<PackageTags>aspnetcore</PackageTags>
1515
<NoWarn>$(NoWarn);CS1591</NoWarn>
1616
<IsPackable>false</IsPackable>
17-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1817
</PropertyGroup>
1918

2019
<ItemGroup>
@@ -23,9 +22,8 @@ Microsoft.AspNetCore.Http.HttpResponse</Description>
2322

2423
<ItemGroup>
2524
<Reference Include="Microsoft.AspNetCore.Http.Features" />
25+
<Reference Include="Microsoft.Extensions.ActivatorUtilities.Sources" />
2626
<Reference Include="Microsoft.Net.Http.Headers" />
27-
28-
<PackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)"/>
2927
</ItemGroup>
3028

3129
<ItemGroup>

‎src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<PackageTags>aspnetcore</PackageTags>
1010
<IsPackable>false</IsPackable>
11-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1211
</PropertyGroup>
1312

1413
<ItemGroup>
@@ -18,8 +17,7 @@
1817
<ItemGroup>
1918
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
2019
<Reference Include="Microsoft.Net.Http.Headers" />
21-
22-
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)"/>
20+
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
2321
</ItemGroup>
2422

2523
</Project>

‎src/Http/Http/src/Microsoft.AspNetCore.Http.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<PackageTags>aspnetcore</PackageTags>
1111
<IsPackable>false</IsPackable>
12-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1312
</PropertyGroup>
1413

1514
<ItemGroup>
@@ -22,10 +21,9 @@
2221
<ItemGroup>
2322
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
2423
<Reference Include="Microsoft.AspNetCore.WebUtilities" />
24+
<Reference Include="Microsoft.Extensions.ObjectPool" />
25+
<Reference Include="Microsoft.Extensions.Options" />
2526
<Reference Include="Microsoft.Net.Http.Headers" />
26-
27-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
28-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)"/>
2927
</ItemGroup>
3028

3129
</Project>

‎src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Microsoft.AspNetCore.Routing.RouteCollection</Description>
1212
<PackageTags>aspnetcore;routing</PackageTags>
1313
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1414
<IsPackable>false</IsPackable>
15-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1615
</PropertyGroup>
1716

1817
<PropertyGroup>
@@ -31,11 +30,10 @@ Microsoft.AspNetCore.Routing.RouteCollection</Description>
3130
<Reference Include="Microsoft.AspNetCore.Authorization" />
3231
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
3332
<Reference Include="Microsoft.AspNetCore.Routing.Abstractions" />
34-
35-
<PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)"/>
36-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)"/>
37-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
38-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)"/>
33+
<Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" />
34+
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
35+
<Reference Include="Microsoft.Extensions.ObjectPool" />
36+
<Reference Include="Microsoft.Extensions.Options" />
3937
</ItemGroup>
4038

4139
</Project>

‎src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<PackageTags>aspnetcore</PackageTags>
1111
<IsPackable>false</IsPackable>
12-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1312
</PropertyGroup>
1413

1514
<ItemGroup>
@@ -19,8 +18,7 @@
1918

2019
<ItemGroup>
2120
<Reference Include="Microsoft.Net.Http.Headers" />
22-
23-
<PackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
21+
<Reference Include="System.IO.Pipelines" />
2422
</ItemGroup>
2523

2624
</Project>

‎src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,15 @@ Microsoft.AspNetCore.Cors.EnableCorsAttribute</Description>
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1212
<PackageTags>aspnetcore;cors</PackageTags>
1313
<IsPackable>false</IsPackable>
14-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1514
</PropertyGroup>
1615

1716
<ItemGroup>
1817
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
1918
<Reference Include="Microsoft.AspNetCore.Routing" />
20-
21-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)"/>
22-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)"/>
23-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)"/>
24-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)"/>
19+
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
20+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
21+
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
22+
<Reference Include="Microsoft.Extensions.Options" />
2523
</ItemGroup>
2624

2725
</Project>

‎src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<PackageTags>aspnetcore;diagnostics</PackageTags>
1010
<IsPackable>false</IsPackable>
11-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1211
</PropertyGroup>
1312

1413
<ItemGroup>
@@ -23,11 +22,10 @@
2322
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
2423
<Reference Include="Microsoft.AspNetCore.Routing" />
2524
<Reference Include="Microsoft.AspNetCore.WebUtilities" />
26-
27-
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)"/>
28-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)"/>
29-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)"/>
30-
<PackageReference Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="$(MicrosoftExtensionsTypeNameHelperSourcesPackageVersion)"/>
25+
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
26+
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
27+
<Reference Include="Microsoft.Extensions.Options" />
28+
<Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
3129
</ItemGroup>
3230

3331
</Project>

‎src/Middleware/HealthChecks/src/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<PackageTags>diagnostics;healthchecks</PackageTags>
1010
<IsPackable>false</IsPackable>
11-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1211
</PropertyGroup>
1312

1413
<ItemGroup>
1514
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
1615
<Reference Include="Microsoft.AspNetCore.Routing" />
16+
<Reference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
17+
<Reference Include="Microsoft.Extensions.Options" />
1718
<Reference Include="Microsoft.Net.Http.Headers" />
18-
19-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion)"/>
20-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)"/>
2119
</ItemGroup>
2220

2321
</Project>

‎src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<PackageTags>aspnetcore</PackageTags>
1111
<IsPackable>false</IsPackable>
12-
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
1312
</PropertyGroup>
1413

1514
<ItemGroup>
1615
<Reference Include="Microsoft.AspNetCore.Http" />
1716
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
17+
<Reference Include="Microsoft.Extensions.Options" />
1818
<Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
19-
20-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)"/>
2119
</ItemGroup>
2220
</Project>

0 commit comments

Comments
 (0)