mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #14727 from dotnet/marcpopMSFT-winformstemplates

Browse source 
Target 8.0 templates and fix errant versioning
This commit is contained in:
Marc Paine 2022-10-12 11:18:07 -07:00 • committed by GitHub
commit db39ca2cab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eng/Versions.props
View file

@ -7,7 +7,7 @@
<PropertyGroup>
<VersionMajor>8</VersionMajor>
<VersionMinor>0</VersionMinor>
<VersionSDKMinor>2</VersionSDKMinor>
<VersionSDKMinor>1</VersionSDKMinor>
<VersionFeature>00</VersionFeature>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>

5
src/redist/targets/GenerateMSIs.targets
View file

@ -318,11 +318,8 @@
<!-- Choose "latest" template MSI to go in bundle. -->
<ItemGroup>
<!-- While we don't have 8.0 templates available (need SDK update, choose the 7.0 templates -->
<!-- <LatestTemplateInstallerComponent Include="@(TemplatesMsiComponent)"
Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/> -->
<LatestTemplateInstallerComponent Include="@(TemplatesMsiComponent)"
Condition="'%(TemplatesMajorMinorVersion)' == '7.0'"/>
Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/>
</ItemGroup>
<PropertyGroup>
<LatestTemplateMsiInstallerFile>@(LatestTemplateInstallerComponent->'%(MSIInstallerFile)')</LatestTemplateMsiInstallerFile>