aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-10-27 15:58:15 -0400
committerBob Arnson <bob@firegiant.com>2020-10-27 16:00:49 -0400
commit55c0f1c53f7ef89553733658a33f4f36b1731ad1 (patch)
tree2c9ef71b01ead9e0847348eac759d5acf2deef4a
parente84996576e588d27a7b1c61423c1e10c929b8b1a (diff)
downloadwix-55c0f1c53f7ef89553733658a33f4f36b1731ad1.tar.gz
wix-55c0f1c53f7ef89553733658a33f4f36b1731ad1.tar.bz2
wix-55c0f1c53f7ef89553733658a33f4f36b1731ad1.zip
Update project for Package/SummaryInformation change (and others).
-rw-r--r--global.json2
-rw-r--r--src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs1
-rw-r--r--src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs11
-rw-r--r--src/wixext/DependencyCompiler.cs3
4 files changed, 7 insertions, 10 deletions
diff --git a/global.json b/global.json
index 4d9df50b..f94ab6df 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
1{ 1{
2 "msbuild-sdks": { 2 "msbuild-sdks": {
3 "WixToolset.Sdk": "4.0.0-build-0157" 3 "WixToolset.Sdk": "4.0.0-build-0162"
4 } 4 }
5} 5}
diff --git a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
index 67072e36..0f729534 100644
--- a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
@@ -2,7 +2,6 @@
2 2
3namespace WixToolsetTest.Dependency 3namespace WixToolsetTest.Dependency
4{ 4{
5 using System.Linq;
6 using WixBuildTools.TestSupport; 5 using WixBuildTools.TestSupport;
7 using WixToolset.Core.TestPackage; 6 using WixToolset.Core.TestPackage;
8 using WixToolset.Dependency; 7 using WixToolset.Dependency;
diff --git a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs
index 68ff98fd..44820bdd 100644
--- a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs
+++ b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs
@@ -1,16 +1,15 @@
1<?xml version="1.0" encoding="utf-8"?> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3 <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 3
4 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 5 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7 <MediaTemplate /> 6
8 7
9 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 8 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
10 <ComponentGroupRef Id="ProductComponents" /> 9 <ComponentGroupRef Id="ProductComponents" />
11 </Feature> 10 </Feature>
12 11
13 </Product> 12 </Package>
14 13
15 <Fragment> 14 <Fragment>
16 <Directory Id="TARGETDIR" Name="SourceDir"> 15 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/wixext/DependencyCompiler.cs b/src/wixext/DependencyCompiler.cs
index 4aaa373b..18bb89df 100644
--- a/src/wixext/DependencyCompiler.cs
+++ b/src/wixext/DependencyCompiler.cs
@@ -4,7 +4,6 @@ namespace WixToolset.Dependency
4{ 4{
5 using System; 5 using System;
6 using System.Collections.Generic; 6 using System.Collections.Generic;
7 using System.Globalization;
8 using System.Text; 7 using System.Text;
9 using System.Xml.Linq; 8 using System.Xml.Linq;
10 using WixToolset.Data; 9 using WixToolset.Data;
@@ -76,7 +75,7 @@ namespace WixToolset.Dependency
76 case "Bundle": 75 case "Bundle":
77 case "Fragment": 76 case "Fragment":
78 case "Module": 77 case "Module":
79 case "Product": 78 case "Package":
80 switch (element.Name.LocalName) 79 switch (element.Name.LocalName)
81 { 80 {
82 case "Requires": 81 case "Requires":