diff --git a/build/Branding.props b/build/Branding.props index 913041dac..209a12c1d 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -22,12 +22,14 @@ dotnet-sdk-internal dotnet-sdk-debug dotnet-sdk + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-langpack $(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid) $(ArtifactNameSdkDebug)-$(SdkVersion)-$(ProductMonikerRid) $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid) + $(ArtifactNameSdkLanguagePack)-$(SdkVersion)-$(ProductMonikerRid) $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(HostMonikerRid) diff --git a/build/package/Archive.targets b/build/package/Archive.targets index 4913a2374..d0cd63ae1 100644 --- a/build/package/Archive.targets +++ b/build/package/Archive.targets @@ -14,7 +14,6 @@ $(ArchiveOutputDirectory)/%(GenerateArchivesInputsOutputs.OutFileName)$(ArchiveExtension) - *.resources.dll + ExcludePatterns="%(GenerateArchivesInputsOutputs.ExcludePatterns)" /> + ExcludePatterns="%(GenerateArchivesInputsOutputs.ExcludePatterns)" /> @@ -45,6 +44,7 @@ $(ArchiveOutputDirectory)/%(LayoutDefinition.NameWithVersion)$(ArchiveExtension) $(LayoutDirectory)/%(LayoutDefinition.Name) %(LayoutDefinition.NameWithVersion) + %(LayoutDefinition.ExcludePatterns) diff --git a/build/package/Layout.targets b/build/package/Layout.targets index b9361c55d..6edb15076 100644 --- a/build/package/Layout.targets +++ b/build/package/Layout.targets @@ -3,6 +3,9 @@ $(LayoutDirectory)/$(ArtifactNameSdkDebug) $(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk) + $(LayoutDirectory)/$(ArtifactNameSdkLanguagePack) + *.resources.dll + .*.resources.dll @@ -11,6 +14,7 @@ + @@ -30,6 +34,11 @@ Path2="%(CombinedHostHostFxrFrameworkSdkInput.Identity)" > + + + @@ -52,6 +61,15 @@ @(CombinedHostHostFxrFrameworkSdkRelativeOutputFiles -> '$(CombinedHostHostFxrFrameworkSdkOutputDirectory)/%(Identity)') $(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk) $(ArtifactNameCombinedHostHostFxrFrameworkSdk) + $(WindowsSatelliteAssembliesRegEx) + $(SatelliteAssemblies) + + + + @(SdkLanguagePackInput) + @(SdkLanguagePackRelativeOutputFiles -> '$(SdkLanguagePackOutputDirectory)/%(Identity)') + $(ArtifactNameWithVersionSdkLanguagePack) + $(ArtifactNameSdkLanguagePack)