From e4ad1969d346798b74290f298ef4d1f4fd713535 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 13 Aug 2020 12:51:33 -0700 Subject: [PATCH] Fixup license paths (#8160) dummyeula.rtf is in the same location as the PS scripts --- src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 | 2 +- .../packaging/windows/clisdk/generatesdkplaceholdermsi.ps1 | 2 +- .../targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 index 3920119b3..6939eb990 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 @@ -61,7 +61,7 @@ function RunCandle $candleOutput = .\candle.exe -nologo ` -dDotnetSrc="$inputDir" ` - -dMicrosoftEula="$PSScriptRoot\clisdk\dummyeula.rtf" ` + -dMicrosoftEula="$PSScriptRoot\dummyeula.rtf" ` -dProductMoniker="$ProductMoniker" ` -dBuildVersion="$DotnetMSIVersion" ` -dSDKBundleVersion="$SDKBundleVersion" ` diff --git a/src/redist/targets/packaging/windows/clisdk/generatesdkplaceholdermsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatesdkplaceholdermsi.ps1 index 9a307e01c..4461b0cc9 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatesdkplaceholdermsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatesdkplaceholdermsi.ps1 @@ -22,7 +22,7 @@ function RunCandle $candleOutput = .\candle.exe -nologo ` -dDotnetSrc="$inputDir" ` - -dMicrosoftEula="$PSScriptRoot\clisdk\dummyeula.rtf" ` + -dMicrosoftEula="$PSScriptRoot\dummyeula.rtf" ` -dProductMoniker="$ProductMoniker" ` -dBuildVersion="$DotnetMSIVersion" ` -dSDKBundleVersion="$SDKBundleVersion" ` diff --git a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 index 7947d20a4..151767c7e 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 @@ -54,7 +54,7 @@ function RunCandle $candleOutput = .\candle.exe -nologo ` -dDotnetSrc="$inputDir" ` - -dMicrosoftEula="$PSScriptRoot\clisdk\dummyeula.rtf" ` + -dMicrosoftEula="$PSScriptRoot\dummyeula.rtf" ` -dProductMoniker="$ProductMoniker" ` -dBuildVersion="$DotnetMSIVersion" ` -dSDKBundleVersion="$SDKBundleVersion" `