Fix build when Cultures is specified

Write the tests for the test data in the WixToolset.Sdk test and fix
all the culture related bugs that fallout from that.

Fixes 69999

17 files changed, 216 insertions, 105 deletions

diff --git a/src/wix/WixToolset.BuildTasks/WixAssignCulture.cs b/src/wix/WixToolset.BuildTasks/WixAssignCulture.cs
index a8baa62f..ac257990 100644
--- a/src/wix/WixToolset.BuildTasks/WixAssignCulture.cs
+++ b/src/wix/WixToolset.BuildTasks/WixAssignCulture.cs
@@ -17,6 +17,7 @@ namespace WixToolset.BuildTasks
     public class WixAssignCulture : Task
     {
         private const string CultureAttributeName = "Culture";
+        private const string OutputSuffixMetadataName = "OutputSuffix";
         private const string OutputFolderMetadataName = "OutputFolder";
         private const string InvariantCultureIdentifier = "neutral";
         private const string NullCultureIdentifier = "null";
@@ -35,21 +36,13 @@ namespace WixToolset.BuildTasks
         /// The list of files to apply culture information to.
         /// </summary>
         [Required]
-        public ITaskItem[] Files
-        {
-            get;
-            set;
-        }
+        public ITaskItem[] Files { get; set; }
 
         /// <summary>
         /// The files that had culture information applied
         /// </summary>
         [Output]
-        public ITaskItem[] CultureGroups
-        {
-            get;
-            private set;
-        }
+        public ITaskItem[] CultureGroups { get; private set; }
 
         /// <summary>
         /// Applies culture information to the files specified by the Files property.
@@ -60,70 +53,66 @@ namespace WixToolset.BuildTasks
         public override bool Execute()
         {
             // First, process the culture group list the user specified in the cultures property
-            List<CultureGroup> cultureGroups = new List<CultureGroup>();
+            var cultureGroups = new List<CultureGroup>();
 
             if (!String.IsNullOrEmpty(this.Cultures))
             {
                 // Get rid of extra quotes
                 this.Cultures = this.Cultures.Trim('\"');
 
-                foreach (string cultureGroupString in this.Cultures.Split(';'))
+                // MSBuild cannnot handle "" items for the invariant culture we require the neutral keyword
+                foreach (var cultureGroupString in this.Cultures.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
                 {
-                    if (0 == cultureGroupString.Length)
-                    {
-                        // MSBuild v2.0.50727 cannnot handle "" items
-                        // for the invariant culture we require the neutral keyword
-                        continue;
-                    }
-                    CultureGroup cultureGroup = new CultureGroup(cultureGroupString);
+                    var cultureGroup = new CultureGroup(cultureGroupString);
                     cultureGroups.Add(cultureGroup);
                 }
             }
             else
             {
                 // Only process the EmbeddedResource items if cultures was unspecified
-                foreach (ITaskItem file in this.Files)
+                foreach (var file in this.Files)
                 {
                     // Ignore non-wxls
                     if (!String.Equals(file.GetMetadata("Extension"), ".wxl", StringComparison.OrdinalIgnoreCase))
                     {
-                        Log.LogError("Unable to retrieve the culture for EmbeddedResource {0}. The file type is not supported.", file.ItemSpec);
+                        this.Log.LogError("Unable to retrieve the culture for EmbeddedResource {0}. The file type is not supported.", file.ItemSpec);
                         return false;
                     }
-                    XmlDocument wxlFile = new XmlDocument();
 
+                    var wxlFile = new XmlDocument();
                     try
                     {
                         wxlFile.Load(file.ItemSpec);
                     }
                     catch (FileNotFoundException)
                     {
-                        Log.LogError("Unable to retrieve the culture for EmbeddedResource {0}. The file was not found.", file.ItemSpec);
+                        this.Log.LogError("Unable to retrieve the culture for EmbeddedResource {0}. The file was not found.", file.ItemSpec);
                         return false;
                     }
                     catch (Exception e)
                     {
-                        Log.LogError("Unable to retrieve the culture for EmbeddedResource {0}: {1}", file.ItemSpec, e.Message);
+                        this.Log.LogError("Unable to retrieve the culture for EmbeddedResource {0}: {1}", file.ItemSpec, e.Message);
                         return false;
                     }
 
                     // Take the culture value and try using it to create a culture.
-                    XmlAttribute cultureAttr = wxlFile.DocumentElement.Attributes[WixAssignCulture.CultureAttributeName];
-                    string wxlCulture = null == cultureAttr ? String.Empty : cultureAttr.Value;
+                    var cultureAttr = wxlFile.DocumentElement.Attributes[WixAssignCulture.CultureAttributeName];
+                    var wxlCulture = cultureAttr?.Value ?? String.Empty;
+
                     if (0 == wxlCulture.Length)
                     {
-                        // We use a keyword for the invariant culture because MSBuild v2.0.50727 cannnot handle "" items
+                        // We use a keyword for the invariant culture because MSBuild cannnot handle "" items.
                         wxlCulture = InvariantCultureIdentifier;
                     }
 
                     // We found the culture for the WXL, we now need to determine if it maps to a culture group specified
                     // in the Cultures property or if we need to create a new one.
-                    Log.LogMessage(MessageImportance.Low, "Culture \"{0}\" from EmbeddedResource {1}.", wxlCulture, file.ItemSpec);
+                    this.Log.LogMessage(MessageImportance.Low, "Culture \"{0}\" from EmbeddedResource {1}.", wxlCulture, file.ItemSpec);
 
-                    bool cultureGroupExists = false;
-                    foreach (CultureGroup cultureGroup in cultureGroups)
+                    var cultureGroupExists = false;
+                    foreach (var cultureGroup in cultureGroups)
                     {
-                        foreach (string culture in cultureGroup.Cultures)
+                        foreach (var culture in cultureGroup.Cultures)
                         {
                             if (String.Equals(wxlCulture, culture, StringComparison.OrdinalIgnoreCase))
                             {
@@ -142,29 +131,32 @@ namespace WixToolset.BuildTasks
             }
 
             // If we didn't create any culture groups the culture was unspecificed and no WXLs were included
-            // Build an unlocalized target in the output folder
+            // then build an unlocalized target in the output folder
             if (cultureGroups.Count == 0)
             {
                 cultureGroups.Add(new CultureGroup());
             }
 
-            List<TaskItem> cultureGroupItems = new List<TaskItem>();
+            var cultureGroupItems = new List<TaskItem>();
 
             if (1 == cultureGroups.Count && 0 == this.Files.Length)
             {
                 // Maintain old behavior, if only one culturegroup is specified and no WXL, output to the default folder
-                TaskItem cultureGroupItem = new TaskItem(cultureGroups[0].ToString());
+                var cultureGroupItem = new TaskItem(cultureGroups[0].ToString());
+                cultureGroupItem.SetMetadata(OutputSuffixMetadataName, cultureGroups[0].OutputSuffix);
                 cultureGroupItem.SetMetadata(OutputFolderMetadataName, CultureGroup.DefaultFolder);
                 cultureGroupItems.Add(cultureGroupItem);
             }
             else
             {
-                foreach (CultureGroup cultureGroup in cultureGroups)
+                foreach (var cultureGroup in cultureGroups)
                 {
-                    TaskItem cultureGroupItem = new TaskItem(cultureGroup.ToString());
+                    var cultureGroupItem = new TaskItem(cultureGroup.ToString());
+                    cultureGroupItem.SetMetadata(OutputSuffixMetadataName, cultureGroup.OutputSuffix);
                     cultureGroupItem.SetMetadata(OutputFolderMetadataName, cultureGroup.OutputFolder);
                     cultureGroupItems.Add(cultureGroupItem);
-                    Log.LogMessage("Culture: {0}", cultureGroup.ToString());
+
+                    this.Log.LogMessage("Culture: {0}", cultureGroup.ToString());
                 }
             }
 
@@ -180,6 +172,11 @@ namespace WixToolset.BuildTasks
             public const string DefaultFolder = "";
 
             /// <summary>
+            /// Language neutral.
+            /// </summary>
+            public const string DefaultSuffix = InvariantCultureIdentifier;
+
+            /// <summary>
             /// Initialize a null culture group
             /// </summary>
             public CultureGroup()
@@ -189,7 +186,7 @@ namespace WixToolset.BuildTasks
             public CultureGroup(string cultureGroupString)
             {
                 Debug.Assert(!String.IsNullOrEmpty(cultureGroupString));
-                foreach (string cultureString in cultureGroupString.Split(','))
+                foreach (var cultureString in cultureGroupString.Split(','))
                 {
                     this.Cultures.Add(cultureString);
                 }
@@ -201,17 +198,21 @@ namespace WixToolset.BuildTasks
             {
                 get
                 {
-                    string result = DefaultFolder;
                     if (this.Cultures.Count > 0 && 
                         !this.Cultures[0].Equals(InvariantCultureIdentifier, StringComparison.OrdinalIgnoreCase))
                     {
-                        result = this.Cultures[0] + "\\";
+                        return this.Cultures[0] + "\\";
                     }
 
-                    return result;
+                    return DefaultFolder;
                 }
             }
 
+            public string OutputSuffix
+            {
+                get =>  (this.Cultures.Count > 0) ? this.Cultures[0] : InvariantCultureIdentifier;
+            }
+
             public override string ToString()
             {
                 if (this.Cultures.Count > 0)
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index ff9b2eb1..e18eaf62 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -566,7 +566,7 @@
       @(_ResolvedWixLibraryPaths);
       @(_ResolvedWixExtensionPaths);
       @(_BindInputs)"
-      Outputs="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension);@(_BindBuiltOutputs)"
+      Outputs="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension);@(_BindBuiltOutputs)"
       DependsOnTargets="$(CoreCompileDependsOn)" 
       Condition=" '@(Compile)' != '' ">
 
@@ -604,7 +604,7 @@
         BindPaths="@(BindPath)"
         BindVariables="@(BindVariable)"
         BindFiles="$(BindFiles)"
-        BindTrackingFile="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)"
+        BindTrackingFile="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension)"
 
         CabinetCachePath="$(_WixBuildCabinetCachePath)"
         CabinetCreationThreadCount="$(CabinetCreationThreadCount)"
@@ -719,7 +719,7 @@
   <Target
     Name="ReadPreviousBindInputsAndBuiltOutputs">
 
-    <ReadTracking File="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)">
+    <ReadTracking File="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension)">
       <Output TaskParameter="Inputs" ItemName="_BindInputs" />
       <Output TaskParameter="BuiltOutputs" ItemName="_BindBuiltOutputs" />
     </ReadTracking>
@@ -748,12 +748,12 @@
       Name="UpdateFileWritesWithBindInformation"
       AfterTargets="CoreCompile">
 
-    <ReadTracking File="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)">
+    <ReadTracking File="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension)">
       <Output TaskParameter="Outputs" ItemName="FileWrites" />
     </ReadTracking>
 
     <ItemGroup>
-      <FileWrites Include="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)" Condition=" Exists('$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)') " />
+      <FileWrites Include="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension)" Condition=" Exists('$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension)') " />
     </ItemGroup>
   </Target>
 
@@ -818,7 +818,7 @@
     <!-- Don't add BuiltProjectOutputGroupKeyOutput - to avoid duplicates, we only want to get the updated list of TargetPaths from the TargetPath property below -->
 
     <!-- Try to read the outputs from the bind tracking text file since that's the output list straight from compiler. -->
-    <ReadTracking File="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)">
+    <ReadTracking File="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension)">
       <Output TaskParameter="Outputs" ItemName="_BuiltProjectOutputGroupOutputIntermediate" />
     </ReadTracking>
 
@@ -894,7 +894,7 @@
     </ItemGroup>
 
     <!-- Add the bound content output files to the list to be copied. -->
-    <ReadTracking File="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)">
+    <ReadTracking File="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension)">
       <Output TaskParameter="BuiltContentOutputs" ItemName="_FullPathToCopy" />
       <Output TaskParameter="CopiedOutputs" ItemName="_FullPathToCopy" />
     </ReadTracking>
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index 05de1e2a..845df9be 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -252,15 +252,26 @@ namespace WixToolsetTest.Sdk
                 });
                 result.AssertSuccess();
 
+                var trackingContents = File.ReadAllLines(Path.Combine(baseFolder, "obj", "Release", "MsiPackageWithBindVariables.wixproj.BindTracking-neutral.txt"));
+                var lines = trackingContents.Select(l => l.Replace(baseFolder, "<basefolder>")).ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "BuiltContentOutput\t<basefolder>\\obj\\Release\\cab1.cab",
+                    "BuiltPdbOutput\t<basefolder>\\obj\\Release\\MsiPackageWithBindVariables.wixpdb",
+                    "BuiltTargetOutput\t<basefolder>\\obj\\Release\\MsiPackageWithBindVariables.msi",
+                    "Input\tdata\\test.txt",
+                    "Intermediate\t<basefolder>\\obj\\Release\\cab1.cab"
+                }, lines);
+
                 var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
                     .Select(s => s.Substring(baseFolder.Length + 1))
                     .OrderBy(s => s)
                     .ToArray();
                 WixAssert.CompareLineByLine(new[]
                 {
-                    @"bin\Release\en-US\cab1.cab",
-                    @"bin\Release\en-US\MsiPackageWithBindVariables.msi",
-                    @"bin\Release\en-US\MsiPackageWithBindVariables.wixpdb",
+                    @"bin\Release\cab1.cab",
+                    @"bin\Release\MsiPackageWithBindVariables.msi",
+                    @"bin\Release\MsiPackageWithBindVariables.wixpdb",
                 }, paths);
             }
         }
@@ -428,6 +439,85 @@ namespace WixToolsetTest.Sdk
         [InlineData(BuildSystem.DotNetCoreSdk)]
         [InlineData(BuildSystem.MSBuild)]
         [InlineData(BuildSystem.MSBuild64)]
+        public void CanBuildSingleCultureWithFallbackMsiPackage(BuildSystem buildSystem)
+        {
+            var sourceFolder = TestData.Get(@"TestData", "SingleCultureWithFallbackMsiPackage");
+
+            using (var fs = new TestDataFolderFileSystem())
+            {
+                fs.Initialize(sourceFolder);
+                var baseFolder = fs.BaseFolder;
+                var binFolder = Path.Combine(baseFolder, @"bin\");
+                var projectPath = Path.Combine(baseFolder, "SingleCultureWithFallbackMsiPackage.wixproj");
+
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
+                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath)
+                });
+                result.AssertSuccess();
+
+                var trackingContents = File.ReadAllLines(Path.Combine(baseFolder, "obj", "Release", "SingleCultureWithFallbackMsiPackage.wixproj.BindTracking-de-DE.txt"));
+                var lines = trackingContents.Select(l => l.Replace(baseFolder, "<basefolder>")).ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "BuiltContentOutput\t<basefolder>\\obj\\Release\\de-DE\\cab1.cab",
+                    "BuiltPdbOutput\t<basefolder>\\obj\\Release\\de-DE\\SingleCultureWithFallbackMsiPackage.wixpdb",
+                    "BuiltTargetOutput\t<basefolder>\\obj\\Release\\de-DE\\SingleCultureWithFallbackMsiPackage.msi",
+                    "Input\t<basefolder>\\data\\test.txt",
+                    "Intermediate\t<basefolder>\\obj\\Release\\de-DE\\cab1.cab"
+                }, lines);
+            }
+        }
+
+        [Theory]
+        [InlineData(BuildSystem.DotNetCoreSdk)]
+        [InlineData(BuildSystem.MSBuild)]
+        [InlineData(BuildSystem.MSBuild64)]
+        public void CanBuildMultiCulturalMsiPackage(BuildSystem buildSystem)
+        {
+            var sourceFolder = TestData.Get(@"TestData", "MultiCulturalMsiPackage");
+
+            using (var fs = new TestDataFolderFileSystem())
+            {
+                fs.Initialize(sourceFolder);
+                var baseFolder = fs.BaseFolder;
+                var slnPath = Path.Combine(baseFolder, "MultiCulturalMsiPackage.sln");
+                var projectFolder = Path.Combine(baseFolder, "MsiPackage");
+
+                var result = MsbuildUtilities.BuildProject(buildSystem, slnPath, new[]
+                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath)
+                });
+                result.AssertSuccess();
+
+                var trackingEnuContents = File.ReadAllLines(Path.Combine(projectFolder, "obj", "x64", "Release", "MsiPackage.wixproj.BindTracking-en-US.txt"));
+                var enuLines = trackingEnuContents.Select(l => l.Replace(projectFolder, "<basefolder>")).ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "BuiltContentOutput\t<basefolder>\\obj\\x64\\Release\\en-US\\cab1.cab",
+                    "BuiltPdbOutput\t<basefolder>\\obj\\x64\\Release\\en-US\\MsiPackage.wixpdb",
+                    "BuiltTargetOutput\t<basefolder>\\obj\\x64\\Release\\en-US\\MsiPackage.msi",
+                    "Input\t<basefolder>\\data\\test.txt",
+                    "Intermediate\t<basefolder>\\obj\\x64\\Release\\en-US\\cab1.cab"
+                }, enuLines);
+
+                var trackingDeuContents = File.ReadAllLines(Path.Combine(projectFolder, "obj", "x64", "Release", "MsiPackage.wixproj.BindTracking-de-DE.txt"));
+                var deuLines = trackingDeuContents.Select(l => l.Replace(projectFolder, "<basefolder>")).ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "BuiltContentOutput\t<basefolder>\\obj\\x64\\Release\\de-DE\\cab1.cab",
+                    "BuiltPdbOutput\t<basefolder>\\obj\\x64\\Release\\de-DE\\MsiPackage.wixpdb",
+                    "BuiltTargetOutput\t<basefolder>\\obj\\x64\\Release\\de-DE\\MsiPackage.msi",
+                    "Input\t<basefolder>\\data\\test.txt",
+                    "Intermediate\t<basefolder>\\obj\\x64\\Release\\de-DE\\cab1.cab"
+                }, deuLines);
+            }
+        }
+
+        [Theory]
+        [InlineData(BuildSystem.DotNetCoreSdk)]
+        [InlineData(BuildSystem.MSBuild)]
+        [InlineData(BuildSystem.MSBuild64)]
         public void CanBuildSimpleMsiPackageAsWixipl(BuildSystem buildSystem)
         {
             var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage");
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/MsiPackageWithBindVariables.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/MsiPackageWithBindVariables.wixproj
index e6eb8f88..e6978f49 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/MsiPackageWithBindVariables.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/MsiPackageWithBindVariables.wixproj
@@ -7,8 +7,6 @@
   <ItemGroup>
     <Compile Include="Package.wxs" />
 
-    <EmbeddedResource Include="Package.en-us.wxl" />
-
     <BindVariable Include="VersionVar=1.2.3" />
   </ItemGroup>
 
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/Package.wxs
index c11ef3ba..4a0ac7c3 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/Package.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/Package.wxs
@@ -1,8 +1,8 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Package Name="MsiPackage" Language="1033" Version="!(wix.VersionVar)" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+    <MajorUpgrade DowngradeErrorMessage="Downgrade disabled" />
 
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
+    <Feature Id="ProductFeature">
       <Component Directory="INSTALLFOLDER">
         <File Source="!(wix.DataFolderVar)\test.txt" />
       </Component>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
index 555addbe..49ef7fbf 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
@@ -1,37 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build">
   <Import Project="$(WixMSBuildProps)" />
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>0.9</ProductVersion>
-    <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
-    <OutputName>MsiPackage</OutputName>
-    <OutputType>Package</OutputType>
-    <Name>MsiPackage</Name>
-    <RootNamespace>MsiPackage</RootNamespace>
     <Cultures>en-US,en;de-DE</Cultures>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="Package.wxs" />
     <Compile Include="PackageComponents.wxs" />
@@ -39,6 +12,7 @@
 
   <ItemGroup>
     <EmbeddedResource Include="Package.en-us.wxl" />
+    <EmbeddedResource Include="Package.en.wxl" />
     <EmbeddedResource Include="Package.de-de.wxl" />
   </ItemGroup>
 
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
index 03c5563a..1fb20ef5 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="de-DE">
-
   <String Id="DowngradeError" Value="German DowngradeError" />
   <String Id="FeatureTitle" Value="German FeatureTitle" />
-
 </WixLocalization>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
index 2bcb83ee..5e2378f8 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
@@ -1,11 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
-  <String Id="FeatureTitle" Value="MsiPackage" />
-
+  <String Id="DowngradeError" Value="EN-US Downgrade Error" />
 </WixLocalization>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en.wxl b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en.wxl
new file mode 100644
index 00000000..466bc0c6
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en.wxl
@@ -0,0 +1,4 @@
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en">
+  <String Id="DowngradeError" Value="EN Downgrade Error" Overridable="true" />
+  <String Id="FeatureTitle" Value="EN Feature Title" Overridable="true" />
+</WixLocalization>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
index df24aa33..9524f3a4 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
@@ -1,7 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
+  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
 
     <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
       <ComponentGroupRef Id="ProductComponents" />
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
index acbcd85d..f3155cf6 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build">
   <Import Project="$(WixMSBuildProps)" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/Package.de-de.wxl b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/Package.de-de.wxl
new file mode 100644
index 00000000..768ccdf0
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/Package.de-de.wxl
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+This file contains the declaration of all the localizable strings.
+-->
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="de-DE">
+
+  <String Id="DowngradeError" Value="German DowngradeError" />
+
+</WixLocalization>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/Package.en-us.wxl b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/Package.en-us.wxl
index 2bcb83ee..945a773f 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/Package.en-us.wxl
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/Package.en-us.wxl
@@ -5,7 +5,7 @@ This file contains the declaration of all the localizable strings.
 -->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
 
-  <String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
-  <String Id="FeatureTitle" Value="MsiPackage" />
+  <String Id="DowngradeError" Value="English Downgrade Error" Overridable="true" />
+  <String Id="FeatureTitle" Value="English Feature Title" Overridable="true" />
 
 </WixLocalization>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/Package.wxs
new file mode 100644
index 00000000..df24aa33
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/Package.wxs
@@ -0,0 +1,16 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
+    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+    <MediaTemplate />
+
+    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
+      <ComponentGroupRef Id="ProductComponents" />
+    </Feature>
+  </Package>
+
+  <Fragment>
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+    </StandardDirectory>
+  </Fragment>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/PackageComponents.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/PackageComponents.wxs
new file mode 100644
index 00000000..e26c4509
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/PackageComponents.wxs
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+       <Component>
+         <File Source="test.txt" />
+       </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/SingleCultureWithFallbackMsiPackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/SingleCultureWithFallbackMsiPackage.wixproj
new file mode 100644
index 00000000..86b4d786
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/SingleCultureWithFallbackMsiPackage.wixproj
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build">
+  <Import Project="$(WixMSBuildProps)" />
+  <PropertyGroup>
+    <Cultures>de-DE,en-us</Cultures>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Package.wxs" />
+    <Compile Include="PackageComponents.wxs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Package.en-us.wxl" />
+    <EmbeddedResource Include="Package.de-de.wxl" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <BindPath Include="data" />
+  </ItemGroup>
+
+  <Import Project="$(WixTargetsPath)" />
+</Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/data/test.txt b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/data/test.txt
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/data/test.txt
@@ -0,0 +1 @@
+This is test.txt.
\ No newline at end of file