Skip to content

Commit 4590cf9

Browse files
dougbudougbu
committed
Update branding to 6.0.0 Alpha1
- hold the TFM back at `net5.0` - correct `TargetFrameworkVersion` in FrameworkList.xml; don't use `$(AspNetCoreMajorMinorVersion)` - move `$(DefaultNetCoreTargetFramework)` to eng/Versions.props - avoid repeating value in AfterSolutionBuild.targets and Directory.Build.props files - add new versions to `TemplatePackageInstaller` - update project template test scripts
1 parent ab973d2 commit 4590cf9

15 files changed

+20
-23
lines changed

‎Directory.Build.props‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,6 @@
8787
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
8888

8989
<IncludeSymbols>true</IncludeSymbols>
90-
91-
<!--
92-
Also update the DefaultNetCoreTargetFramework defined at src/Razor/test/testassets/Directory.Build.props and
93-
the packages referenced in Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj when this changes.
94-
-->
95-
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
9690
<DefaultNetFxTargetFramework>net461</DefaultNetFxTargetFramework>
9791
</PropertyGroup>
9892

‎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="$(DefaultNetCoreTargetFramework)" />
1919
</Target>
2020

2121
</Project>

‎eng/Versions.props‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@
66
-->
77
<Project>
88
<PropertyGroup Label="Version settings">
9-
<AspNetCoreMajorVersion>5</AspNetCoreMajorVersion>
9+
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
12+
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
1213
<!--
1314
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1415
-->
1516
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1617
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
17-
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
18-
<PreReleaseBrandingLabel>RTM $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
18+
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
19+
<PreReleaseBrandingLabel>Alpha $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
1920
<IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
2021
<IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
2122
<AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>
@@ -38,6 +39,10 @@
3839
<AspNetCoreModuleVersionRevision>$(AspNetCorePatchVersion)</AspNetCoreModuleVersionRevision>
3940
<!-- This is used for error checking to ensure generated code and baselines are up to date when we increment the patch. -->
4041
<PreviousAspNetCoreReleaseVersion Condition=" '$(AspNetCorePatchVersion)' != '0' ">$(AspNetCoreMajorMinorVersion).$([MSBuild]::Subtract($(AspNetCorePatchVersion), 1))</PreviousAspNetCoreReleaseVersion>
42+
<!--
43+
Update the packages referenced in Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj when this changes.
44+
-->
45+
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
4146
</PropertyGroup>
4247
<PropertyGroup Label="Arcade settings">
4348
<!-- Opt-in to Arcade tools for building VSIX projects. -->

‎src/Components/WebAssembly/Sdk/testassets/Directory.Build.props‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<!-- Do not resolve Reference ItemGroup since it has a different semantic meaning in Razor test apps -->
1313
<EnableCustomReferenceResolution>false</EnableCustomReferenceResolution>
1414

15-
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
16-
1715
<RepoRoot Condition="'$(RepoRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, 'AspNetCore.sln'))\</RepoRoot>
1816

1917
<RazorSdkCurrentVersionProps>$(RepoRoot)src\Razor\Microsoft.NET.Sdk.Razor\src\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>

‎src/Framework/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<ItemGroup>
1616
<FrameworkListRootAttributes Include="Name" Value="$(AspNetCoreAppFrameworkBrandName)" />
1717
<FrameworkListRootAttributes Include="TargetFrameworkIdentifier" Value="$(NETCoreAppFrameworkIdentifier)" />
18-
<FrameworkListRootAttributes Include="TargetFrameworkVersion" Value="$(AspNetCoreMajorMinorVersion)" />
18+
<FrameworkListRootAttributes Include="TargetFrameworkVersion" Value="$(DefaultNetCoreTargetFramework.Substring(3))" />
1919
<FrameworkListRootAttributes Include="FrameworkName" Value="$(SharedFxName)" />
2020
</ItemGroup>
2121

‎src/ProjectTemplates/Shared/TemplatePackageInstaller.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ internal static class TemplatePackageInstaller
3232
"Microsoft.DotNet.Web.ProjectTemplates.3.0",
3333
"Microsoft.DotNet.Web.ProjectTemplates.3.1",
3434
"Microsoft.DotNet.Web.ProjectTemplates.5.0",
35+
"Microsoft.DotNet.Web.ProjectTemplates.6.0",
3536
"Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1",
3637
"Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2",
3738
"Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0",
3839
"Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1",
3940
"Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0",
41+
"Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0",
4042
"Microsoft.DotNet.Web.Spa.ProjectTemplates",
4143
"Microsoft.AspNetCore.Blazor.Templates",
4244
};

‎src/ProjectTemplates/scripts/Run-Angular-Locally.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
99

1010
. $PSScriptRoot\Test-Template.ps1
1111

12-
Test-Template "angular" "angular" "Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0.5.0.0-dev.nupkg" $true
12+
Test-Template "angular" "angular" "Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0.6.0.0-dev.nupkg" $true

‎src/ProjectTemplates/scripts/Run-Blazor-Locally.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ $ErrorActionPreference = 'Stop'
1010

1111
. $PSScriptRoot\Test-Template.ps1
1212

13-
Test-Template "blazorserver" "blazorserver" "Microsoft.DotNet.Web.ProjectTemplates.5.0.5.0.0-dev.nupkg" $false
13+
Test-Template "blazorserver" "blazorserver" "Microsoft.DotNet.Web.ProjectTemplates.6.0.6.0.0-dev.nupkg" $false

‎src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
99

1010
. $PSScriptRoot\Test-Template.ps1
1111

12-
Test-Template "web" "web" "Microsoft.DotNet.Web.ProjectTemplates.5.0.5.0.0-dev.nupkg" $false
12+
Test-Template "web" "web" "Microsoft.DotNet.Web.ProjectTemplates.6.0.6.0.0-dev.nupkg" $false

‎src/ProjectTemplates/scripts/Run-Razor-Locally.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ param()
66

77
. $PSScriptRoot\Test-Template.ps1
88

9-
Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.5.0.5.0.0-dev.nupkg" $false
9+
Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.6.0.6.0.0-dev.nupkg" $false

0 commit comments

Comments
 (0)