Update project for Package/SummaryInformation change (and others).
Bob Arnson committed
Oct 27, 2020 at 15:58 UTC
55c0f1c53f7ef89553733658a33f4f36b1731ad1
4 files changed
+7
-10
global.json
+1
-1
@@ -1,5 +1,5 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0157"
3
+ "WixToolset.Sdk": "4.0.0-build-0162"
4
}
5
}
src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
-1
@@ -2,7 +2,6 @@
2
3
namespace WixToolsetTest.Dependency
4
{
5
- using System.Linq;
5
using WixBuildTools.TestSupport;
6
using WixToolset.Core.TestPackage;
7
using WixToolset.Dependency;
src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs
+5
-6
@@ -1,16 +1,15 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3
- <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
4
- <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
1
+<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
+
4
5
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7
- <MediaTemplate />
6
+
7
8
<Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
9
<ComponentGroupRef Id="ProductComponents" />
10
</Feature>
11
13
- </Product>
12
+ </Package>
13
14
<Fragment>
15
<Directory Id="TARGETDIR" Name="SourceDir">
src/wixext/DependencyCompiler.cs
+1
-2
@@ -4,7 +4,6 @@ namespace WixToolset.Dependency
4
{
5
using System;
6
using System.Collections.Generic;
7
- using System.Globalization;
7
using System.Text;
8
using System.Xml.Linq;
9
using WixToolset.Data;
@@ -76,7 +75,7 @@ namespace WixToolset.Dependency
75
case "Bundle":
76
case "Fragment":
77
case "Module":
79
- case "Product":
78
+ case "Package":
79
switch (element.Name.LocalName)
80
{
81
case "Requires":