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

Merge pull request #6443 from livarcocc/merge_release_200

Browse source 
Merge release/2.0.0 back into master
This commit is contained in:
Livar 2017-04-27 12:58:48 -07:00 • committed by GitHub
commit 3f4d19d082
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dir.props
View file

@ -9,6 +9,7 @@
<CLIBuildDll>$(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build.dll</CLIBuildDll> <CLIBuildDll>$(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build.dll</CLIBuildDll>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
<CliTargetFramework>netcoreapp2.0</CliTargetFramework> <CliTargetFramework>netcoreapp2.0</CliTargetFramework>
</PropertyGroup> </PropertyGroup>

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

@ -26,9 +26,6 @@
<Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" /> <Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" />
<Chain DisableSystemRestore="yes" ParallelCache="yes"> <Chain DisableSystemRestore="yes" ParallelCache="yes">
<MsiPackage SourceFile="$(var.CLISDKMsiSourcePath)">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
</MsiPackage>
<MsiPackage SourceFile="$(var.SharedFXMsiSourcePath)"> <MsiPackage SourceFile="$(var.SharedFXMsiSourcePath)">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" /> <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
</MsiPackage> </MsiPackage>
@ -38,6 +35,9 @@
<MsiPackage SourceFile="$(var.SharedHostMsiSourcePath)"> <MsiPackage SourceFile="$(var.SharedHostMsiSourcePath)">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" /> <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
</MsiPackage> </MsiPackage>
<MsiPackage SourceFile="$(var.CLISDKMsiSourcePath)">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
</MsiPackage>
</Chain> </Chain>
</Bundle> </Bundle>

13
packaging/windows/clisdk/dotnet.wxs
View file

@ -19,12 +19,21 @@
<Property Id="ProductEdition" Value="$(var.ProductEdition)" /> <Property Id="ProductEdition" Value="$(var.ProductEdition)" />
<Property Id="ProductCPU" Value="$(var.Platform)" /> <Property Id="ProductCPU" Value="$(var.Platform)" />
<Property Id="RTM_ProductVersion" Value="$(var.Dotnet_ProductVersion)" /> <Property Id="RTM_ProductVersion" Value="$(var.Dotnet_ProductVersion)" />
<Property Id="MSIFASTINSTALL" Value="7" /> <Property Id="MSIFASTINSTALL" Value="7" />
<WixVariable Id="WixUILicenseRtf" Value="$(var.MicrosoftEula)" /> <WixVariable Id="WixUILicenseRtf" Value="$(var.MicrosoftEula)" />
<CustomActionRef Id="WixBroadcastEnvironmentChange" /> <CustomActionRef Id="WixBroadcastEnvironmentChange" />
<CustomAction Id="RunDotnetNewToTriggerFirstTimeExperienceToPrimeCache"
ExeCommand="dotnet.exe new"
Directory="DOTNETHOME"
Execute="immediate"
Return="ignore"/>
<InstallExecuteSequence>
<Custom Action="RunDotnetNewToTriggerFirstTimeExperienceToPrimeCache"
After="InstallFinalize" />
</InstallExecuteSequence>
</Product> </Product>
<Fragment> <Fragment>
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
@ -33,4 +42,4 @@
</Directory> </Directory>
</Directory> </Directory>
</Fragment> </Fragment>
</Wix> </Wix>