Skip to content

Commit ff3864f

Browse files
dougbudougbu
committed
Update branding to 6.0.0 Alpha1
- hold the TFM back at `net5.0` - update site extensions to split 5.0 and 6.0 - remove unnecessary `@(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 - I'll undo any changes that were over-zealous
1 parent 4995bbf commit ff3864f

File tree

15 files changed

+30
-49
lines changed

15 files changed

+30
-49
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888

8989
<IncludeSymbols>true</IncludeSymbols>
9090

91-
<!-- Also update the DefaultNetCoreTargetFramework defined at src/Razor/test/testassets/Directory.Build.props -->
91+
<!-- Also update the DefaultNetCoreTargetFramework defined at src/Razor/test/testassets/Directory.Build.props. -->
9292
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
9393
</PropertyGroup>
9494

‎eng/AfterSolutionBuild.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<RepoTasks.RemoveSharedFrameworkDependencies Condition="@(_BuildOutput->Count()) != 0"
1616
Files="@(_BuildOutput)"
1717
FrameworkOnlyPackages="@(AspNetCoreAppReference)"
18-
SharedFrameworkTargetFramework="net$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)" />
18+
SharedFrameworkTargetFramework="net5.0" />
1919
</Target>
2020

2121
</Project>

‎eng/Dependencies.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ and are generated based on the last package release.
103103
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.2" />
104104
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x64" />
105105
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x86" />
106+
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x64" />
107+
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x86" />
106108
<LatestPackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" />
107109
<LatestPackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
108110
<LatestPackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" />

‎eng/Versions.props

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
-->
77
<Project>
88
<PropertyGroup Label="Version settings">
9-
<AspNetCoreMajorVersion>5</AspNetCoreMajorVersion>
9+
<!--
10+
Also update the packages referenced in Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj when
11+
Major.Minor changes.
12+
-->
13+
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1014
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1115
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
1216
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
@@ -15,8 +19,8 @@
1519
-->
1620
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1721
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
18-
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
19-
<PreReleaseBrandingLabel>RC $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
22+
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
23+
<PreReleaseBrandingLabel>Alpha $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
2024
<IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
2125
<IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
2226
<AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>
@@ -233,12 +237,15 @@
233237
<MicrosoftWebAdministrationPackageVersion>11.1.0</MicrosoftWebAdministrationPackageVersion>
234238
<MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion>
235239
<SystemIdentityModelTokensJwtPackageVersion>6.7.1</SystemIdentityModelTokensJwtPackageVersion>
236-
<!-- Packages from 2.1/2.2 branches used for site extension build -->
240+
<!-- Packages from 2.1, 2.2, 3.1 and 5.0 branches used for site extension build. -->
237241
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>
238242
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>
239243
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>3.1.3-servicing-20163-14</MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>
240244
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion>
241245
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion>
246+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50PackageVersion>5.0.0-preview-7-20365-19</MicrosoftAspNetCoreAzureAppServicesSiteExtension50PackageVersion>
247+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64PackageVersion>
248+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86PackageVersion>
242249
<!-- 3rd party dependencies -->
243250
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
244251
<BenchmarkDotNetPackageVersion>0.12.1</BenchmarkDotNetPackageVersion>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
1818
</ItemGroup>
1919

20-
<!-- These references were removed in 3.0 -->
21-
<ItemGroup>
20+
<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '6.0' ">
21+
<!-- These dependencies were removed in 5.0. The suppressions can be removed after 5.0 RTM is released. -->
2222
<SuppressBaselineReference Include="Microsoft.AspNetCore.Components.Analyzers" />
2323
<SuppressBaselineReference Include="Microsoft.AspNetCore.Authorization" />
2424
<SuppressBaselineReference Include="System.ComponentModel.Annotations" />

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
UndefineProperties="TargetFramework"
2323
Private="false"
2424
Condition="'$(BuildNodeJS)' != 'false' and '$(BuildingInsideVisualStudio)' != 'true'" />
25+
</ItemGroup>
2526

27+
<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '6.0' ">
28+
<!-- This dependency was removed in 5.0. The suppression can be removed after 5.0 RTM is released. -->
2629
<SuppressBaselineReference Include="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" />
2730
</ItemGroup>
2831

‎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/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj

Lines changed: 1 addition & 2 deletions
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" />
17-
</ItemGroup>
16+
</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/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
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" />
33-
</ItemGroup>
34-
3530
<ItemGroup>
3631
<InternalsVisibleTo Include="Microsoft.AspNetCore.SignalR.Client.FunctionalTests" />
3732
<InternalsVisibleTo Include="Microsoft.AspNetCore.SignalR.Client.Tests" />

‎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>

‎src/SignalR/common/Protocols.Json/src/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,4 @@
2323
<Reference Include="Microsoft.AspNetCore.SignalR.Common" />
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-
</ItemGroup>
30-
3126
</Project>

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@
2929
<Reference Include="System.Text.Json" />
3030
</ItemGroup>
3131

32-
<ItemGroup Condition="'$(AspNetCoreMajorMinorVersion)' == '5.0'">
33-
<!-- This dependency was replaced by System.Text.Json between 3.0 and 2.2. This suppression can be removed after 3.0 is complete. -->
34-
<SuppressBaselineReference Include="Newtonsoft.Json" />
35-
36-
<!-- System.Text.Json (for .NET Standard 2.0) and ShardFx bring System.Buffers in (transitively). No need for both here. -->
37-
<SuppressBaselineReference Include="System.Buffers" />
38-
</ItemGroup>
39-
4032
<ItemGroup>
4133
<InternalsVisibleTo Include="Microsoft.AspNetCore.SignalR.Common.Tests" />
4234
<InternalsVisibleTo Include="Microsoft.AspNetCore.SignalR.Tests.Utils" />

‎src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup>
27+
<!-- Bundle in most down-level versions of the runtime-specific site extension packages. -->
2728
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.1" PrivateAssets="All" />
2829
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.2" PrivateAssets="All" />
2930
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x64" PrivateAssets="All" />
3031
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x86" PrivateAssets="All" />
31-
<!-- When updating this add the previous SiteExtension(s) to the list above -->
32-
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x86" Version="$(PackageVersion)" PrivateAssets="All" />
33-
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x64" Version="$(PackageVersion)" PrivateAssets="All" />
32+
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x86" PrivateAssets="All" />
33+
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x64" PrivateAssets="All" />
3434
</ItemGroup>
3535

3636
<ItemGroup>
@@ -53,10 +53,14 @@
5353
</MSBuild>
5454

5555
<ItemGroup>
56-
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x86"
56+
<!--
57+
When updating AspNetCoreMajorVersion or AspNetCoreMinorVersion, add the following SiteExtension packages to
58+
the list above and bump the version here.
59+
-->
60+
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x86"
5761
Version="%(_ResolvedPackageVersionInfo.PackageVersion)"
5862
PrivateAssets="All" />
59-
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x64"
63+
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x64"
6064
Version="%(_ResolvedPackageVersionInfo.PackageVersion)"
6165
PrivateAssets="All" />
6266
</ItemGroup>

‎src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515

1616
<ItemGroup>
1717
<Reference Include="Microsoft.Data.SqlClient" />
18-
19-
<!-- Intentional change to remove reference to System.Data.SqlClient. See https://github.com/dotnet/aspnetcore/issues/12445 -->
20-
<SuppressBaselineReference Include="System.Data.SqlClient" />
2118
</ItemGroup>
2219

2320
</Project>

0 commit comments

Comments
 (0)