Add test for Localization variable with multiple dots '.' within it.

Modify Common.TryParseWixVariable to only look for subsequent dots in
the bind variables, the others (wix/loc) will just be considered as names
that include dots.
Also fixed up typo of 'identifier'.


Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>

Author: bevanweiss

src/wix/WixToolset.Core/Common.cs

@@ -299,7 +299,7 @@ public static string GenerateIdentifier(string prefix, params string[] args)
         /// <summary>
         /// Return an identifier based on provided file or directory name
         /// </summary>
-        /// <param name="name">File/directory name to generate identifer from</param>
+        /// <param name="name">File/directory name to generate identifier from</param>
         /// <returns>A version of the name that is a legal identifier.</returns>
         internal static string GetIdentifierFromName(string name)
         {
@@ -767,7 +767,7 @@ internal static bool TryParseWixVariable(string value, int start, out ParsedWixV
             var end = equalsDefaultValue == -1 ? closeParen : equalsDefaultValue;
             var secondDot = value.IndexOf('.', firstDot + 1, end - firstDot);
 
-            if (secondDot == -1)
+            if ( (secondDot == -1) || (ns != "bind") )
             {
                 name = value.Substring(firstDot + 1, end - firstDot - 1);
             }

src/wix/test/WixToolsetTest.Core/VariableResolverFixture.cs

@@ -23,6 +23,8 @@ public void CanRecursivelyResolveVariables()
                 { "ProductName", new BindVariable() { Id = "ProductName", Value = "Localized Product Name" } },
                 { "ProductNameEdition", new BindVariable() { Id = "ProductNameEdition", Value = "!(loc.ProductName) Enterprise Edition" } },
                 { "ProductNameEditionVersion", new BindVariable() { Id = "ProductNameEditionVersion", Value = "!(loc.ProductNameEdition) v1.2.3" } },
+                { "ProductNameEditionVersion.WithDot", new BindVariable() { Id = "ProductNameEditionVersion.WithDot", Value = "Test of localization variable with dot" } },
+                { "ProductNameEditionVersion.WithDotTest", new BindVariable() { Id = "ProductNameEditionVersion.WithDotTest", Value = "!(loc.ProductNameEditionVersion.WithDot) v1.2.3" } },
             };
 
             var localization = new Localization(0, null, "x-none", variables, new Dictionary<string, LocalizedControl>());
@@ -45,6 +47,10 @@ public void CanRecursivelyResolveVariables()
             WixAssert.StringEqual("Welcome to Localized Product Name Enterprise Edition v1.2.3", result.Value);
             Assert.True(result.UpdatedValue);
 
+            result = variableResolver.ResolveVariables(null, "Welcome to !(loc.ProductNameEditionVersion.WithDotTest)");
+            WixAssert.StringEqual("Welcome to Test of localization variable with dot v1.2.3", result.Value);
+            Assert.True(result.UpdatedValue);
+
             result = variableResolver.ResolveVariables(null, "Welcome to !(bind.property.ProductVersion)");
             WixAssert.StringEqual("Welcome to !(bind.property.ProductVersion)", result.Value);
             Assert.False(result.UpdatedValue);