Skip to content

[release/3.1] Generate non-stable version for installer #26065

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

Merged
merged 6 commits into from
Oct 13, 2020
Merged

[release/3.1] Generate non-stable version for installer #26065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
62b534f
Generate non-stable version for installer
wtgodbe Sep 18, 2020
4ebc145
Fix versions
wtgodbe Sep 18, 2020
1f7fb7c
Add upgrade codes for 3.1.0-3.1.8
wtgodbe Sep 21, 2020
de58e88
Fixup
wtgodbe Sep 21, 2020
c72ac79
Remove whitespace
wtgodbe Sep 21, 2020
50eac5c
Add codes for 3.1.9
wtgodbe Sep 30, 2020
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
50 changes: 50 additions & 0 deletions src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,56 @@
<?endif?>
<?endif?>

<!-- Ensure upgrades from 3.1.0 thru 3.1.9 for x64. -->
<?if $(var.MajorVersion)=3 and $(var.MinorVersion)=1?>
<?if $(var.Platform)=x64?>
<!--'Microsoft ASP.NET Core 3.1.9 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{9BD9F5C9-7DE4-3A3C-AB10-29B30D48CB39}"/>
<!--'Microsoft ASP.NET Core 3.1.8 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{BA264433-7668-3F63-BA27-0B842B591B41}"/>
<!--'Microsoft ASP.NET Core 3.1.7 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{E843D8AB-9AE4-3BBA-B417-E920A145D4D2}"/>
<!--'Microsoft ASP.NET Core 3.1.6 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{598E3E3B-DFA5-3F58-B2CF-EA59B0CD04E6}"/>
<!--'Microsoft ASP.NET Core 3.1.5 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{C2718AD8-4EC1-300D-A871-E98A1AC69180}"/>
<!--'Microsoft ASP.NET Core 3.1.4 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{F6D32B6E-2736-3FCC-B0F8-CB4C5AF95B2E}"/>
<!--'Microsoft ASP.NET Core 3.1.3 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{33468842-C5B0-3189-96D7-8CD8D28585B9}"/>
<!--'Microsoft ASP.NET Core 3.1.2 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{54EE87B3-B909-37F1-85AD-EE2296ABD2F1}"/>
<!--'Microsoft ASP.NET Core 3.1.1 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{90F6AF22-13B2-3D34-9CF0-C7F407DF4195}"/>
<!--'Microsoft ASP.NET Core 3.1.0 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{A65A6022-E10B-3AEF-802C-B9AFE0B000E2}"/>
<?endif?>

<!-- Ensure upgrades from 3.1.0 thru 3.1.9 for x64. -->
<?if $(var.Platform)=x86?>
<!--'Microsoft ASP.NET Core 3.1.9 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{BE2349EF-BC78-3E42-B29C-E61D12E02FE4}"/>
<!--'Microsoft ASP.NET Core 3.1.8 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{F9E1048A-39B9-3AE1-8AA1-6B054A204A84}"/>
<!--'Microsoft ASP.NET Core 3.1.7 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{48272B78-3954-3D58-AB75-27B31E0D0DBD}"/>
<!--'Microsoft ASP.NET Core 3.1.6 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{52FF933A-F022-3A0A-8200-4C0E8E3934C3}"/>
<!--'Microsoft ASP.NET Core 3.1.5 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{F8C888A3-46C2-3306-8C90-5622C65BEBE3}"/>
<!--'Microsoft ASP.NET Core 3.1.4 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{EC496CB3-526B-366D-B667-3A20354DB136}"/>
<!--'Microsoft ASP.NET Core 3.1.3 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{05780385-0142-3FAA-9B97-F785C4798EC1}"/>
<!--'Microsoft ASP.NET Core 3.1.2 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{4EBEC6A2-DB4C-396B-BAE7-890D1D7EB9B3}"/>
<!--'Microsoft ASP.NET Core 3.1.1 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{5F160755-5B95-32A7-8D4F-ED1BA9F959D1}"/>
<!--'Microsoft ASP.NET Core 3.1.0 - Shared Framework'-->
<RelatedBundle Action="Upgrade" Id="{AC05AAAB-C217-3B65-95FE-11D2CB07A485}"/>
<?endif?>
<?endif?>

<PayloadGroup Id="PG_Resources">
<?foreach lcid in 2052;1028;1029;1031;3082;1036;1040;1041;1042;1045;1046;1049;1055?>
<Payload Id="PL_thm_$(var.lcid)" SourceFile="$(var.lcid)\thm.wxl" Name="$(var.lcid)\thm.wxl" Compressed="yes"/>
Expand Down
24 changes: 24 additions & 0 deletions src/Installers/Windows/WindowsHostingBundle/Bundle.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,30 @@
<RelatedBundle Action="Upgrade" Id="{EA47395A-BC9B-3ECC-8229-229BC9528DF6}"/>
<?endif?>

<!-- Ensure upgrades from 3.1.0 thru 3.1.9 for x64. -->
<?if $(var.MajorVersion)=3 and $(var.MinorVersion)=1?>
<!--'Microsoft .NET Core 3.1.9 - Windows Server Hosting'-->
<RelatedBundle Action="Upgrade" Id="{E4913286-9840-380A-8743-3DF839147FF0}"/>
<!--'Microsoft .NET Core 3.1.8 - Windows Server Hosting'-->
<RelatedBundle Action="Upgrade" Id="{81D96996-6F29-3BAC-82C6-9156FE1BD5FB}"/>
<!--'Microsoft .NET Core 3.1.7 - Windows Server Hosting'-->
<RelatedBundle Action="Upgrade" Id="{44D6EE78-0248-36AD-9B2C-26FA728E477D}"/>
<!--'Microsoft .NET Core 3.1.6 - Windows Server Hosting'-->
<RelatedBundle Action="Upgrade" Id="{C0453F97-42DD-3CD5-9FCE-018DD1F1A020}"/>
<!--'Microsoft .NET Core 3.1.5 - Windows Server Hosting'-->
<RelatedBundle Action="Upgrade" Id="{8BF71BDA-9BF7-3AD5-9E6B-3656FEEC95AA}"/>
<!--'Microsoft .NET Core 3.1.4 - Windows Server Hosting'-->
<RelatedBundle Action="Upgrade" Id="{6CF8B606-EE26-3536-BEFE-410EA70DBB94}"/>
<!--'Microsoft .NET Core 3.1.3 - Windows Server Hosting'-->
<RelatedBundle Action="Upgrade" Id="{71F4232E-75BF-32AF-9A8F-1E87CC17CC6C}"/>
<!--'Microsoft .NET Core 3.1.2 - Windows Server Hosting'-->
<RelatedBundle Action="Upgrade" Id="{3CDBE509-D166-335B-BD17-EA6FDAC4E03A}"/>
<!--'Microsoft .NET Core 3.1.1 - Windows Server Hosting'-->
<RelatedBundle Action="Upgrade" Id="{62155173-E27B-3936-997F-56DA96ED19B5}"/>
<!--'Microsoft .NET Core 3.1.0 - Windows Server Hosting'-->
<RelatedBundle Action="Upgrade" Id="{6F741175-2F75-3845-B30B-6C364101EAA2}"/>
<?endif?>

<PayloadGroup Id="PG_Resources">
<?foreach lcid in 2052;1028;1029;1031;3082;1036;1040;1041;1042;1045;1046;1049;1055?>
<Payload Id="PL_thm_$(var.lcid)" SourceFile="$(var.lcid)\thm.wxl" Name="$(var.lcid)\thm.wxl" Compressed="yes"/>
Expand Down
10 changes: 5 additions & 5 deletions src/Installers/Windows/Wix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project>
<!-- Set versioning properties after Arcade SDK targets have been imported. -->
<PropertyGroup>
<!-- Used for generating stable upgrade codes for bundles -->
<Version>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion).0</Version>
<!-- Actual upgrade code used in bundles to ensure upgrades withing a version band, e.g. 3.0.0.xxx -->
<_FileRevisionVersion>$(VersionSuffixDateStamp)</_FileRevisionVersion>
<_FileRevisionVersion Condition=" '$(_FileRevisionVersion)' == '' ">42424</_FileRevisionVersion>
<BundleVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion).$(_FileRevisionVersion)</BundleVersion>
<BundleVersion>$(AspNetCoreMajorMinorVersion).$(AspNetCorePatchVersion).$(_FileRevisionVersion)</BundleVersion>
<!-- Used for generating stable upgrade codes for bundles -->
<Version>$(BundleVersion)</Version>

<DefineConstants>$(DefineConstants);MajorVersion=$(AspNetCoreMajorVersion)</DefineConstants>
<DefineConstants>$(DefineConstants);MinorVersion=$(AspNetCoreMinorVersion)</DefineConstants>
Expand All @@ -21,7 +21,7 @@
</PropertyGroup>

<PropertyGroup>
<GuidInputs>$(Version);$(Platform);$(VersionSuffix);$(_BuildNumberLabels)</GuidInputs>
<GuidInputs>$(Version);$(Platform);$(VersionSuffix)</GuidInputs>
</PropertyGroup>

<Target Name="GenerateGUIDs" BeforeTargets="BeforeBuild" DependsOnTargets="_GeneratePackageGuids;_GenerateBundleGuids" Condition=" '$(DisableGuidGeneration)' != 'true' " />
Expand All @@ -44,7 +44,7 @@
the upgrade code. Bundle upgrades pivot on Major.Minor.Patch changes. For example, 3.0.1-preview 1 can upgrade to 3.0.1-preview 8, but 3.0.1
cannot upgrade to 3.0.2 or 3.1. -->
<PropertyGroup>
<BundleGuidInputs>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion);$(Platform)</BundleGuidInputs>
<BundleGuidInputs>$(AspNetCoreMajorMinorVersion);$(Platform)</BundleGuidInputs>
</PropertyGroup>
<GenerateGuid NamespaceGuid="$(NamespaceGuid)" Values="$(BundleGuidInputs)">
<Output TaskParameter="Guid" PropertyName="BundleProviderKey" />
Expand Down