From cc20def99bbd0b28f19d90aee50d67f674738505 Mon Sep 17 00:00:00 2001 From: Rob Mensching 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 --- .../TestData/BundleWithSearches/Bundle.wxs | 4 +-- .../TestData/CloseApplication/Package.wxs | 6 ++-- .../CloseApplication/PackageComponents.wxs | 4 +-- .../TestData/EventManifest/Package.wxs | 6 ++-- .../TestData/EventManifest/PackageComponents.wxs | 4 +-- .../TestData/InternetShortcut/Package.wxs | 6 ++-- .../InternetShortcut/PackageComponents.wxs | 4 +-- .../TestData/PermissionEx/Package.wxs | 6 ++-- .../TestData/PermissionEx/PackageComponents.wxs | 4 +-- .../TestData/UsingFileShare/Package.wxs | 34 ++++++++++------------ .../TestData/UsingFileShare/PackageComponents.wxs | 26 ++++++++--------- 11 files changed, 41 insertions(+), 63 deletions(-) (limited to 'src/test/WixToolsetTest.Util/TestData') diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs index 82646b37..56eba137 100644 --- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs +++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs @@ -1,6 +1,4 @@ - - + diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs index 688ce39d..ec54a472 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs @@ -1,7 +1,5 @@ - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs index 4f9e6a9d..49f29600 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs @@ -1,6 +1,4 @@ - - + diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs index fc1018ae..d3130591 100644 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs @@ -1,7 +1,5 @@ - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs index 75af3f59..2ec8ce82 100644 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs @@ -1,6 +1,4 @@ - - + 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 @@ - - - + + 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 @@ - - + diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs index fc1018ae..d3130591 100644 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs @@ -1,7 +1,5 @@ - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs index 4b4dd32e..0634d7d4 100644 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs @@ -1,6 +1,4 @@ - - + diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs index 68ff98fd..32d1cba6 100644 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs @@ -1,22 +1,20 @@ - - - - + + + - - + + - - - - - + + + + - - - - - - - + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs index c548bc1d..7cedbb30 100644 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs @@ -1,16 +1,14 @@ - - - - + + + - - - - - - - - - + + + + + + + + + -- cgit v1.2.3-55-g6feb