Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 126ec29

Browse files
committed
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.
1 parent 44d888d commit 126ec29

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

build/Branding.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222
<ArtifactNameSdk>dotnet-sdk-internal</ArtifactNameSdk>
2323
<ArtifactNameSdkDebug>dotnet-sdk-debug</ArtifactNameSdkDebug>
2424
<ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk</ArtifactNameCombinedHostHostFxrFrameworkSdk>
25+
<ArtifactNameSdkLanguagePack>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-langpack</ArtifactNameSdkLanguagePack>
2526

2627
<ArtifactNameWithVersionSdk>$(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
2728

2829

2930
<ArtifactNameWithVersionSdkDebug>$(ArtifactNameSdkDebug)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdkDebug>
3031
<ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
32+
<ArtifactNameWithVersionSdkLanguagePack>$(ArtifactNameSdkLanguagePack)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdkLanguagePack>
3133
<DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(HostMonikerRid)</DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
3234
</PropertyGroup>
3335
</Project>

build/package/Archive.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,21 @@
1414

1515
<PropertyGroup>
1616
<GenerateArchivesDestinationArchive>$(ArchiveOutputDirectory)/%(GenerateArchivesInputsOutputs.OutFileName)$(ArchiveExtension)</GenerateArchivesDestinationArchive>
17-
<SatelliteAssemblies>*.resources.dll</SatelliteAssemblies>
1817
</PropertyGroup>
1918

2019
<ZipFileCreateFromDirectory
2120
Condition=" '$(OSName)' == 'win' "
2221
SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
2322
DestinationArchive="$(GenerateArchivesDestinationArchive)"
2423
OverwriteDestination="true"
25-
ExcludePatterns="$(SatelliteAssemblies)" />
24+
ExcludePatterns="%(GenerateArchivesInputsOutputs.ExcludePatterns)" />
2625

2726
<TarGzFileCreateFromDirectory
2827
Condition=" '$(OSName)' != 'win' "
2928
SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
3029
DestinationArchive="$(GenerateArchivesDestinationArchive)"
3130
OverwriteDestination="true"
32-
ExcludePatterns="$(SatelliteAssemblies)" />
31+
ExcludePatterns="%(GenerateArchivesInputsOutputs.ExcludePatterns)" />
3332

3433
<ItemGroup>
3534
<Archives Include="$(GenerateArchivesDestinationArchive)" />
@@ -45,6 +44,7 @@
4544
<Outputs>$(ArchiveOutputDirectory)/%(LayoutDefinition.NameWithVersion)$(ArchiveExtension)</Outputs>
4645
<InputDirectory>$(LayoutDirectory)/%(LayoutDefinition.Name)</InputDirectory>
4746
<OutFileName>%(LayoutDefinition.NameWithVersion)</OutFileName>
47+
<ExcludePatterns>%(LayoutDefinition.ExcludePatterns)</ExcludePatterns>
4848
</GenerateArchivesInputsOutputs>
4949
</ItemGroup>
5050
</Target>

build/package/Layout.targets

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<PropertyGroup>
44
<SdkDebugLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkDebug)</SdkDebugLayoutOutputDirectory>
55
<CombinedHostHostFxrFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</CombinedHostHostFxrFrameworkSdkOutputDirectory>
6+
<SdkLanguagePackOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkLanguagePack)</SdkLanguagePackOutputDirectory>
7+
<SatelliteAssemblies>*.resources.dll</SatelliteAssemblies>
8+
<WindowsSatelliteAssembliesRegEx>.*.resources.dll</WindowsSatelliteAssembliesRegEx>
69
</PropertyGroup>
710

811
<Target DependsOnTargets="Init" Name="SetupLayoutInputsOutputs" >
@@ -11,6 +14,7 @@
1114
<SdkLayoutInput Include="$(OutputDirectory)/sdk/**/*" />
1215
<SdkDebugLayoutInput Include="$(SymbolsDirectory)/sdk/**/*" />
1316
<CombinedHostHostFxrFrameworkSdkInput Include="$(OutputDirectory)/**/*" />
17+
<SdkLanguagePackInput Include="$(OutputDirectory)/sdk/**/$(SatelliteAssemblies)" />
1418

1519
<AspNetRuntimeFilesInput Include="$(AspNetRuntimePackageStorePublishDirectory)/**/*" />
1620
</ItemGroup>
@@ -30,6 +34,11 @@
3034
Path2="%(CombinedHostHostFxrFrameworkSdkInput.Identity)" >
3135
<Output TaskParameter="RelativePath" ItemName="CombinedHostHostFxrFrameworkSdkRelativeOutputFiles" />
3236
</MakeRelative>
37+
<MakeRelative
38+
Path1="$(OutputDirectory)/"
39+
Path2="%(SdkLanguagePackInput.Identity)" >
40+
<Output TaskParameter="RelativePath" ItemName="SdkLanguagePackRelativeOutputFiles" />
41+
</MakeRelative>
3342

3443
<!-- Set up Items Defining Layouts for easy change -->
3544
<ItemGroup>
@@ -52,6 +61,15 @@
5261
<OutputFiles>@(CombinedHostHostFxrFrameworkSdkRelativeOutputFiles -> '$(CombinedHostHostFxrFrameworkSdkOutputDirectory)/%(Identity)')</OutputFiles>
5362
<NameWithVersion>$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)</NameWithVersion>
5463
<Name>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</Name>
64+
<ExcludePatterns Condition=" '$(OSName)' == 'win' ">$(WindowsSatelliteAssembliesRegEx)</ExcludePatterns>
65+
<ExcludePatterns Condition=" '$(OSName)' != 'win' ">$(SatelliteAssemblies)</ExcludePatterns>
66+
</LayoutDefinition>
67+
68+
<LayoutDefinition Include="SdkLanguagePack">
69+
<InputFiles>@(SdkLanguagePackInput)</InputFiles>
70+
<OutputFiles>@(SdkLanguagePackRelativeOutputFiles -> '$(SdkLanguagePackOutputDirectory)/%(Identity)')</OutputFiles>
71+
<NameWithVersion>$(ArtifactNameWithVersionSdkLanguagePack)</NameWithVersion>
72+
<Name>$(ArtifactNameSdkLanguagePack)</Name>
5573
</LayoutDefinition>
5674

5775
</ItemGroup>

0 commit comments

Comments
 (0)