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

Add dummy eula for Windows installer

Browse source
This commit is contained in:
William Li 2017-06-21 15:15:21 -07:00 committed by William Lee
parent ff9b8838f5
commit f4d884a03d
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/windows/clisdk/bundle.wxs
View file

@ -12,7 +12,7 @@
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.Foundation"> <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.Foundation">
<bal:WixStandardBootstrapperApplication <bal:WixStandardBootstrapperApplication
LicenseFile="..\..\osx\clisdk\resources\en.lproj\eula.rtf" LicenseFile="dummyeula.rtf"
ShowFilesInUse="yes" ShowFilesInUse="yes"
ShowVersion="yes" ShowVersion="yes"
/> />

BIN
packaging/windows/clisdk/dummyeula.rtf Normal file
View file

Binary file not shown.

2
packaging/windows/clisdk/generatebundle.ps1
View file

@ -30,7 +30,7 @@ function RunCandleForBundle
.\candle.exe -nologo ` .\candle.exe -nologo `
-dDotnetSrc="$inputDir" ` -dDotnetSrc="$inputDir" `
-dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" ` -dMicrosoftEula="$RepoRoot\packaging\windows\clisdk\dummyeula.rtf" `
-dProductMoniker="$ProductMoniker" ` -dProductMoniker="$ProductMoniker" `
-dBuildVersion="$DotnetMSIVersion" ` -dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIDisplayVersion" ` -dDisplayVersion="$DotnetCLIDisplayVersion" `

2
packaging/windows/clisdk/generatemsi.ps1
View file

@ -48,7 +48,7 @@ function RunCandle
.\candle.exe -nologo ` .\candle.exe -nologo `
-dDotnetSrc="$inputDir" ` -dDotnetSrc="$inputDir" `
-dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" ` -dMicrosoftEula="$RepoRoot\packaging\windows\clisdk\dummyeula.rtf" `
-dProductMoniker="$ProductMoniker" ` -dProductMoniker="$ProductMoniker" `
-dBuildVersion="$DotnetMSIVersion" ` -dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIDisplayVersion" ` -dDisplayVersion="$DotnetCLIDisplayVersion" `