PKG support for installing shared fx 1.1.
This commit is contained in:
Eric Erhardt
parent
63669d5129
commit
6106cae066
3 changed files with 63 additions and 8 deletions
|
|
@ -1,10 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<SdkBrandName>Microsoft .NET Core 1.0.1 - SDK Preview 5</SdkBrandName>
|
||||
<SharedFrameworkBrandName>Microsoft .NET Core 1.0.1 - Runtime</SharedFrameworkBrandName>
|
||||
<SharedHostBrandName>Microsoft .NET Core 1.0.0 - Host</SharedHostBrandName>
|
||||
<HostFxrBrandName>Microsoft .NET Core 1.0.0 - Host FX Resolver</HostFxrBrandName>
|
||||
<SdkBrandName>Microsoft .NET Core 1.0.3 - SDK Preview 5</SdkBrandName>
|
||||
<SharedFrameworkBrandName>Microsoft .NET Core 1.0.3 - Runtime</SharedFrameworkBrandName>
|
||||
<SharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</SharedHostBrandName>
|
||||
<HostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</HostFxrBrandName>
|
||||
|
||||
<AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.1.0 - Runtime</AdditionalSharedFrameworkBrandName>
|
||||
<AdditionalSharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</AdditionalSharedHostBrandName>
|
||||
<AdditionalHostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</AdditionalHostFxrBrandName>
|
||||
|
||||
<SharedFrameworkNugetName>Microsoft.NETCore.App</SharedFrameworkNugetName>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -9,12 +9,16 @@
|
|||
<CombinedFrameworkSdkHostInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostInstallerFile>
|
||||
|
||||
<!-- Properties for pkg build -->
|
||||
<SharedHostComponentId>com.microsoft.dotnet.sharedhost.component.osx.x64</SharedHostComponentId>
|
||||
<HostFxrComponentId>com.microsoft.dotnet.hostfxr.component.osx.x64</HostFxrComponentId>
|
||||
<SharedHostComponentId>com.microsoft.dotnet.sharedhost.$(SharedHostVersion).component.osx.x64</SharedHostComponentId>
|
||||
<HostFxrComponentId>com.microsoft.dotnet.hostfxr.$(HostFxrVersion).component.osx.x64</HostFxrComponentId>
|
||||
<SharedFrameworkComponentId>com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(SharedFrameworkVersion).component.osx.x64</SharedFrameworkComponentId>
|
||||
<SdkComponentId>com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64</SdkComponentId>
|
||||
<SdkProductArchiveId>com.microsoft.dotnet.dev.$(SdkVersion).osx.x64</SdkProductArchiveId>
|
||||
|
||||
<AdditionalSharedHostComponentId>com.microsoft.dotnet.sharedhost.$(AdditionalSharedHostVersion).component.osx.x64</AdditionalSharedHostComponentId>
|
||||
<AdditionalHostFxrComponentId>com.microsoft.dotnet.hostfxr.$(AdditionalHostFxrVersion).component.osx.x64</AdditionalHostFxrComponentId>
|
||||
<AdditionalSharedFrameworkComponentId>com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(AdditionalSharedFrameworkVersion).component.osx.x64</AdditionalSharedFrameworkComponentId>
|
||||
|
||||
<PkgInstallDirectory>/usr/local/share/dotnet</PkgInstallDirectory>
|
||||
|
||||
<SdkPkgSourcesRootDirectory>$(RepoRoot)/packaging/osx/clisdk</SdkPkgSourcesRootDirectory>
|
||||
|
|
@ -28,6 +32,10 @@
|
|||
<SharedFrameworkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg</SharedFrameworkPkgIntermediatePath>
|
||||
<SharedHostPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg</SharedHostPkgIntermediatePath>
|
||||
<HostFxrPkgIntermediatePath>$(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg</HostFxrPkgIntermediatePath>
|
||||
|
||||
<AdditionalSharedFrameworkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(AdditionalSharedFrameworkComponentId).pkg</AdditionalSharedFrameworkPkgIntermediatePath>
|
||||
<AdditionalSharedHostPkgIntermediatePath>$(PkgIntermediateDirectory)/$(AdditionalSharedHostComponentId).pkg</AdditionalSharedHostPkgIntermediatePath>
|
||||
<AdditionalHostFxrPkgIntermediatePath>$(PkgIntermediateDirectory)/$(AdditionalHostFxrComponentId).pkg</AdditionalHostFxrPkgIntermediatePath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -40,6 +48,15 @@
|
|||
<DistributionTemplateReplacement Include="{HostFxrComponentId}">
|
||||
<ReplacementString>$(HostFxrComponentId)</ReplacementString>
|
||||
</DistributionTemplateReplacement>
|
||||
<DistributionTemplateReplacement Include="{AdditionalSharedFxComponentId}">
|
||||
<ReplacementString>$(AdditionalSharedFrameworkComponentId)</ReplacementString>
|
||||
</DistributionTemplateReplacement>
|
||||
<DistributionTemplateReplacement Include="{AdditionalSharedHostComponentId}">
|
||||
<ReplacementString>$(AdditionalSharedHostComponentId)</ReplacementString>
|
||||
</DistributionTemplateReplacement>
|
||||
<DistributionTemplateReplacement Include="{AdditionalHostFxrComponentId}">
|
||||
<ReplacementString>$(AdditionalHostFxrComponentId)</ReplacementString>
|
||||
</DistributionTemplateReplacement>
|
||||
<DistributionTemplateReplacement Include="{CLISdkComponentId}">
|
||||
<ReplacementString>$(SdkComponentId)</ReplacementString>
|
||||
</DistributionTemplateReplacement>
|
||||
|
|
@ -58,6 +75,15 @@
|
|||
<DistributionTemplateReplacement Include="{HostFxrBrandName}">
|
||||
<ReplacementString>$(HostFxrBrandName)</ReplacementString>
|
||||
</DistributionTemplateReplacement>
|
||||
<DistributionTemplateReplacement Include="{AdditionalSharedFxBrandName}">
|
||||
<ReplacementString>$(AdditionalSharedFrameworkBrandName)</ReplacementString>
|
||||
</DistributionTemplateReplacement>
|
||||
<DistributionTemplateReplacement Include="{AdditionalSharedHostBrandName}">
|
||||
<ReplacementString>$(AdditionalSharedHostBrandName)</ReplacementString>
|
||||
</DistributionTemplateReplacement>
|
||||
<DistributionTemplateReplacement Include="{AdditionalHostFxrBrandName}">
|
||||
<ReplacementString>$(AdditionalHostFxrBrandName)</ReplacementString>
|
||||
</DistributionTemplateReplacement>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Consumed By Publish -->
|
||||
|
|
@ -75,6 +101,10 @@
|
|||
<GenerateSdkProductArchiveInputs Include="$(DownloadedSharedHostInstallerFile)" />
|
||||
<GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveDistributionTemplateFile)" />
|
||||
<GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveResourcesDirectory)/**/*" />
|
||||
|
||||
<GenerateSdkProductArchiveInputs Include="$(AdditionalDownloadedSharedFrameworkInstallerFile)" />
|
||||
<GenerateSdkProductArchiveInputs Include="$(AdditionalDownloadedHostFxrInstallerFile)" />
|
||||
<GenerateSdkProductArchiveInputs Include="$(AdditionalDownloadedSharedHostInstallerFile)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
|
|
@ -103,11 +133,17 @@
|
|||
SourceFiles="$(SdkInstallerFile);
|
||||
$(DownloadedSharedFrameworkInstallerFile);
|
||||
$(DownloadedHostFxrInstallerFile);
|
||||
$(DownloadedSharedHostInstallerFile);"
|
||||
$(DownloadedSharedHostInstallerFile);
|
||||
$(AdditionalDownloadedSharedFrameworkInstallerFile);
|
||||
$(AdditionalDownloadedHostFxrInstallerFile);
|
||||
$(AdditionalDownloadedSharedHostInstallerFile);"
|
||||
DestinationFiles="$(SdkPkgIntermediatePath);
|
||||
$(SharedFrameworkPkgIntermediatePath);
|
||||
$(HostFxrPkgIntermediatePath);
|
||||
$(SharedHostPkgIntermediatePath);" />
|
||||
$(SharedHostPkgIntermediatePath);
|
||||
$(AdditionalSharedFrameworkPkgIntermediatePath);
|
||||
$(AdditionalHostFxrPkgIntermediatePath);
|
||||
$(AdditionalSharedHostPkgIntermediatePath);" />
|
||||
|
||||
<!-- Fill out parameters in the Distribution Template -->
|
||||
<ReplaceFileContents
|
||||
|
|
|
|||
|
|
@ -17,6 +17,9 @@
|
|||
<line choice="{SharedFxComponentId}.pkg" />
|
||||
<line choice="{HostFxrComponentId}.pkg" />
|
||||
<line choice="{SharedHostComponentId}.pkg" />
|
||||
<line choice="{AdditionalSharedFxComponentId}.pkg" />
|
||||
<line choice="{AdditionalHostFxrComponentId}.pkg" />
|
||||
<line choice="{AdditionalSharedHostComponentId}.pkg" />
|
||||
<line choice="{CLISdkComponentId}.pkg"/>
|
||||
</choices-outline>
|
||||
<choice id="{SharedFxComponentId}.pkg" visible="true" title="{SharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
|
||||
|
|
@ -28,11 +31,23 @@
|
|||
<choice id="{SharedHostComponentId}.pkg" visible="true" title="{SharedHostBrandName} (x64)" description="The .NET Core Shared Host." >
|
||||
<pkg-ref id="{SharedHostComponentId}.pkg" />
|
||||
</choice>
|
||||
<choice id="{AdditionalSharedFxComponentId}.pkg" visible="true" title="{AdditionalSharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
|
||||
<pkg-ref id="{AdditionalSharedFxComponentId}.pkg" />
|
||||
</choice>
|
||||
<choice id="{AdditionalHostFxrComponentId}.pkg" visible="true" title="{AdditionalHostFxrBrandName} (x64)" description="The .NET Core Host FX Resolver">
|
||||
<pkg-ref id="{AdditionalHostFxrComponentId}.pkg" />
|
||||
</choice>
|
||||
<choice id="{AdditionalSharedHostComponentId}.pkg" visible="true" title="{AdditionalSharedHostBrandName} (x64)" description="The .NET Core Shared Host." >
|
||||
<pkg-ref id="{AdditionalSharedHostComponentId}.pkg" />
|
||||
</choice>
|
||||
<choice id="{CLISdkComponentId}.pkg" visible="true" title="{CLISdkBrandName} (x64)" description="The .NET Core SDK">
|
||||
<pkg-ref id="{CLISdkComponentId}.pkg"/>
|
||||
</choice>
|
||||
<pkg-ref id="{SharedFxComponentId}.pkg">{SharedFxComponentId}.pkg</pkg-ref>
|
||||
<pkg-ref id="{HostFxrComponentId}.pkg">{HostFxrComponentId}.pkg</pkg-ref>
|
||||
<pkg-ref id="{SharedHostComponentId}.pkg">{SharedHostComponentId}.pkg</pkg-ref>
|
||||
<pkg-ref id="{AdditionalSharedFxComponentId}.pkg">{AdditionalSharedFxComponentId}.pkg</pkg-ref>
|
||||
<pkg-ref id="{AdditionalHostFxrComponentId}.pkg">{AdditionalHostFxrComponentId}.pkg</pkg-ref>
|
||||
<pkg-ref id="{AdditionalSharedHostComponentId}.pkg">{AdditionalSharedHostComponentId}.pkg</pkg-ref>
|
||||
<pkg-ref id="{CLISdkComponentId}.pkg">{CLISdkComponentId}.pkg</pkg-ref>
|
||||
</installer-gui-script>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue