From a5b99dfd10f8c429af08c7b33de97ffbbf8502c9 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 1 Jan 2018 16:49:10 -0800
Subject: Set default culture and update to latest dependencies

---
 src/wixext/UtilCompiler.cs                | 3 +--
 src/wixext/UtilExtensionData.cs           | 2 ++
 src/wixext/WixToolset.Util.wixext.csproj  | 8 +++++---
 src/wixext/WixToolset.Util.wixext.targets | 5 ++++-
 4 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/wixext')

diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs
index da48e412..59b36d1c 100644
--- a/src/wixext/UtilCompiler.cs
+++ b/src/wixext/UtilCompiler.cs
@@ -2676,8 +2676,7 @@ namespace WixToolset.Util
                     attributes |= WixProductSearchAttributes.UpgradeCode;
                 }
 
-                var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixProductSearch");
-                row.Set(0, id);
+                var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixProductSearch", id);
                 row.Set(1, productCode ?? upgradeCode);
                 row.Set(2, (int)attributes);
             }
diff --git a/src/wixext/UtilExtensionData.cs b/src/wixext/UtilExtensionData.cs
index 7eefc238..55c9b046 100644
--- a/src/wixext/UtilExtensionData.cs
+++ b/src/wixext/UtilExtensionData.cs
@@ -7,6 +7,8 @@ namespace WixToolset.Util
 
     public sealed class UtilExtensionData : BaseExtensionData
     {
+        public override string DefaultCulture => "en-US";
+
         public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
         {
             tupleDefinition = UtilTupleDefinitions.ByName(name);
diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj
index a06298a3..23fa2cd0 100644
--- a/src/wixext/WixToolset.Util.wixext.csproj
+++ b/src/wixext/WixToolset.Util.wixext.csproj
@@ -19,9 +19,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
-    <ProjectReference Include="$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
-    <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " PrivateAssets="all" />
+    <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\README.md') " />
+    <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\README.md') " PrivateAssets="all" />
+
+    <ProjectReference Include="$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Extensibility\README.md') " />
+    <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Extensibility\README.md') " PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/wixext/WixToolset.Util.wixext.targets b/src/wixext/WixToolset.Util.wixext.targets
index 3b43c25c..e298b06e 100644
--- a/src/wixext/WixToolset.Util.wixext.targets
+++ b/src/wixext/WixToolset.Util.wixext.targets
@@ -2,7 +2,10 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <WixToolsetUtilWixextPath Condition=" '$(WixToolsetUtilWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Util.wixext.dll"</WixToolsetUtilWixextPath>
+  </PropertyGroup>
   <ItemGroup>
-    <WixExtension Include="$(MSBuildThisFileDirectory)..\tools\WixToolset.Util.wixext.dll" />
+    <WixExtension Include="$(WixToolsetUtilWixextPath)" />
   </ItemGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb