Generating a layout folder with the satellite assemblies only which we use to generate a language pack tarball/zip. Initially, I wanted a IncludeOnlyFilter, but couldn't quite get that to work on tar, just passing the filter in the command line didn't work because the shell does not do recursive globbing. So, I opted for the layout folder.
This commit is contained in:
parent
44d888dfc4
commit
126ec29fe2
3 changed files with 23 additions and 3 deletions
|
@ -22,12 +22,14 @@
|
||||||
<ArtifactNameSdk>dotnet-sdk-internal</ArtifactNameSdk>
|
<ArtifactNameSdk>dotnet-sdk-internal</ArtifactNameSdk>
|
||||||
<ArtifactNameSdkDebug>dotnet-sdk-debug</ArtifactNameSdkDebug>
|
<ArtifactNameSdkDebug>dotnet-sdk-debug</ArtifactNameSdkDebug>
|
||||||
<ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk</ArtifactNameCombinedHostHostFxrFrameworkSdk>
|
<ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk</ArtifactNameCombinedHostHostFxrFrameworkSdk>
|
||||||
|
<ArtifactNameSdkLanguagePack>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-langpack</ArtifactNameSdkLanguagePack>
|
||||||
|
|
||||||
<ArtifactNameWithVersionSdk>$(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
|
<ArtifactNameWithVersionSdk>$(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
|
||||||
|
|
||||||
|
|
||||||
<ArtifactNameWithVersionSdkDebug>$(ArtifactNameSdkDebug)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdkDebug>
|
<ArtifactNameWithVersionSdkDebug>$(ArtifactNameSdkDebug)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdkDebug>
|
||||||
<ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
|
<ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
|
||||||
|
<ArtifactNameWithVersionSdkLanguagePack>$(ArtifactNameSdkLanguagePack)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdkLanguagePack>
|
||||||
<DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(HostMonikerRid)</DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
|
<DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(HostMonikerRid)</DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<GenerateArchivesDestinationArchive>$(ArchiveOutputDirectory)/%(GenerateArchivesInputsOutputs.OutFileName)$(ArchiveExtension)</GenerateArchivesDestinationArchive>
|
<GenerateArchivesDestinationArchive>$(ArchiveOutputDirectory)/%(GenerateArchivesInputsOutputs.OutFileName)$(ArchiveExtension)</GenerateArchivesDestinationArchive>
|
||||||
<SatelliteAssemblies>*.resources.dll</SatelliteAssemblies>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ZipFileCreateFromDirectory
|
<ZipFileCreateFromDirectory
|
||||||
|
@ -22,14 +21,14 @@
|
||||||
SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
|
SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
|
||||||
DestinationArchive="$(GenerateArchivesDestinationArchive)"
|
DestinationArchive="$(GenerateArchivesDestinationArchive)"
|
||||||
OverwriteDestination="true"
|
OverwriteDestination="true"
|
||||||
ExcludePatterns="$(SatelliteAssemblies)" />
|
ExcludePatterns="%(GenerateArchivesInputsOutputs.ExcludePatterns)" />
|
||||||
|
|
||||||
<TarGzFileCreateFromDirectory
|
<TarGzFileCreateFromDirectory
|
||||||
Condition=" '$(OSName)' != 'win' "
|
Condition=" '$(OSName)' != 'win' "
|
||||||
SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
|
SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
|
||||||
DestinationArchive="$(GenerateArchivesDestinationArchive)"
|
DestinationArchive="$(GenerateArchivesDestinationArchive)"
|
||||||
OverwriteDestination="true"
|
OverwriteDestination="true"
|
||||||
ExcludePatterns="$(SatelliteAssemblies)" />
|
ExcludePatterns="%(GenerateArchivesInputsOutputs.ExcludePatterns)" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Archives Include="$(GenerateArchivesDestinationArchive)" />
|
<Archives Include="$(GenerateArchivesDestinationArchive)" />
|
||||||
|
@ -45,6 +44,7 @@
|
||||||
<Outputs>$(ArchiveOutputDirectory)/%(LayoutDefinition.NameWithVersion)$(ArchiveExtension)</Outputs>
|
<Outputs>$(ArchiveOutputDirectory)/%(LayoutDefinition.NameWithVersion)$(ArchiveExtension)</Outputs>
|
||||||
<InputDirectory>$(LayoutDirectory)/%(LayoutDefinition.Name)</InputDirectory>
|
<InputDirectory>$(LayoutDirectory)/%(LayoutDefinition.Name)</InputDirectory>
|
||||||
<OutFileName>%(LayoutDefinition.NameWithVersion)</OutFileName>
|
<OutFileName>%(LayoutDefinition.NameWithVersion)</OutFileName>
|
||||||
|
<ExcludePatterns>%(LayoutDefinition.ExcludePatterns)</ExcludePatterns>
|
||||||
</GenerateArchivesInputsOutputs>
|
</GenerateArchivesInputsOutputs>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
|
@ -3,6 +3,9 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<SdkDebugLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkDebug)</SdkDebugLayoutOutputDirectory>
|
<SdkDebugLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkDebug)</SdkDebugLayoutOutputDirectory>
|
||||||
<CombinedHostHostFxrFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</CombinedHostHostFxrFrameworkSdkOutputDirectory>
|
<CombinedHostHostFxrFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</CombinedHostHostFxrFrameworkSdkOutputDirectory>
|
||||||
|
<SdkLanguagePackOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkLanguagePack)</SdkLanguagePackOutputDirectory>
|
||||||
|
<SatelliteAssemblies>*.resources.dll</SatelliteAssemblies>
|
||||||
|
<WindowsSatelliteAssembliesRegEx>.*.resources.dll</WindowsSatelliteAssembliesRegEx>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<Target DependsOnTargets="Init" Name="SetupLayoutInputsOutputs" >
|
<Target DependsOnTargets="Init" Name="SetupLayoutInputsOutputs" >
|
||||||
|
@ -11,6 +14,7 @@
|
||||||
<SdkLayoutInput Include="$(OutputDirectory)/sdk/**/*" />
|
<SdkLayoutInput Include="$(OutputDirectory)/sdk/**/*" />
|
||||||
<SdkDebugLayoutInput Include="$(SymbolsDirectory)/sdk/**/*" />
|
<SdkDebugLayoutInput Include="$(SymbolsDirectory)/sdk/**/*" />
|
||||||
<CombinedHostHostFxrFrameworkSdkInput Include="$(OutputDirectory)/**/*" />
|
<CombinedHostHostFxrFrameworkSdkInput Include="$(OutputDirectory)/**/*" />
|
||||||
|
<SdkLanguagePackInput Include="$(OutputDirectory)/sdk/**/$(SatelliteAssemblies)" />
|
||||||
|
|
||||||
<AspNetRuntimeFilesInput Include="$(AspNetRuntimePackageStorePublishDirectory)/**/*" />
|
<AspNetRuntimeFilesInput Include="$(AspNetRuntimePackageStorePublishDirectory)/**/*" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
@ -30,6 +34,11 @@
|
||||||
Path2="%(CombinedHostHostFxrFrameworkSdkInput.Identity)" >
|
Path2="%(CombinedHostHostFxrFrameworkSdkInput.Identity)" >
|
||||||
<Output TaskParameter="RelativePath" ItemName="CombinedHostHostFxrFrameworkSdkRelativeOutputFiles" />
|
<Output TaskParameter="RelativePath" ItemName="CombinedHostHostFxrFrameworkSdkRelativeOutputFiles" />
|
||||||
</MakeRelative>
|
</MakeRelative>
|
||||||
|
<MakeRelative
|
||||||
|
Path1="$(OutputDirectory)/"
|
||||||
|
Path2="%(SdkLanguagePackInput.Identity)" >
|
||||||
|
<Output TaskParameter="RelativePath" ItemName="SdkLanguagePackRelativeOutputFiles" />
|
||||||
|
</MakeRelative>
|
||||||
|
|
||||||
<!-- Set up Items Defining Layouts for easy change -->
|
<!-- Set up Items Defining Layouts for easy change -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -52,6 +61,15 @@
|
||||||
<OutputFiles>@(CombinedHostHostFxrFrameworkSdkRelativeOutputFiles -> '$(CombinedHostHostFxrFrameworkSdkOutputDirectory)/%(Identity)')</OutputFiles>
|
<OutputFiles>@(CombinedHostHostFxrFrameworkSdkRelativeOutputFiles -> '$(CombinedHostHostFxrFrameworkSdkOutputDirectory)/%(Identity)')</OutputFiles>
|
||||||
<NameWithVersion>$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)</NameWithVersion>
|
<NameWithVersion>$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)</NameWithVersion>
|
||||||
<Name>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</Name>
|
<Name>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</Name>
|
||||||
|
<ExcludePatterns Condition=" '$(OSName)' == 'win' ">$(WindowsSatelliteAssembliesRegEx)</ExcludePatterns>
|
||||||
|
<ExcludePatterns Condition=" '$(OSName)' != 'win' ">$(SatelliteAssemblies)</ExcludePatterns>
|
||||||
|
</LayoutDefinition>
|
||||||
|
|
||||||
|
<LayoutDefinition Include="SdkLanguagePack">
|
||||||
|
<InputFiles>@(SdkLanguagePackInput)</InputFiles>
|
||||||
|
<OutputFiles>@(SdkLanguagePackRelativeOutputFiles -> '$(SdkLanguagePackOutputDirectory)/%(Identity)')</OutputFiles>
|
||||||
|
<NameWithVersion>$(ArtifactNameWithVersionSdkLanguagePack)</NameWithVersion>
|
||||||
|
<Name>$(ArtifactNameSdkLanguagePack)</Name>
|
||||||
</LayoutDefinition>
|
</LayoutDefinition>
|
||||||
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue