Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 7b67ca3

Browse files
joeloffjoeloff
authored
Merge pull request #13636 from dotnet/joeloff/BackportUpgrade-2.1.5xx
Backport upgrade logic for 2.1.5xx
2 parents ab0750b + f4d02ae commit 7b67ca3

File tree

3 files changed

+86
-2
lines changed

3 files changed

+86
-2
lines changed

‎build/Version.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
<PropertyGroup>
33
<VersionMajor>2</VersionMajor>
44
<VersionMinor>1</VersionMinor>
5-
<VersionPatch>520</VersionPatch>
5+
<FeatureBand>500</FeatureBand>
6+
<PatchLevel>20</PatchLevel>
7+
<VersionPatch>$([MSBuild]::Add($(FeatureBand),$(PatchLevel)))</VersionPatch>
8+
69
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>
710

811
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>

‎build/package/Installer.MSI.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@
6969
PropertyName="MSBuildExtensionsInstallerUpgradeCode" />
7070
</GenerateGuidFromName>
7171

72-
<GenerateGuidFromName Name="$(CombinedFrameworkSdkHostInstallerFile)">
72+
<!-- Generate stable GUID to enable upgrades. The input would be "dotnet-sdk;2;1;500;x86" -->
73+
<GenerateGuidFromName Name="$(ArtifactNameCombinedHostHostFxrFrameworkSdk);$(VersionMajor);$(VersionMinor);$(FeatureBand);$(Architecture)">
7374
<Output TaskParameter="OutputGuid"
7475
PropertyName="CombinedFrameworkSDKHostInstallerUpgradeCode" />
7576
</GenerateGuidFromName>

‎packaging/windows/clisdk/bundle.wxs

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,86 @@
2020
<PayloadGroupRef Id="DotnetCoreBAPayloads" />
2121
</BootstrapperApplicationRef>
2222

23+
<?if $(var.Platform)=x86?>
24+
<!--'Microsoft .NET Core SDK 2.1.519 (x86)'-->
25+
<RelatedBundle Id="{F541790F-588E-7F06-A465-915196830AC4}" Action="Upgrade" />
26+
<!--'Microsoft .NET Core SDK 2.1.518 (x86)'-->
27+
<RelatedBundle Id="{DA380458-52FC-4A06-1AD8-63E8ADED70D8}" Action="Upgrade" />
28+
<!--'Microsoft .NET Core SDK 2.1.517 (x86)'-->
29+
<RelatedBundle Id="{880FA12A-5B0F-6CAA-D3AA-EE78546AFA0F}" Action="Upgrade" />
30+
<!--'Microsoft .NET Core SDK 2.1.516 (x86)'-->
31+
<RelatedBundle Id="{B560AFD3-5738-4A6C-D742-5459F522B189}" Action="Upgrade" />
32+
<!--'Microsoft .NET Core SDK 2.1.515 (x86)'-->
33+
<RelatedBundle Id="{DC836BB2-5A46-4756-1E8F-6154D89EEBBC}" Action="Upgrade" />
34+
<!--'Microsoft .NET Core SDK 2.1.514 (x86)'-->
35+
<RelatedBundle Id="{508CEBC3-5EDA-5D0C-595A-6D2685BB2765}" Action="Upgrade" />
36+
<!--'Microsoft .NET Core SDK 2.1.513 (x86)'-->
37+
<RelatedBundle Id="{1C32B8A1-5C46-72AF-7653-39D18A0B487B}" Action="Upgrade" />
38+
<!--'Microsoft .NET Core SDK 2.1.512 (x86)'-->
39+
<RelatedBundle Id="{92028CCC-55E5-7811-EBAF-B628882FE69B}" Action="Upgrade" />
40+
<!--'Microsoft .NET Core SDK 2.1.511 (x86)'-->
41+
<RelatedBundle Id="{7E8ECD30-5403-6A72-EDDB-85ACE5425459}" Action="Upgrade" />
42+
<!--'Microsoft .NET Core SDK 2.1.510 (x86)'-->
43+
<RelatedBundle Id="{F1B575D9-5C0A-4C35-35F2-DE5BA0A4C71B}" Action="Upgrade" />
44+
<!--'Microsoft .NET Core SDK 2.1.509 (x86)'-->
45+
<RelatedBundle Id="{3862E391-5373-53FD-06E9-0EB9E5FC5BC1}" Action="Upgrade" />
46+
<!--'Microsoft .NET Core SDK 2.1.508 (x86)'-->
47+
<RelatedBundle Id="{5AB5E45E-5B8E-659B-164D-28E4706E78A4}" Action="Upgrade" />
48+
<!--'Microsoft .NET Core SDK 2.1.507 (x86)'-->
49+
<RelatedBundle Id="{B201DA32-5687-5056-4881-7ABCFC4D081E}" Action="Upgrade" />
50+
<!--'Microsoft .NET Core SDK 2.1.506 (x86)'-->
51+
<RelatedBundle Id="{225A01C6-58AE-6E4A-2B85-6782733E75AF}" Action="Upgrade" />
52+
<!--'Microsoft .NET Core SDK 2.1.505 (x86)'-->
53+
<RelatedBundle Id="{8B69E8F5-500B-6C4F-777F-9DEF6B259DF5}" Action="Upgrade" />
54+
<!--'Microsoft .NET Core SDK 2.1.504 (x86)'-->
55+
<RelatedBundle Id="{339842FB-5DAD-48EE-7D0D-5112170E5EA1}" Action="Upgrade" />
56+
<!--'Microsoft .NET Core SDK 2.1.503 (x86)'-->
57+
<RelatedBundle Id="{CD983561-5C16-6950-4265-8D2396215D2C}" Action="Upgrade" />
58+
<!--'Microsoft .NET Core SDK 2.1.502 (x86)'-->
59+
<RelatedBundle Id="{B54EE829-56F5-5BA4-8788-186C72E08157}" Action="Upgrade" />
60+
<!--'Microsoft .NET Core SDK 2.1.500 (x86)'-->
61+
<RelatedBundle Id="{B03260DC-5964-6D95-137E-67F614A6C69D}" Action="Upgrade" />
62+
<?elseif $(var.Platform)=x64?>
63+
<!--'Microsoft .NET Core SDK 2.1.519 (x64)'-->
64+
<RelatedBundle Id="{A803FD8D-50B5-7A69-7ACD-5D1A7F872BB8}" Action="Upgrade" />
65+
<!--'Microsoft .NET Core SDK 2.1.518 (x64)'-->
66+
<RelatedBundle Id="{2F7AB469-5945-44FD-CFA4-29467B449619}" Action="Upgrade" />
67+
<!--'Microsoft .NET Core SDK 2.1.517 (x64)'-->
68+
<RelatedBundle Id="{6D50454D-528B-55EE-2651-F35AC787E95C}" Action="Upgrade" />
69+
<!--'Microsoft .NET Core SDK 2.1.516 (x64)'-->
70+
<RelatedBundle Id="{A198FFE3-5D27-70D3-E071-92C14841F825}" Action="Upgrade" />
71+
<!--'Microsoft .NET Core SDK 2.1.515 (x64)'-->
72+
<RelatedBundle Id="{97E7BACE-5808-665E-C770-57C4C99B4772}" Action="Upgrade" />
73+
<!--'Microsoft .NET Core SDK 2.1.514 (x64)'-->
74+
<RelatedBundle Id="{CE5CFE78-5972-7519-4215-EA0A50F38419}" Action="Upgrade" />
75+
<!--'Microsoft .NET Core SDK 2.1.513 (x64)'-->
76+
<RelatedBundle Id="{628AB0DB-5B7D-565D-1EA4-37F6146CDE8C}" Action="Upgrade" />
77+
<!--'Microsoft .NET Core SDK 2.1.512 (x64)'-->
78+
<RelatedBundle Id="{239CAD19-59AE-657B-FFD4-A8235BE92FA2}" Action="Upgrade" />
79+
<!--'Microsoft .NET Core SDK 2.1.511 (x64)'-->
80+
<RelatedBundle Id="{8A47620B-55E0-746C-C324-E2D8A290B2F0}" Action="Upgrade" />
81+
<!--'Microsoft .NET Core SDK 2.1.510 (x64)'-->
82+
<RelatedBundle Id="{B012C515-5D80-5F23-A9A2-C1E9520939D2}" Action="Upgrade" />
83+
<!--'Microsoft .NET Core SDK 2.1.509 (x64)'-->
84+
<RelatedBundle Id="{41EF25EB-5093-5439-9441-F7E2462F2D04}" Action="Upgrade" />
85+
<!--'Microsoft .NET Core SDK 2.1.508 (x64)'-->
86+
<RelatedBundle Id="{CFDC735D-5FB6-4FF3-574D-A875C41E851C}" Action="Upgrade" />
87+
<!--'Microsoft .NET Core SDK 2.1.507 (x64)'-->
88+
<RelatedBundle Id="{E9ECF4BB-5FFD-7539-B7D6-4DCB3455D83B}" Action="Upgrade" />
89+
<!--'Microsoft .NET Core SDK 2.1.506 (x64)'-->
90+
<RelatedBundle Id="{3CD99468-5773-7BED-7199-8DF2E61B9D03}" Action="Upgrade" />
91+
<!--'Microsoft .NET Core SDK 2.1.505 (x64)'-->
92+
<RelatedBundle Id="{ED2F2005-5A36-68D6-39ED-77254D90AB6E}" Action="Upgrade" />
93+
<!--'Microsoft .NET Core SDK 2.1.504 (x64)'-->
94+
<RelatedBundle Id="{EEA4BAB3-58A6-5930-2483-679815BA8265}" Action="Upgrade" />
95+
<!--'Microsoft .NET Core SDK 2.1.503 (x64)'-->
96+
<RelatedBundle Id="{664F0593-5E53-7065-16AE-F0A46365F29C}" Action="Upgrade" />
97+
<!--'Microsoft .NET Core SDK 2.1.502 (x64)'-->
98+
<RelatedBundle Id="{C91E600E-5A6F-56CA-97FA-66EEA63F5B3F}" Action="Upgrade" />
99+
<!--'Microsoft .NET Core SDK 2.1.500 (x64)'-->
100+
<RelatedBundle Id="{32687B45-56E9-4ECE-9EEC-90D4E54AD3C9}" Action="Upgrade" />
101+
<?endif?>
102+
23103
<swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" />
24104

25105
<Variable Name="DOTNETHOME" Type="string" Value="[ProgramFiles6432Folder]dotnet" bal:Overridable="no" />

0 commit comments

Comments
 (0)