From c532140cff9e3f2603a0ca823a410b10d8d8938b Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 26 Oct 2020 21:09:24 -0400 Subject: Update test authoring for Package/SummaryInformation change. --- global.json | 2 +- .../WixToolsetTest.Util/TestData/CloseApplication/Package.wxs | 7 ++----- src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs | 7 ++----- .../WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs | 7 ++----- .../TestData/InternetShortcutModule/Package.wxs | 6 +++--- src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs | 7 ++----- src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs | 8 +++----- src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs | 7 ++----- src/wixext/UtilCompiler.cs | 2 +- 9 files changed, 18 insertions(+), 35 deletions(-) diff --git a/global.json b/global.json index cd03153d..33154a9e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0159" + "WixToolset.Sdk": "4.0.0-build-0162" }, "sdk": { "allowPrerelease": false diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs index ec54a472..410b151d 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs @@ -1,16 +1,13 @@  - - - + - - + diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs index d3130591..09d2c46e 100644 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs @@ -1,14 +1,11 @@  - - - + - - + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs index d3130591..09d2c46e 100644 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs @@ -1,14 +1,11 @@  - - - + - - + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs index f38295e7..2a9daa1c 100644 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs @@ -1,6 +1,6 @@ - - - + + + diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs index d3130591..09d2c46e 100644 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs @@ -1,14 +1,11 @@  - - - + - - + diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs index 7f6cd7fa..43365cc3 100644 --- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs @@ -1,7 +1,5 @@ - - - - + + @@ -12,7 +10,7 @@ - + diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs index 32d1cba6..873b137e 100644 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs @@ -1,14 +1,11 @@  - - - + - - + diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 4aec9be9..68c7a234 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -210,7 +210,7 @@ namespace WixToolset.Util case "Bundle": case "Fragment": case "Module": - case "Product": + case "Package": switch (element.Name.LocalName) { case "CloseApplication": -- cgit v1.2.3-55-g6feb