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

Update Versions.props for 7.0.1xx (#11566)

Browse source 
* Update Versions.props

* 7.0 branding fixes
- Make generatebundle.ps1 command pass parameters explicitly rather than positionally
- Hardcode to 6.0 templates until 7.0 templates are available.

* Fix misisng '

Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
This commit is contained in:
Marc Paine 2021-08-20 10:29:57 -07:00 committed by GitHub
parent 938fe091e6
commit 0e3c232268
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 33 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>6</VersionMajor>
<VersionMajor>7</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>

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

@ -333,44 +333,47 @@
<!-- Choose "latest" template MSI to go in bundle. -->
<ItemGroup>
<!-- While we don't have 7.0 templates available (need SDK update, choose the 6.0 templates -->
<!-- <LatestTemplateInstallerComponent Include="@(TemplatesMsiComponent)"
Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/> -->
<LatestTemplateInstallerComponent Include="@(TemplatesMsiComponent)"
Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/>
Condition="'%(TemplatesMajorMinorVersion)' == '6.0'"/>
</ItemGroup>
<PropertyGroup>
<LatestTemplateMsiInstallerFile>@(LatestTemplateInstallerComponent->'%(MSIInstallerFile)')</LatestTemplateMsiInstallerFile>
</PropertyGroup>
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateBundlePowershellScript) ^
'$(SdkMSIInstallerFile)' ^
'$(DownloadsFolder)$(DownloadedAspNetCoreSharedFxWixLibFileName)' ^
'$(DownloadsFolder)$(DownloadedSharedFrameworkInstallerFileName)' ^
'$(DownloadsFolder)$(DownloadedHostFxrInstallerFileName)' ^
'$(DownloadsFolder)$(DownloadedSharedHostInstallerFileName)' ^
'$(DownloadsFolder)$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)' ^
'$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName)' ^
'$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)' ^
'$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)' ^
'$(DownloadsFolder)$(DownloadedAlternateNetCoreAppHostPackInstallerFileName)' ^
'$(DownloadsFolder)$(DownloadedArmNetCoreAppHostPackInstallerFileName)' ^
'$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^
'$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^
'$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^
'$(FinalizerExe)' ^
'$(LatestTemplateMsiInstallerFile)' ^
'$(ManifestsMsiInstallerFile)' ^
'$(CombinedFrameworkSdkHostMSIInstallerFile)' ^
'$(WixRoot)' ^
'$(SdkBrandName)' ^
'$(MsiVersion)' ^
'$(SDKBundleVersion)' ^
'$(Version)' ^
'$(MicrosoftWindowsDesktopAppRuntimePackageVersion)' ^
'$(CombinedFrameworkSDKHostInstallerUpgradeCode)' ^
'$(SdkDependencyKeyName)' ^
'$(Architecture)' ^
'$(MicrosoftNETCoreAppRuntimePackageVersion)' ^
'$(MicrosoftAspNetCoreAppRuntimePackageVersion)' ^
'$(CliProductBandVersion)' ^
-CLISDKMSIFile '$(SdkMSIInstallerFile)' ^
-ASPNETRuntimeWixLibFile '$(DownloadsFolder)$(DownloadedAspNetCoreSharedFxWixLibFileName)' ^
-SharedFxMSIFile '$(DownloadsFolder)$(DownloadedSharedFrameworkInstallerFileName)' ^
-HostFxrMSIFile '$(DownloadsFolder)$(DownloadedHostFxrInstallerFileName)' ^
-SharedHostMSIFile '$(DownloadsFolder)$(DownloadedSharedHostInstallerFileName)' ^
-WinFormsAndWpfMSIFile '$(DownloadsFolder)$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)' ^
-NetCoreAppTargetingPackMSIFile '$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName)' ^
-NetStandardTargetingPackMSIFile '$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)' ^
-NetCoreAppHostPackMSIFile '$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)' ^
-AlternateNetCoreAppHostPackMSIFile '$(DownloadsFolder)$(DownloadedAlternateNetCoreAppHostPackInstallerFileName)' ^
-ArmNetCoreAppHostPackMSIFile '$(DownloadsFolder)$(DownloadedArmNetCoreAppHostPackInstallerFileName)' ^
-Arm64NetCoreAppHostPackMSIFile '$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^
-AspNetTargetingPackMSIFile '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^
-WindowsDesktopTargetingPackMSIFile '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^
-FinalizerExe '$(FinalizerExe)' ^
-TemplatesMSIFile '$(LatestTemplateMsiInstallerFile)' ^
-ManifestsMSIFile '$(ManifestsMsiInstallerFile)' ^
-DotnetBundleOutput '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^
-WixRoot '$(WixRoot)' ^
-ProductMoniker '$(SdkBrandName)' ^
-DotnetMSIVersion '$(MsiVersion)' ^
-SDKBundleVersion '$(SDKBundleVersion)' ^
-DotnetCLINugetVersion '$(Version)' ^
-WindowsDesktopVersion '$(MicrosoftWindowsDesktopAppRuntimePackageVersion)' ^
-UpgradeCode '$(CombinedFrameworkSDKHostInstallerUpgradeCode)' ^
-DependencyKeyName '$(SdkDependencyKeyName)' ^
-Architecture '$(Architecture)' ^
-DotNetRuntimeVersion '$(MicrosoftNETCoreAppRuntimePackageVersion)' ^
-AspNetCoreVersion '$(MicrosoftAspNetCoreAppRuntimePackageVersion)' ^
-SDKProductBandVersion '$(CliProductBandVersion)' ^
-InformationAction Continue " />
<ItemGroup>
<BundleMsiWixSrcFiles Include="$(WixRoot)\bundle.wixobj" />