Skip to content

Commit cae6a9c

Browse files
wtgodbepranavkm
andauthored
Use non-stable versioning in blazor-wasm (#18894)
* Use stable versioning in blazor-wasm * This branch never builds the targeting pack * Update eng/Versions.props * Undo changes to patchconfig.props Co-authored-by: Pranav K <[email protected]>
1 parent 82cbdc6 commit cae6a9c

File tree

6 files changed

+7
-19
lines changed

6 files changed

+7
-19
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
<RuntimeInstallerBaseName>aspnetcore-runtime</RuntimeInstallerBaseName>
8585
<TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>
8686

87-
<!-- Used to only produce targeting pack installers/packages once per major.minor. -->
88-
<IsTargetingPackBuilding Condition="'$(AspNetCorePatchVersion)' != '0' OR '$(DotNetBuildFromSource)' == 'true'">false</IsTargetingPackBuilding>
87+
<!-- This branch will never build the targeting pack. -->
88+
<IsTargetingPackBuilding>false</IsTargetingPackBuilding>
8989

9090
<!--
9191
Archives and installers using this prefix are intended for internal-use only.

Directory.Build.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,8 @@
105105
<Compile Include="$(SharedSourceRoot)ReferenceAssemblyInfo.cs" LinkBase="Properties" />
106106
</ItemGroup>
107107

108-
<PropertyGroup Condition="'$(Language)' == 'C#'">
108+
<PropertyGroup Condition="'$(Language)' == 'C#' AND '$(IsReferenceAssemblyProject)' == 'true'">
109109
<!-- Reference assemblies should always use Major.Minor.0.0 for assembly versions even during servicing. Only the package version should be updated. -->
110-
<!-- Pinning the implementation assemblies at Major.Minor.0.0 as we figure out compiling against ref assemblies. -->
111110
<AssemblyVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0.0</AssemblyVersion>
112111
</PropertyGroup>
113112

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<Project>
88
<PropertyGroup Label="Version settings">
99
<AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
10-
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
11-
<AspNetCorePatchVersion>2</AspNetCorePatchVersion>
12-
<PreReleasePreviewNumber>0</PreReleasePreviewNumber>
10+
<AspNetCoreMinorVersion>2</AspNetCoreMinorVersion>
11+
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
12+
<PreReleasePreviewNumber>2</PreReleasePreviewNumber>
1313
<!--
1414
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1515
-->
16-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
16+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1717
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
1818
<IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
1919
<IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>

src/Components/Blazor/Blazor.Version.props

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
<Project>
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
3-
<Import Project="Blazor.Version.props" />
43
</Project>

src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<BlazorProjectsRoot>$(RepoRoot)src\Components\Blazor\</BlazorProjectsRoot>
44
</PropertyGroup>
55

6-
<Import Project="$(BlazorProjectsRoot)Blazor.Version.props" />
7-
86
<PropertyGroup>
97
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
108
<IsShippingPackage>true</IsShippingPackage>

0 commit comments

Comments
 (0)