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

Fix windows installer paths.

Browse source
This commit is contained in:
Piotr Puszkiewicz 2016-03-25 12:50:37 -07:00
parent fcbb7f31a7
commit af2cac0d88
9 changed files with 40 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
TestAssets/TestProjects/AppWithDirectDesktopDependency/Program.cs Normal file
View file

@ -0,0 +1,12 @@
using System;
namespace ConsoleApplication
{
public class Program
{
public static void Main(string[] args)
{
Console.WriteLine("Hello World!");
}
}
}

19
TestAssets/TestProjects/AppWithDirectDesktopDependency/project.json Normal file
View file

@ -0,0 +1,19 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"testRunner": "must-be-specified-to-generate-deps",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911",
"dotnet-hello": {
"version": "1.0.0",
"target": "package"
}
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

4
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\resources\en.lproj\eula.rtf" LicenseFile="..\..\osx\clisdk\resources\en.lproj\eula.rtf"
ShowFilesInUse="yes" ShowFilesInUse="yes"
ShowVersion="yes" ShowVersion="yes"
/> />
@ -48,7 +48,7 @@
<PayloadGroup Id="DotnetCoreBAPayloads"> <PayloadGroup Id="DotnetCoreBAPayloads">
<Payload Name="thm.xml" Compressed="yes" SourceFile="bundle.thm" /> <Payload Name="thm.xml" Compressed="yes" SourceFile="bundle.thm" />
<Payload Name="thm.wxl" Compressed="yes" SourceFile="bundle.wxl" /> <Payload Name="thm.wxl" Compressed="yes" SourceFile="bundle.wxl" />
<Payload Name="bg.png" Compressed="yes" SourceFile="..\..\osx\resources\dotnetbackground.png" /> <Payload Name="bg.png" Compressed="yes" SourceFile="..\..\osx\clisdk\resources\dotnetbackground.png" />
<Payload Name='eula.rtf' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf)' /> <Payload Name='eula.rtf' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf)' />
</PayloadGroup> </PayloadGroup>

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

@ -26,7 +26,7 @@ function RunCandleForBundle
.\candle.exe -nologo ` .\candle.exe -nologo `
-dDotnetSrc="$inputDir" ` -dDotnetSrc="$inputDir" `
-dMicrosoftEula="$RepoRoot\packaging\osx\resources\en.lproj\eula.rtf" ` -dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
-dBuildVersion="$DotnetMSIVersion" ` -dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIVersion" ` -dDisplayVersion="$DotnetCLIVersion" `
-dReleaseSuffix="$ReleaseSuffix" ` -dReleaseSuffix="$ReleaseSuffix" `

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

@ -46,7 +46,7 @@ function RunCandle
.\candle.exe -nologo ` .\candle.exe -nologo `
-dDotnetSrc="$inputDir" ` -dDotnetSrc="$inputDir" `
-dMicrosoftEula="$RepoRoot\packaging\osx\resources\en.lproj\eula.rtf" ` -dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
-dBuildVersion="$DotnetMSIVersion" ` -dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIVersion" ` -dDisplayVersion="$DotnetCLIVersion" `
-dReleaseSuffix="$ReleaseSuffix" ` -dReleaseSuffix="$ReleaseSuffix" `

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

@ -26,7 +26,7 @@ function RunCandle
-out "$WixObjRoot\" ` -out "$WixObjRoot\" `
-ext WixDependencyExtension.dll ` -ext WixDependencyExtension.dll `
-dHostSrc="$SharedHostPublishRoot" ` -dHostSrc="$SharedHostPublishRoot" `
-dMicrosoftEula="$RepoRoot\packaging\osx\resources\en.lproj\eula.rtf" ` -dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
-dBuildVersion="$DotnetMSIVersion" ` -dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIVersion" ` -dDisplayVersion="$DotnetCLIVersion" `
-arch $Architecture ` -arch $Architecture `

4
packaging/windows/sharedframework/bundle.wxs
View file

@ -12,7 +12,7 @@
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.Foundation"> <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.Foundation">
<bal:WixStandardBootstrapperApplication <bal:WixStandardBootstrapperApplication
LicenseFile="..\..\osx\resources\en.lproj\eula.rtf" LicenseFile="..\..\osx\sharedframework\resources\en.lproj\eula.rtf"
ShowFilesInUse="yes" ShowFilesInUse="yes"
ShowVersion="yes" ShowVersion="yes"
/> />
@ -41,7 +41,7 @@
<PayloadGroup Id="DotnetCoreBAPayloads"> <PayloadGroup Id="DotnetCoreBAPayloads">
<Payload Name="thm.xml" Compressed="yes" SourceFile="bundle.thm" /> <Payload Name="thm.xml" Compressed="yes" SourceFile="bundle.thm" />
<Payload Name="thm.wxl" Compressed="yes" SourceFile="bundle.wxl" /> <Payload Name="thm.wxl" Compressed="yes" SourceFile="bundle.wxl" />
<Payload Name="bg.png" Compressed="yes" SourceFile="..\..\osx\resources\dotnetbackground.png" /> <Payload Name="bg.png" Compressed="yes" SourceFile="..\..\osx\sharedframework\resources\dotnetbackground.png" />
<Payload Name='eula.rtf' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf)' /> <Payload Name='eula.rtf' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf)' />
</PayloadGroup> </PayloadGroup>

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

@ -27,7 +27,7 @@ function RunCandleForBundle
$AuthWsxRoot = Join-Path $RepoRoot "packaging\windows\sharedframework" $AuthWsxRoot = Join-Path $RepoRoot "packaging\windows\sharedframework"
.\candle.exe -nologo ` .\candle.exe -nologo `
-dMicrosoftEula="$RepoRoot\packaging\osx\resources\en.lproj\eula.rtf" ` -dMicrosoftEula="$RepoRoot\packaging\osx\sharedframework\resources\en.lproj\eula.rtf" `
-dBuildVersion="$DotnetMSIVersion" ` -dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIVersion" ` -dDisplayVersion="$DotnetCLIVersion" `
-dReleaseSuffix="$ReleaseSuffix" ` -dReleaseSuffix="$ReleaseSuffix" `

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

@ -59,7 +59,7 @@ function RunCandle
.\candle.exe -nologo ` .\candle.exe -nologo `
-out "$WixObjRoot\" ` -out "$WixObjRoot\" `
-dSharedFrameworkSource="$SharedFrameworkPublishRoot" ` -dSharedFrameworkSource="$SharedFrameworkPublishRoot" `
-dMicrosoftEula="$RepoRoot\packaging\osx\resources\en.lproj\eula.rtf" ` -dMicrosoftEula="$RepoRoot\packaging\osx\sharedframework\resources\en.lproj\eula.rtf" `
-dFrameworkName="$SharedFrameworkNugetName" ` -dFrameworkName="$SharedFrameworkNugetName" `
-dFrameworkDisplayVersion="$SharedFrameworkNugetVersion" ` -dFrameworkDisplayVersion="$SharedFrameworkNugetVersion" `
-dFrameworkComponentVersion="$SharedFrameworkComponentVersion" ` -dFrameworkComponentVersion="$SharedFrameworkComponentVersion" `