From 44d888dfc4ba1ea07bbc7be10302b8f652a2d3c7 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Wed, 21 Jun 2017 08:48:12 -0700
Subject: [PATCH 1/3] Exclude satellite assemblies from archive.

---
 build/package/Archive.targets | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/package/Archive.targets b/build/package/Archive.targets
index 54352ae27..4913a2374 100644
--- a/build/package/Archive.targets
+++ b/build/package/Archive.targets
@@ -14,19 +14,22 @@
 
     <PropertyGroup>
       <GenerateArchivesDestinationArchive>$(ArchiveOutputDirectory)/%(GenerateArchivesInputsOutputs.OutFileName)$(ArchiveExtension)</GenerateArchivesDestinationArchive>
+      <SatelliteAssemblies>*.resources.dll</SatelliteAssemblies>
     </PropertyGroup>
 
     <ZipFileCreateFromDirectory
         Condition=" '$(OSName)' == 'win' "
         SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
         DestinationArchive="$(GenerateArchivesDestinationArchive)"
-        OverwriteDestination="true"/>
+        OverwriteDestination="true"
+        ExcludePatterns="$(SatelliteAssemblies)" />
 
     <TarGzFileCreateFromDirectory
         Condition=" '$(OSName)' != 'win' "
         SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
         DestinationArchive="$(GenerateArchivesDestinationArchive)"
-        OverwriteDestination="true"/>
+        OverwriteDestination="true"
+        ExcludePatterns="$(SatelliteAssemblies)" />
 
     <ItemGroup>
       <Archives Include="$(GenerateArchivesDestinationArchive)" />

From 126ec29fe244e8e3702824d6647cda20c377668b Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Wed, 21 Jun 2017 22:27:28 -0700
Subject: [PATCH 2/3] 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.

---
 build/Branding.props          |  2 ++
 build/package/Archive.targets |  6 +++---
 build/package/Layout.targets  | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

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 @@
     <ArtifactNameSdk>dotnet-sdk-internal</ArtifactNameSdk>
     <ArtifactNameSdkDebug>dotnet-sdk-debug</ArtifactNameSdkDebug>
     <ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk</ArtifactNameCombinedHostHostFxrFrameworkSdk>
+    <ArtifactNameSdkLanguagePack>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-langpack</ArtifactNameSdkLanguagePack>
 
     <ArtifactNameWithVersionSdk>$(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
 
 
     <ArtifactNameWithVersionSdkDebug>$(ArtifactNameSdkDebug)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdkDebug>
     <ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
+    <ArtifactNameWithVersionSdkLanguagePack>$(ArtifactNameSdkLanguagePack)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdkLanguagePack>
     <DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(HostMonikerRid)</DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
   </PropertyGroup>
 </Project>
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 @@
 
     <PropertyGroup>
       <GenerateArchivesDestinationArchive>$(ArchiveOutputDirectory)/%(GenerateArchivesInputsOutputs.OutFileName)$(ArchiveExtension)</GenerateArchivesDestinationArchive>
-      <SatelliteAssemblies>*.resources.dll</SatelliteAssemblies>
     </PropertyGroup>
 
     <ZipFileCreateFromDirectory
@@ -22,14 +21,14 @@
         SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
         DestinationArchive="$(GenerateArchivesDestinationArchive)"
         OverwriteDestination="true"
-        ExcludePatterns="$(SatelliteAssemblies)" />
+        ExcludePatterns="%(GenerateArchivesInputsOutputs.ExcludePatterns)" />
 
     <TarGzFileCreateFromDirectory
         Condition=" '$(OSName)' != 'win' "
         SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
         DestinationArchive="$(GenerateArchivesDestinationArchive)"
         OverwriteDestination="true"
-        ExcludePatterns="$(SatelliteAssemblies)" />
+        ExcludePatterns="%(GenerateArchivesInputsOutputs.ExcludePatterns)" />
 
     <ItemGroup>
       <Archives Include="$(GenerateArchivesDestinationArchive)" />
@@ -45,6 +44,7 @@
         <Outputs>$(ArchiveOutputDirectory)/%(LayoutDefinition.NameWithVersion)$(ArchiveExtension)</Outputs>
         <InputDirectory>$(LayoutDirectory)/%(LayoutDefinition.Name)</InputDirectory>
         <OutFileName>%(LayoutDefinition.NameWithVersion)</OutFileName>
+        <ExcludePatterns>%(LayoutDefinition.ExcludePatterns)</ExcludePatterns>
       </GenerateArchivesInputsOutputs>
     </ItemGroup>
   </Target>
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 @@
   <PropertyGroup>
     <SdkDebugLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkDebug)</SdkDebugLayoutOutputDirectory>
     <CombinedHostHostFxrFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</CombinedHostHostFxrFrameworkSdkOutputDirectory>
+    <SdkLanguagePackOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkLanguagePack)</SdkLanguagePackOutputDirectory>
+    <SatelliteAssemblies>*.resources.dll</SatelliteAssemblies>
+    <WindowsSatelliteAssembliesRegEx>.*.resources.dll</WindowsSatelliteAssembliesRegEx>
   </PropertyGroup>
 
   <Target DependsOnTargets="Init" Name="SetupLayoutInputsOutputs" >
@@ -11,6 +14,7 @@
       <SdkLayoutInput Include="$(OutputDirectory)/sdk/**/*" />
       <SdkDebugLayoutInput Include="$(SymbolsDirectory)/sdk/**/*" />
       <CombinedHostHostFxrFrameworkSdkInput Include="$(OutputDirectory)/**/*" />
+      <SdkLanguagePackInput Include="$(OutputDirectory)/sdk/**/$(SatelliteAssemblies)" />
 
       <AspNetRuntimeFilesInput Include="$(AspNetRuntimePackageStorePublishDirectory)/**/*" />
     </ItemGroup>
@@ -30,6 +34,11 @@
       Path2="%(CombinedHostHostFxrFrameworkSdkInput.Identity)" >
       <Output TaskParameter="RelativePath" ItemName="CombinedHostHostFxrFrameworkSdkRelativeOutputFiles" />
     </MakeRelative>
+    <MakeRelative
+      Path1="$(OutputDirectory)/"
+      Path2="%(SdkLanguagePackInput.Identity)" >
+      <Output TaskParameter="RelativePath" ItemName="SdkLanguagePackRelativeOutputFiles" />
+    </MakeRelative>
 
     <!-- Set up Items Defining Layouts for easy change -->
     <ItemGroup>
@@ -52,6 +61,15 @@
         <OutputFiles>@(CombinedHostHostFxrFrameworkSdkRelativeOutputFiles -> '$(CombinedHostHostFxrFrameworkSdkOutputDirectory)/%(Identity)')</OutputFiles>
         <NameWithVersion>$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)</NameWithVersion>
         <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>
 
     </ItemGroup>

From 6fc24fca4fe5a0c8cfcdddc7ea17f0a1da229321 Mon Sep 17 00:00:00 2001
From: Livar <licavalc@microsoft.com>
Date: Mon, 26 Jun 2017 17:00:35 -0700
Subject: [PATCH 3/3] Updating the runtime to pick up the satellite assembly
 host fix.

---
 build/DependencyVersions.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 71abf62a5..80a2bb7f4 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <CLI_SharedFrameworkVersion>2.0.0-preview3-25419-01</CLI_SharedFrameworkVersion>
+    <CLI_SharedFrameworkVersion>2.0.0-preview3-25426-01</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.3.0-preview-000388-01</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.3.0-beta3-61816-04</CLI_Roslyn_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
@@ -23,8 +23,8 @@
     <TemplateEngineVersion>1.0.0-beta2-20170608-254</TemplateEngineVersion>
     <TemplateEngineTemplateVersion>1.0.0-beta2-20170612-258</TemplateEngineTemplateVersion>
     <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170612-258</TemplateEngineTemplate2_0Version>
-    <PlatformAbstractionsVersion>2.0.0-preview3-25419-01</PlatformAbstractionsVersion>
-    <DependencyModelVersion>2.0.0-preview3-25419-01</DependencyModelVersion>
+    <PlatformAbstractionsVersion>2.0.0-preview3-25426-01</PlatformAbstractionsVersion>
+    <DependencyModelVersion>2.0.0-preview3-25426-01</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
     <CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
     <MicroBuildVersion>0.2.0</MicroBuildVersion>