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

Merge pull request #14329 from dotnet/marcpopMSFT-branding8.0.1xx

Browse source 
Alpha branding
This commit is contained in:
Marc Paine 2022-08-19 11:52:37 -07:00 committed by GitHub
commit 61d7ced1de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Versions.props
View file

@ -5,12 +5,12 @@
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
</PropertyGroup>
<PropertyGroup>
<VersionMajor>7</VersionMajor>
<VersionMajor>8</VersionMajor>
<VersionMinor>0</VersionMinor>
<VersionSDKMinor>1</VersionSDKMinor>
<VersionFeature>00</VersionFeature>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>

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

@ -318,8 +318,11 @@
<!-- 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)' == '$(MajorMinorVersion)'"/>
Condition="'%(TemplatesMajorMinorVersion)' == '7.0'"/>
</ItemGroup>
<PropertyGroup>
<LatestTemplateMsiInstallerFile>@(LatestTemplateInstallerComponent->'%(MSIInstallerFile)')</LatestTemplateMsiInstallerFile>