From 55c0f1c53f7ef89553733658a33f4f36b1731ad1 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Tue, 27 Oct 2020 15:58:15 -0400 Subject: [PATCH] Update project for Package/SummaryInformation change (and others). --- global.json | 2 +- .../DependencyExtensionFixture.cs | 1 - .../TestData/UsingProvides/Package.wxs | 11 +++++------ src/wixext/DependencyCompiler.cs | 3 +-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/global.json b/global.json index 4d9df50..f94ab6d 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0157" + "WixToolset.Sdk": "4.0.0-build-0162" } } diff --git a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs index 67072e3..0f72953 100644 --- a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs +++ b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs @@ -2,7 +2,6 @@ namespace WixToolsetTest.Dependency { - using System.Linq; using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using WixToolset.Dependency; diff --git a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs index 68ff98f..44820bd 100644 --- a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs +++ b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs @@ -1,16 +1,15 @@ - - - - + + + - + - + diff --git a/src/wixext/DependencyCompiler.cs b/src/wixext/DependencyCompiler.cs index 4aaa373..18bb89d 100644 --- a/src/wixext/DependencyCompiler.cs +++ b/src/wixext/DependencyCompiler.cs @@ -4,7 +4,6 @@ namespace WixToolset.Dependency { using System; using System.Collections.Generic; - using System.Globalization; using System.Text; using System.Xml.Linq; using WixToolset.Data; @@ -76,7 +75,7 @@ public override void ParseElement(Intermediate intermediate, IntermediateSection case "Bundle": case "Fragment": case "Module": - case "Product": + case "Package": switch (element.Name.LocalName) { case "Requires":