diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-10-27 16:13:06 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-10-27 16:16:37 -0400 |
| commit | 9fc7ed95c8fd9337c10bb44dc42786b9fe0121a2 (patch) | |
| tree | 27afc75b94dfe260a464d58eeb751279f2efa10d | |
| parent | d70e9e5ab5866c8e35b696fd169c9b62c6f5ee74 (diff) | |
| download | wix-9fc7ed95c8fd9337c10bb44dc42786b9fe0121a2.tar.gz wix-9fc7ed95c8fd9337c10bb44dc42786b9fe0121a2.tar.bz2 wix-9fc7ed95c8fd9337c10bb44dc42786b9fe0121a2.zip | |
Update project for Package/SummaryInformation change (and others).
| -rw-r--r-- | global.json | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Sql/TestData/UsingSql/Package.wxs | 11 | ||||
| -rw-r--r-- | src/wixext/SqlCompiler.cs | 3 |
3 files changed, 7 insertions, 9 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.Sql/TestData/UsingSql/Package.wxs b/src/test/WixToolsetTest.Sql/TestData/UsingSql/Package.wxs index 68ff98fd..44820bdd 100644 --- a/src/test/WixToolsetTest.Sql/TestData/UsingSql/Package.wxs +++ b/src/test/WixToolsetTest.Sql/TestData/UsingSql/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/SqlCompiler.cs b/src/wixext/SqlCompiler.cs index 162306b8..4618eaba 100644 --- a/src/wixext/SqlCompiler.cs +++ b/src/wixext/SqlCompiler.cs | |||
| @@ -48,7 +48,6 @@ namespace WixToolset.Sql | |||
| 48 | { | 48 | { |
| 49 | case "Component": | 49 | case "Component": |
| 50 | var componentId = context["ComponentId"]; | 50 | var componentId = context["ComponentId"]; |
| 51 | var directoryId = context["DirectoryId"]; | ||
| 52 | 51 | ||
| 53 | switch (element.Name.LocalName) | 52 | switch (element.Name.LocalName) |
| 54 | { | 53 | { |
| @@ -68,7 +67,7 @@ namespace WixToolset.Sql | |||
| 68 | break; | 67 | break; |
| 69 | case "Fragment": | 68 | case "Fragment": |
| 70 | case "Module": | 69 | case "Module": |
| 71 | case "Product": | 70 | case "Package": |
| 72 | switch (element.Name.LocalName) | 71 | switch (element.Name.LocalName) |
| 73 | { | 72 | { |
| 74 | case "SqlDatabase": | 73 | case "SqlDatabase": |