Update project for Package/SummaryInformation change (and others).

wixtoolset · Oct 27, 2020 · 55c0f1c · 55c0f1c
1 parent e849965
commit 55c0f1c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git 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
@@ -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
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Product Id="*" 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" />
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
+
 
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
+
 
     <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
       <ComponentGroupRef Id="ProductComponents" />
     </Feature>
 
-  </Product>
+  </Package>
 
   <Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">

diff --git 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":