From 574c7ed221e8b65abb0011b5d0b7bc9d7ea9bb54 Mon Sep 17 00:00:00 2001
From: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
Date: Fri, 14 Oct 2016 14:45:42 +0100
Subject: [PATCH] [DotNet upgrade] Update wix patches for 3.10, to address
 changes in the source files

Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
---
 mk/patches/wix_src_patch | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/mk/patches/wix_src_patch b/mk/patches/wix_src_patch
index 8102c17b4..747cfa95a 100644
--- a/mk/patches/wix_src_patch
+++ b/mk/patches/wix_src_patch
@@ -468,18 +468,17 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
  
      <String Id="ProgressTextInstallValidate" Overridable="yes"><!-- _locID_text="ProgressTextInstallValidate" _locComment="ProgressTextInstallValidate" -->Validating install</String>
      <String Id="ProgressTextInstallFiles" Overridable="yes"><!-- _locID_text="ProgressTextInstallFiles" _locComment="ProgressTextInstallFiles" -->Copying new files</String>
-@@ -606,4 +606,10 @@
+@@ -598,4 +598,10 @@
      <String Id="UITextVolumeCostRequired" Overridable="yes"><!-- _locID_text="UITextVolumeCostRequired" _locComment="UITextVolumeCostRequired" -->Required</String>
      <String Id="UITextVolumeCostSize" Overridable="yes"><!-- _locID_text="UITextVolumeCostSize" _locComment="UITextVolumeCostSize" -->Disk Size</String>
      <String Id="UITextVolumeCostVolume" Overridable="yes"><!-- _locID_text="UITextVolumeCostVolume" _locComment="UITextVolumeCostVolume" -->Volume</String>
-+
++    
 +    <String Id="ErrorNewerProduct">A newer version of this product is already installed.</String>
 +    <String Id="InstallDirDlgUsersLabel">Install for:</String>
 +    <String Id="InstallDirDlgUsersAllRadioButton">&amp;All Users</String>
-+    <String Id="InstallDirDlgUsersOneRadioButton">&amp;Just Me</String>
++    <String Id="InstallDirDlgUsersOneRadioButton">&amp;Just Me</String>
 +    <String Id="InstallDirDlgShortCut">&amp;Create shortcut on Desktop</String>
- </WixLocalization>
-\ No newline at end of file
+ </WixLocalization>
 diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
 --- wixlib/WixUI_ja-jp.wxl	Thu Jan 20 06:13:28 2011 -0800
 +++ wixlib/WixUI_ja-jp.wxl	Mon Jun 25 15:08:16 2012 +0000
@@ -864,9 +863,9 @@ diff -ru wixlib/CustomizeDlg.wxs wixlib/CustomizeDlg.wxs
 @@ -1,4 +1,4 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 +<?xml version="1.0" encoding="utf-8"?>
- <!--
-     Copyright (c) Microsoft Corporation.  All rights reserved.
-     
+ <!-- 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. -->
+ 
+ 
 @@ -14,8 +14,8 @@
      <Fragment>
          <UI>