Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove baseline suppressions from 5.0 #29934

Merged
merged 7 commits into from
Apr 2, 2021
Merged

Remove baseline suppressions from 5.0 #29934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b475bd
Remove baseline suppressions from 5.0
wtgodbe Apr 1, 2021
2628a37
Use newer NuGet.Protocol version
dougbu Apr 2, 2021
d81f1b0
Fix condition
wtgodbe Apr 2, 2021
f14648f
Back to 5.8.1
wtgodbe Apr 2, 2021
1a18279
Undo components changes
wtgodbe Apr 2, 2021
326921c
Whoops
wtgodbe Apr 2, 2021
e667904
Whoops
wtgodbe Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions eng/Baseline.Designer.props
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion eng/tools/BaselineGenerator/BaselineGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
<PackageReference Include="NuGet.Protocol" Version="4.8.2" />
<PackageReference Include="NuGet.Protocol" Version="5.8.1" />
</ItemGroup>

</Project>
4 changes: 1 addition & 3 deletions eng/tools/BaselineGenerator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,9 @@ private async Task<int> Run()
var baselineVersion = input.Root.Attribute("Version").Value;

// Baseline and .NET Core versions always align in non-preview releases.
// But, NuspecReader reports netcoreapp5.0 instead of net5.0. We use net5.0 in Baseline.Designer.props.
var parsedVersion = Version.Parse(baselineVersion);
var defaultTarget = ((parsedVersion.Major < 5) ? "netcoreapp" : "net") +
$"{parsedVersion.Major}.{parsedVersion.Minor}";
var matchTarget = $"netcoreapp{parsedVersion.Major}.{parsedVersion.Minor}";

var doc = new XDocument(
new XComment(" Auto generated. Do not edit manually, use eng/tools/BaselineGenerator/ to recreate. "),
Expand Down Expand Up @@ -179,7 +177,7 @@ private async Task<int> Run()
var targetCondition = $"'$(TargetFramework)' == '{group.TargetFramework.GetShortFolderName()}'";
if (string.Equals(
group.TargetFramework.GetShortFolderName(),
matchTarget,
defaultTarget,
StringComparison.OrdinalIgnoreCase))
{
targetCondition =
Expand Down
1 change: 0 additions & 1 deletion src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<ItemGroup>
<SuppressBaselineReference Include="Microsoft.AspNetCore.Components.Analyzers" InNuspecFile="true" />
<SuppressBaselineReference Include="Microsoft.AspNetCore.Authorization" InNuspecFile="true" />
<SuppressBaselineReference Include="Microsoft.JSInterop" Condition=" '$(AspNetCoreMajorMinorVersion)' == '6.0' " />
</ItemGroup>
dougbu marked this conversation as resolved.
Show resolved Hide resolved

<ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
<Reference Include="Microsoft.Extensions.Identity.Stores" />
</ItemGroup>

<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '6.0' ">
<!-- This dependency was removed in 5.0. The suppression can be removed after 5.0 RTM is released. -->
<SuppressBaselineReference Include="Newtonsoft.Json" />
</ItemGroup>

<Target Name="SetupRazorInputs" BeforeTargets="ResolveRazorGenerateInputs">
<ItemGroup>
<_RazorGenerate Include="Areas\Identity\Pages\V4\**\*.cshtml" />
Expand Down
8 changes: 1 addition & 7 deletions src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,5 @@
<ItemGroup>
<InternalsVisibleTo Include="Microsoft.AspNetCode.SpaServices.Extensions.Tests" />
</ItemGroup>

<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '6.0' ">
<!--
Dependency was removed in 5.0. Suppression can be removed after 5.0 RTM is released.
-->
<SuppressBaselineReference Include="Microsoft.AspNetCore.SpaServices" />
</ItemGroup>

</Project>
10 changes: 1 addition & 9 deletions ...Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,5 @@
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'">
<Reference Include="Microsoft.Bcl.AsyncInterfaces" />
</ItemGroup>

<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '6.0' ">
<!--
Dependency (a transitive reference) was removed in 5.0. Suppression can be
removed after 5.0 RTM is released.
-->
<SuppressBaselineReference Include="System.IO.Pipelines" />
</ItemGroup>


</Project>
5 changes: 0 additions & 5 deletions src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@
<Reference Include="System.Threading.Channels" />
</ItemGroup>

<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '6.0' AND '$(TargetFramework)' == 'netstandard2.0' ">
<!-- Dependency (a transitive ref) was removed in 5.0. Suppression can be removed after 5.0 RTM is released. -->
<SuppressBaselineReference Include="Microsoft.Bcl.AsyncInterfaces" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="Microsoft.AspNetCore.SignalR.Client.FunctionalTests" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.SignalR.Client.Tests" />
Expand Down