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

Refactoring shared item groups between deb and pkg to the same location.

Browse source
This commit is contained in:
Livar Cunha 2017-05-03 17:55:34 -07:00
parent 1736c388b0
commit 9c796bbe6b
4 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build/package/Installer.DEB.proj
View file

@ -35,8 +35,8 @@
<!-- Create layout: Aspnet runtime --> <!-- Create layout: Aspnet runtime -->
<Copy <Copy
DestinationFiles="@(AspNetRuntimeFiles ->'$(LayoutPackageRootDir)/%(RecursiveDir)%(Filename)%(Extension)')" DestinationFiles="@(AspNetRuntimeFilesInput ->'$(LayoutPackageRootDir)/%(RecursiveDir)%(Filename)%(Extension)')"
SourceFiles="@(AspNetRuntimeFiles)" SourceFiles="@(AspNetRuntimeFilesInput)"
OverwriteReadOnlyFiles="True" OverwriteReadOnlyFiles="True"
SkipUnchangedFiles="False" SkipUnchangedFiles="False"
UseHardlinksIfPossible="False" /> UseHardlinksIfPossible="False" />

2
build/package/Installer.DEB.targets
View file

@ -42,11 +42,9 @@
<ManpagesDirectory>$(RepoRoot)/Documentation/manpages</ManpagesDirectory> <ManpagesDirectory>$(RepoRoot)/Documentation/manpages</ManpagesDirectory>
<EndToEndTestProject>$(RepoRoot)/test/EndToEnd/EndToEnd.csproj</EndToEndTestProject> <EndToEndTestProject>$(RepoRoot)/test/EndToEnd/EndToEnd.csproj</EndToEndTestProject>
<CLISdkRoot>$(OutputDirectory)/sdk</CLISdkRoot> <CLISdkRoot>$(OutputDirectory)/sdk</CLISdkRoot>
<AspNetRuntimeRoot>$(AspNetRuntimePackageStorePublishDirectory)</AspNetRuntimeRoot>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AspNetRuntimeFiles Include="$(AspNetRuntimeRoot)/**/*" />
<CLISdkFiles Include="$(CLISdkRoot)/**/*" /> <CLISdkFiles Include="$(CLISdkRoot)/**/*" />
<SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" /> <SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
</ItemGroup> </ItemGroup>

9
build/package/Installer.PKG.targets
View file

@ -80,13 +80,8 @@
DependsOnTargets="Init;Layout;SetupPkgInputsOutputs" DependsOnTargets="Init;Layout;SetupPkgInputsOutputs"
Condition=" '$(OSName)' == 'osx' "> Condition=" '$(OSName)' == 'osx' ">
<!-- Adding the ASP.NET runtime package store to the pkg --> <Copy SourceFiles="@(AspNetRuntimeFilesInput)"
<ItemGroup> DestinationFiles="@(AspNetRuntimeFilesInput->'$(SdkLayoutOutputDirectory)/%(RecursiveDir)%(FileName)%(Extension)')" />
<AspNetRuntimePackageStoreFiles Include="$(AspNetRuntimePackageStorePublishDirectory)/**/*" />
</ItemGroup>
<Copy SourceFiles="@(AspNetRuntimePackageStoreFiles)"
DestinationFiles="@(AspNetRuntimePackageStoreFiles->'$(SdkLayoutOutputDirectory)/%(RecursiveDir)%(FileName)%(Extension)')" />
<Exec Command="pkgbuild <Exec Command="pkgbuild
--root '$(SdkLayoutOutputDirectory)' --root '$(SdkLayoutOutputDirectory)'

2
build/package/Layout.targets
View file

@ -16,6 +16,8 @@
<CombinedFrameworkSdkInput Include="$(OutputDirectory)/sdk/**/*" /> <CombinedFrameworkSdkInput Include="$(OutputDirectory)/sdk/**/*" />
<CombinedFrameworkSdkInput Include="$(OutputDirectory)/additionalDeps/**/*" /> <CombinedFrameworkSdkInput Include="$(OutputDirectory)/additionalDeps/**/*" />
<CombinedFrameworkSdkInput Include="$(OutputDirectory)/store/**/*" /> <CombinedFrameworkSdkInput Include="$(OutputDirectory)/store/**/*" />
<AspNetRuntimeFilesInput Include="$(AspNetRuntimePackageStorePublishDirectory)/**/*" />
</ItemGroup> </ItemGroup>
<MakeRelative <MakeRelative