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

Fix the logic to pass in the version of VS all the way through to the candle app

Browse source
This commit is contained in:
Marc Paine 2023-04-14 14:25:04 -07:00
parent fffc681edd
commit f095e7a60b
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -315,9 +315,12 @@
Outputs="$(MinimumVSVersion)"> Outputs="$(MinimumVSVersion)">
<PropertyGroup> <PropertyGroup>
<FileToRead Condition="$([System.Text.RegularExpressions.Regex]::Match(%(SDKInternalFiles.Identity),'.*minimumMSBuildVersion').Success) ">%(SDKInternalFiles.Identity)</FileToRead> <MinimumMSBuildVersionFile Condition="$([System.Text.RegularExpressions.Regex]::Match(%(SDKInternalFiles.Identity),'.*minimumMSBuildVersion').Success) ">%(SDKInternalFiles.Identity)</MinimumMSBuildVersionFile>
<MinimumVSVersion>$([System.IO.File]::ReadAllText($(FileToRead)).Trim())</MinimumVSVersion>
</PropertyGroup> </PropertyGroup>
<ReadLinesFromFile File="$(MinimumMSBuildVersionFile)">
<Output TaskParameter="Lines" PropertyName="MinimumVSVersion"/>
</ReadLinesFromFile>
</Target> </Target>
<Target Name="GenerateSdkBundle" <Target Name="GenerateSdkBundle"
@ -365,6 +368,7 @@
-DotnetCLINugetVersion '$(Version)' ^ -DotnetCLINugetVersion '$(Version)' ^
-VersionMajor '$(VersionMajor)' ^ -VersionMajor '$(VersionMajor)' ^
-VersionMinor '$(VersionMinor)' ^ -VersionMinor '$(VersionMinor)' ^
-MinimumVSVersion '$(MinimumVSVersion)' ^
-WindowsDesktopVersion '$(MicrosoftWindowsDesktopAppRuntimePackageVersion)' ^ -WindowsDesktopVersion '$(MicrosoftWindowsDesktopAppRuntimePackageVersion)' ^
-UpgradeCode '$(CombinedFrameworkSDKHostInstallerUpgradeCode)' ^ -UpgradeCode '$(CombinedFrameworkSDKHostInstallerUpgradeCode)' ^
-DependencyKeyName '$(SdkDependencyKeyName)' ^ -DependencyKeyName '$(SdkDependencyKeyName)' ^

3
src/redist/targets/packaging/windows/clisdk/generatebundle.ps1
View file

@ -24,6 +24,7 @@ param(
[Parameter(Mandatory=$true)][string]$ProductMoniker, [Parameter(Mandatory=$true)][string]$ProductMoniker,
[Parameter(Mandatory=$true)][string]$DotnetMSIVersion, [Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
[Parameter(Mandatory=$true)][string]$SDKBundleVersion, [Parameter(Mandatory=$true)][string]$SDKBundleVersion,
[Parameter(Mandatory=$true)][string]$MinimumVSVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion, [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
[Parameter(Mandatory=$true)][string]$VersionMajor, [Parameter(Mandatory=$true)][string]$VersionMajor,
[Parameter(Mandatory=$true)][string]$VersionMinor, [Parameter(Mandatory=$true)][string]$VersionMinor,
@ -49,6 +50,7 @@ function RunCandleForBundle
-dProductMoniker="$ProductMoniker" ` -dProductMoniker="$ProductMoniker" `
-dBuildVersion="$DotnetMSIVersion" ` -dBuildVersion="$DotnetMSIVersion" `
-dSDKBundleVersion="$SDKBundleVersion" ` -dSDKBundleVersion="$SDKBundleVersion" `
-dMinimumVSVersion="$MinimumVSVersion" `
-dSDKProductBandVersion="$SDKProductBandVersion" ` -dSDKProductBandVersion="$SDKProductBandVersion" `
-dNugetVersion="$DotnetCLINugetVersion" ` -dNugetVersion="$DotnetCLINugetVersion" `
-dVersionMajor="$VersionMajor" ` -dVersionMajor="$VersionMajor" `
@ -72,7 +74,6 @@ function RunCandleForBundle
-dTemplatesMsiSourcePath="$TemplatesMSIFile" ` -dTemplatesMsiSourcePath="$TemplatesMSIFile" `
-dManifestsMsiSourcePath="$ManifestsMSIFile" ` -dManifestsMsiSourcePath="$ManifestsMSIFile" `
-dWinFormsAndWpfVersion="$WindowsDesktopVersion" ` -dWinFormsAndWpfVersion="$WindowsDesktopVersion" `
-dMinimumVSVersion="$MinimumVSVersion" `
-dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" ` -dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" `
-dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" ` -dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" `
-dAdditionalSharedHostMsiSourcePath="$AdditionalSharedHostMSIFile" ` -dAdditionalSharedHostMsiSourcePath="$AdditionalSharedHostMSIFile" `