diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-04-07 22:48:52 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-04-07 22:50:42 -0700 |
| commit | b02afce2100c976351073f1a8cb14fe1ab61cb1d (patch) | |
| tree | 70136b89340ec761cb65159b18b63c079987f47c | |
| parent | cb890fc1ecd6d6557607e7b34f251714481670f1 (diff) | |
| download | wix-b02afce2100c976351073f1a8cb14fe1ab61cb1d.tar.gz wix-b02afce2100c976351073f1a8cb14fe1ab61cb1d.tar.bz2 wix-b02afce2100c976351073f1a8cb14fe1ab61cb1d.zip | |
Update dependencies
| -rw-r--r-- | global.json | 2 | ||||
| -rw-r--r-- | src/ca/msmqca.vcxproj | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs | 12 |
3 files changed, 5 insertions, 11 deletions
diff --git a/global.json b/global.json index 77a81322..fc26eb6e 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-0170" | 3 | "WixToolset.Sdk": "4.0.0-build-0206" |
| 4 | } | 4 | } |
| 5 | } | 5 | } |
diff --git a/src/ca/msmqca.vcxproj b/src/ca/msmqca.vcxproj index cd7a419c..c4cb3323 100644 --- a/src/ca/msmqca.vcxproj +++ b/src/ca/msmqca.vcxproj | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | <ProjectGuid>{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}</ProjectGuid> | 20 | <ProjectGuid>{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}</ProjectGuid> |
| 21 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 21 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 22 | <TargetName>msmqca</TargetName> | 22 | <TargetName>msmqca</TargetName> |
| 23 | <PlatformToolset>v141</PlatformToolset> | 23 | <PlatformToolset>v142</PlatformToolset> |
| 24 | <CharacterSet>Unicode</CharacterSet> | 24 | <CharacterSet>Unicode</CharacterSet> |
| 25 | <ProjectModuleDefinitionFile>msmqca.def</ProjectModuleDefinitionFile> | 25 | <ProjectModuleDefinitionFile>msmqca.def</ProjectModuleDefinitionFile> |
| 26 | <Description>WiX Toolset MSMQ CustomAction</Description> | 26 | <Description>WiX Toolset MSMQ CustomAction</Description> |
diff --git a/src/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs b/src/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs index 44820bdd..bd31e81f 100644 --- a/src/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs +++ b/src/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs | |||
| @@ -1,21 +1,15 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 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"> | 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)" /> | 3 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> |
| 6 | |||
| 7 | 4 | ||
| 8 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> | 5 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> |
| 9 | <ComponentGroupRef Id="ProductComponents" /> | 6 | <ComponentGroupRef Id="ProductComponents" /> |
| 10 | </Feature> | 7 | </Feature> |
| 11 | |||
| 12 | </Package> | 8 | </Package> |
| 13 | 9 | ||
| 14 | <Fragment> | 10 | <Fragment> |
| 15 | <Directory Id="TARGETDIR" Name="SourceDir"> | 11 | <StandardDirectory Id="ProgramFilesFolder"> |
| 16 | <Directory Id="ProgramFilesFolder"> | 12 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
| 17 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 13 | </StandardDirectory> |
| 18 | </Directory> | ||
| 19 | </Directory> | ||
| 20 | </Fragment> | 14 | </Fragment> |
| 21 | </Wix> | 15 | </Wix> |