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

Merge pull request #11780 from wli3/deb-manifests

Browse source 
Add manifests to deb and rpm
This commit is contained in:
William Li 2021-08-31 14:04:17 -07:00 committed by GitHub
commit 7a9188507a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/redist/targets/GenerateDebs.targets
View file

@ -86,6 +86,7 @@
<CLISdkFiles Include="$(CLISdkRoot)**/*" />
<TemplatesFiles Include="$(TemplatesRoot)**/*" />
<SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
<ManifestFiles Include="$(RedistLayoutPath)sdk-manifests/**/*" />
</ItemGroup>
<!-- Output Directories -->
@ -230,7 +231,7 @@
Condition=" '$(IsDebianBaseDistro)' == 'True' AND '$(DebuildPresent)' == 'true' "
DependsOnTargets="PrepareDotnetDebDirectories;
GetAspNetSharedFxInstallArgs;"
Inputs="@(CLISdkFiles);@(TemplatesFiles)"
Inputs="@(CLISdkFiles);@(TemplatesFiles);@(ManifestFiles)"
Outputs="$(SdkDebInstallerFile)" >
<!-- Install Shared Framework Packages -->
<Exec Command="sudo dpkg -i $(DownloadedNetCoreAppHostPackInstallerFile)" />
@ -259,6 +260,14 @@
SkipUnchangedFiles="False"
UseHardlinksIfPossible="False" />
<!-- Create layout: Workload Manifests -->
<Copy
DestinationFiles="@(ManifestFiles->'$(LayoutPackageRootDir)/sdk-manifests/%(RecursiveDir)%(Filename)%(Extension)')"
SourceFiles="@(ManifestFiles)"
OverwriteReadOnlyFiles="True"
SkipUnchangedFiles="False"
UseHardlinksIfPossible="False" />
<!-- Create layout: Man Pages -->
<Copy
DestinationFiles="@(SdkDebManPageFiles->'$(LayoutDocsDir)/%(RecursiveDir)%(Filename)-$(Version)%(Extension)')"

9
src/redist/targets/GenerateRPMs.targets
View file

@ -34,12 +34,14 @@
<MakeDir Directories="$(RpmLayoutSDK)"/>
<MakeDir Directories="$(RpmLayoutDocs)"/>
<MakeDir Directories="$(RpmLayoutTemplates)"/>
<MakeDir Directories="$(RpmLayoutManifestFiles)"/>
<MakeDir Directories="$(RpmLayoutScripts)"/>
<!-- Copy files to rpm layout -->
<ItemGroup>
<SDKFiles Include="$(InputRoot)/**/*"/>
<DotnetNewTemplatesFiles Include="$(DotnetNewTemplatesRoot)**/*" />
<SDKManifestFiles Include="$(RedistLayoutPath)sdk-manifests/**/*" />
<SDKManpages Include="$(ManPagesDir)/**/*"/>
<SDKTemplatesFiles Include="$(TemplatesDir)/**/*"/>
<SDKScriptsFiles Include="$(ScriptsDir)/after_remove_host.sh"/>
@ -57,6 +59,12 @@
SkipUnchangedFiles="False"
UseHardlinksIfPossible="False"/>
<Copy SourceFiles="@(SDKManifestFiles)"
DestinationFiles="@(SDKManifestFiles->'$(RpmLayoutManifestFiles)/%(RecursiveDir)%(Filename)%(Extension)')"
OverwriteReadOnlyFiles="True"
SkipUnchangedFiles="False"
UseHardlinksIfPossible="False"/>
<Copy SourceFiles="@(SDKManpages)"
DestinationFiles="@(SDKManpages->'$(RpmLayoutDocs)/%(RecursiveDir)%(Filename)%(Extension)')"
OverwriteReadOnlyFiles="True"
@ -198,6 +206,7 @@
<RpmLayoutPackageRoot>$(RpmLayoutDirectory)package_root</RpmLayoutPackageRoot>
<RpmLayoutSDK>$(RpmLayoutPackageRoot)/sdk</RpmLayoutSDK>
<RpmLayoutDotnetNewTemplates>$(RpmLayoutPackageRoot)/templates</RpmLayoutDotnetNewTemplates>
<RpmLayoutManifestFiles>$(RpmLayoutPackageRoot)/sdk-manifests</RpmLayoutManifestFiles>
<RpmLayoutDocs>$(RpmLayoutDirectory)docs</RpmLayoutDocs> <!-- Man Pages -->
<RpmLayoutTemplates>$(RpmLayoutDirectory)templates</RpmLayoutTemplates> <!-- Copyright, Changelog -->
<RpmLayoutScripts>$(RpmLayoutDirectory)scripts</RpmLayoutScripts>