From cc20def99bbd0b28f19d90aee50d67f674738505 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 26 Jun 2020 14:55:01 -0700
Subject: Remove use of inner text conversions for Util.wixext

Also, convert all test code to modern expectation
---
 src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs  | 6 ++----
 .../TestData/InternetShortcut/PackageComponents.wxs                 | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/test/WixToolsetTest.Util/TestData/InternetShortcut')

diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
index fc1018ae..d3130591 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
         <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
 
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs
index 23b172f8..5319d2f7 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
     <Fragment>
         <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
             <Component>
-- 
cgit v1.2.3-55-g6feb