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

Adding new templates folder to pkg native installer.

Browse source 
Moved templates folder under dotnet to Templates (capital T) and added dotnet/Templates to the deb installer.

Adding Templates to the sdk rpm native installer.
This commit is contained in:
Livar Cunha 2019-07-14 17:26:33 -07:00
parent e2eb862efb
commit c35bcd49af
4 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/redist/targets/BundledTemplates.targets
View file

@ -42,13 +42,13 @@
<BundledTemplate Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
</ItemGroup>
<Copy SourceFiles="%(BundledTemplate.RestoredNupkgPath)"
DestinationFolder="$(RedistLayoutPath)templates/$(BundledTemplatesVersion)"/>
DestinationFolder="$(RedistLayoutPath)Templates/$(BundledTemplatesVersion)"/>
</Target>
<Target Name="LayoutTemplatesForMSI"
DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersion"
Condition="$(ProductMonikerRid.StartsWith('win'))">
<Copy SourceFiles="%(BundledTemplate.RestoredNupkgPath)"
DestinationFolder="$(TemplatesLayoutPath)templates/$(BundledTemplatesVersion)"/>
DestinationFolder="$(TemplatesLayoutPath)Templates/$(BundledTemplatesVersion)"/>
</Target>
</Project>

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

@ -83,10 +83,12 @@
<ManpagesDirectory>$(RepoRoot)Documentation/manpages</ManpagesDirectory>
<EndToEndTestProject>$(RepoRoot)test/EndToEnd/EndToEnd.Tests.csproj</EndToEndTestProject>
<CLISdkRoot>$(RedistLayoutPath)sdk/</CLISdkRoot>
<TemplatesRoot>$(RedistLayoutPath)Templates/</TemplatesRoot>
</PropertyGroup>
<ItemGroup>
<CLISdkFiles Include="$(CLISdkRoot)/**/*" />
<CLISdkFiles Include="$(CLISdkRoot)**/*" />
<TemplatesFiles Include="$(TemplatesRoot)**/*" />
<SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
</ItemGroup>
@ -227,7 +229,7 @@
DependsOnTargets="PrepareDotnetDebDirectories;
PrepareDotnetDebTool;
GetAspNetSharedFxInstallArgs;"
Inputs="@(CLISdkFiles)"
Inputs="@(CLISdkFiles);@(TemplatesFiles)"
Outputs="$(SdkDebInstallerFile)" >
<!-- Install Shared Framework Packages -->
<Exec Command="sudo dpkg -i $(DownloadedNetCoreAppHostPackInstallerFile)" />
@ -248,6 +250,14 @@
SkipUnchangedFiles="False"
UseHardlinksIfPossible="False" />
<!-- Create layout: Templates -->
<Copy
DestinationFiles="@(TemplatesFiles->'$(LayoutPackageRootDir)/Templates/%(RecursiveDir)%(Filename)%(Extension)')"
SourceFiles="@(TemplatesFiles)"
OverwriteReadOnlyFiles="True"
SkipUnchangedFiles="False"
UseHardlinksIfPossible="False" />
<!-- Create layout: Man Pages -->
<Copy
DestinationFiles="@(SdkDebManPageFiles->'$(LayoutDocsDir)/%(RecursiveDir)%(Filename)-$(SdkVersion)%(Extension)')"

7
src/redist/targets/GeneratePKG.targets
View file

@ -129,6 +129,10 @@
Outputs="$(SdkPKGInstallerFile)"
DependsOnTargets="GenerateLayout;SetupPkgInputsOutputs"
Condition=" '$(OSName)' == 'osx' ">
<ItemGroup>
<TemplateFiles Include="$(RedistLayoutPath)Templates/**/*" />
</ItemGroup>
<!-- Copy ASP.NET runtime and targeting pack to internal layout, as we don't currently chain that in with a pkg dependency -->
<ExtractArchiveToDirectory SourceArchive="$(DownloadsFolder)$(AspNetCoreSharedFxArchiveFileName)"
@ -136,6 +140,9 @@
<ExtractArchiveToDirectory SourceArchive="$(DownloadsFolder)$(AspNetTargetingPackArchiveFileName)"
DestinationDirectory="$(SdkInternalLayoutPath)" />
<Copy SourceFiles="@(TemplateFiles)"
DestinationFiles="@(TemplateFiles->'$(SdkInternalLayoutPath)/Templates/%(RecursiveDir)%(Filename)%(Extension)')" />
<ReplaceFileContents
InputFiles="$(SdkPkgScriptTemplateFile)"
DestinationFiles="$(SdkPkgScriptFile)"

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

@ -39,6 +39,7 @@
<!-- Copy files to rpm layout -->
<ItemGroup>
<SDKFiles Include="$(InputRoot)/**/*"/>
<DotnetNewTemplatesFiles Include="$(DotnetNewTemplatesRoot)**/*" />
<SDKManpages Include="$(ManPagesDir)/**/*"/>
<SDKTemplatesFiles Include="$(TemplatesDir)/**/*"/>
<SDKScriptsFiles Include="$(ScriptsDir)/after_remove_host.sh"/>
@ -50,6 +51,12 @@
SkipUnchangedFiles="False"
UseHardlinksIfPossible="False"/>
<Copy SourceFiles="@(DotnetNewTemplatesFiles)"
DestinationFiles="@(DotnetNewTemplatesFiles->'$(RpmLayoutDotnetNewTemplates)/%(RecursiveDir)%(Filename)%(Extension)')"
OverwriteReadOnlyFiles="True"
SkipUnchangedFiles="False"
UseHardlinksIfPossible="False"/>
<Copy SourceFiles="@(SDKManpages)"
DestinationFiles="@(SDKManpages->'$(RpmLayoutDocs)/%(RecursiveDir)%(Filename)%(Extension)')"
OverwriteReadOnlyFiles="True"
@ -168,6 +175,7 @@
<SdkRpmPackageName>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkRpmPackageVersion)</SdkRpmPackageName>
<RpmPackageVersion>$(SdkVersion)</RpmPackageVersion>
<InputRoot>$(RedistLayoutPath)sdk/</InputRoot>
<DotnetNewTemplatesRoot>$(RedistLayoutPath)Templates/</DotnetNewTemplatesRoot>
<SdkRPMInstallerFile>$(ArtifactsShippingPackagesDir)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</SdkRPMInstallerFile>
<RpmFile>$(SdkRPMInstallerFile)</RpmFile>
<!-- Need to acquire manpage files from CLI repo: https://github.com/dotnet/cli/issues/10266 -->
@ -183,6 +191,7 @@
<RpmLayoutDirectory>$(RpmIntermediatesDir)/RpmLayoutDirectory/</RpmLayoutDirectory>
<RpmLayoutPackageRoot>$(RpmLayoutDirectory)package_root</RpmLayoutPackageRoot>
<RpmLayoutSDK>$(RpmLayoutPackageRoot)/sdk</RpmLayoutSDK>
<RpmLayoutDotnetNewTemplates>$(RpmLayoutPackageRoot)/Templates</RpmLayoutDotnetNewTemplates>
<RpmLayoutDocs>$(RpmLayoutDirectory)docs</RpmLayoutDocs> <!-- Man Pages -->
<RpmLayoutTemplates>$(RpmLayoutDirectory)templates</RpmLayoutTemplates> <!-- Copyright, Changelog -->
<RpmLayoutScripts>$(RpmLayoutDirectory)scripts</RpmLayoutScripts>