Skip to content

Commit 493e9ae

Browse files
dougbudougbu
committed
Correct @(SuppressBaselineReference) items
- remove out-of-date `@(SuppressBaselineReference)` items - either 3.1.7 baselines we're using don't include reference or still using package - fix some comments and `Condition` attributes to make remainder easy to find - add missing `@(SuppressBaselineReference)` items
1 parent 9bdd85d commit 493e9ae

File tree

13 files changed

+34
-37
lines changed

13 files changed

+34
-37
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -15,9 +15,13 @@
1515
<Reference Include="Microsoft.Extensions.Logging" />
1616
<Reference Include="Microsoft.JSInterop.WebAssembly" />
1717

18-
<ProjectReference Include="..\..\..\Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj" ReferenceOutputAssemblies="false" SkipGetTargetFrameworkProperties="true" UndefineProperties="TargetFramework" Private="false" Condition="'$(BuildNodeJS)' != 'false' and '$(BuildingInsideVisualStudio)' != 'true'" />
19-
20-
<SuppressBaselineReference Include="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" />
18+
<ProjectReference
19+
Include="..\..\..\Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj"
20+
ReferenceOutputAssemblies="false"
21+
SkipGetTargetFrameworkProperties="true"
22+
UndefineProperties="TargetFramework"
23+
Private="false"
24+
Condition="'$(BuildNodeJS)' != 'false' and '$(BuildingInsideVisualStudio)' != 'true'" />
2125
</ItemGroup>
2226

2327
<ItemGroup>

‎src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
3131
<Reference Include="System.Security.Principal.Windows" />
32-
<SuppressBaselineReference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
3332
</ItemGroup>
3433

3534
</Project>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,9 @@
1313
<Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
1414
</ItemGroup>
1515

16+
<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '5.0' ">
17+
<!-- Dependency (now in shared Fx) was removed in 5.0. Suppression can be removed after 5.0 RTM is released. -->
18+
<SuppressBaselineReference Include="System.IO.Pipelines" />
19+
</ItemGroup>
20+
1621
</Project>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,9 @@
1717
<Reference Include="System.IO.Pipelines" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
1818
</ItemGroup>
1919

20+
<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '5.0' AND '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">
21+
<!-- Dependency (now in shared Fx) was removed in 5.0. Suppression can be removed after 5.0 RTM is released. -->
22+
<SuppressBaselineReference Include="System.IO.Pipelines" />
23+
</ItemGroup>
24+
2025
</Project>

‎src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<Reference Include="Microsoft.Extensions.Caching.Abstractions" />
1414
<Reference Include="Microsoft.Extensions.Logging" />
1515
<Reference Include="Microsoft.Extensions.Identity.Core" />
16-
<SuppressBaselineReference Include="System.ComponentModel.Annotations" />
1716
</ItemGroup>
1817

1918
</Project>

‎src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,4 @@
2020
<Reference Include="xunit.analyzers" PrivateAssets="All" />
2121
</ItemGroup>
2222

23-
<ItemGroup>
24-
<!-- Removing nonexistent package -->
25-
<SuppressBaselineReference Include="Microsoft.AspNetCore.Testing" />
26-
</ItemGroup>
2723
</Project>

‎src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@
4242
<Reference Include="Microsoft.Extensions.Identity.Stores" />
4343
</ItemGroup>
4444

45+
<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '5.0' ">
46+
<!-- This dependency was removed in 5.0. The suppression can be removed after 5.0 RTM is released. -->
47+
<SuppressBaselineReference Include="Newtonsoft.Json" />
48+
</ItemGroup>
49+
4550
<ItemGroup>
4651
<UIFrameworkVersionMoniker Include="V4" />
4752
</ItemGroup>

‎src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,12 @@
2323
<Reference Include="Microsoft.Bcl.AsyncInterfaces" />
2424
</ItemGroup>
2525

26+
<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '5.0' ">
27+
<!--
28+
Dependency (now in shared Fx and a transitive ref for netstandard2.x) was removed in 5.0. Suppression can be
29+
removed after 5.0 RTM is released.
30+
-->
31+
<SuppressBaselineReference Include="System.IO.Pipelines" />
32+
</ItemGroup>
33+
2634
</Project>

‎src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
<Reference Include="System.Threading.Channels" />
2828
</ItemGroup>
2929

30-
<ItemGroup Condition="'$(AspNetCoreMajorMinorVersion)' == '5.0'">
31-
<!-- This dependency was replaced by Protocols.NewtonsoftJson between 3.0 and 2.2. This suppression can be removed after 3.0 is complete. -->
32-
<SuppressBaselineReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" />
30+
<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '5.0' AND '$(TargetFramework)' == 'netstandard2.0' ">
31+
<!-- Dependency (a transitive ref) was removed in 5.0. Suppression can be removed after 5.0 RTM is released. -->
32+
<SuppressBaselineReference Include="Microsoft.Bcl.AsyncInterfaces" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

‎src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,4 @@
2323
<Reference Include="System.Text.Json" />
2424
</ItemGroup>
2525

26-
<ItemGroup Condition="'$(AspNetCoreMajorMinorVersion)' == '5.0'">
27-
<!-- This dependency was replaced by System.Text.Json between 3.0 and 2.2. This suppression can be removed after 3.0 is complete. -->
28-
<SuppressBaselineReference Include="Newtonsoft.Json" />
29-
30-
<!-- System.Text.Json (for .NET Standard 2.0) and ShardFx bring System.Buffers in (transitively). No need for both here. -->
31-
<SuppressBaselineReference Include="System.Buffers" />
32-
</ItemGroup>
33-
3426
</Project>

0 commit comments

Comments
 (0)