diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-10-27 16:01:25 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-10-27 16:04:32 -0400 |
| commit | e6c98d58a9044a74ba6590a9a04ad42881db12a4 (patch) | |
| tree | 96f96d0885e8f8b5573ed34a3f8bff662e45c11d | |
| parent | 2d71bd9f4379a1605347581c7cdd271315cd94f7 (diff) | |
| download | wix-e6c98d58a9044a74ba6590a9a04ad42881db12a4.tar.gz wix-e6c98d58a9044a74ba6590a9a04ad42881db12a4.tar.bz2 wix-e6c98d58a9044a74ba6590a9a04ad42881db12a4.zip | |
Update project for Package/SummaryInformation change (and others).
| -rw-r--r-- | global.json | 2 | ||||
| -rw-r--r-- | src/ca/directxca.vcxproj | 8 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs | 11 | ||||
| -rw-r--r-- | src/wixlib/DirectXExtension.wxs | 2 | ||||
| -rw-r--r-- | src/wixlib/caerr.wxi | 2 |
5 files changed, 8 insertions, 17 deletions
diff --git a/global.json b/global.json index 7a995d0a..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-0143" | 3 | "WixToolset.Sdk": "4.0.0-build-0162" |
| 4 | } | 4 | } |
| 5 | } | 5 | } |
diff --git a/src/ca/directxca.vcxproj b/src/ca/directxca.vcxproj index a9d0c168..e772009a 100644 --- a/src/ca/directxca.vcxproj +++ b/src/ca/directxca.vcxproj | |||
| @@ -21,14 +21,6 @@ | |||
| 21 | <Configuration>Release</Configuration> | 21 | <Configuration>Release</Configuration> |
| 22 | <Platform>x64</Platform> | 22 | <Platform>x64</Platform> |
| 23 | </ProjectConfiguration> | 23 | </ProjectConfiguration> |
| 24 | <ProjectConfiguration Include="Debug|ARM"> | ||
| 25 | <Configuration>Debug</Configuration> | ||
| 26 | <Platform>ARM</Platform> | ||
| 27 | </ProjectConfiguration> | ||
| 28 | <ProjectConfiguration Include="Release|ARM"> | ||
| 29 | <Configuration>Release</Configuration> | ||
| 30 | <Platform>ARM</Platform> | ||
| 31 | </ProjectConfiguration> | ||
| 32 | <ProjectConfiguration Include="Debug|ARM64"> | 24 | <ProjectConfiguration Include="Debug|ARM64"> |
| 33 | <Configuration>Debug</Configuration> | 25 | <Configuration>Debug</Configuration> |
| 34 | <Platform>ARM64</Platform> | 26 | <Platform>ARM64</Platform> |
diff --git a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs b/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs index 68ff98fd..44820bdd 100644 --- a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs +++ b/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/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/wixlib/DirectXExtension.wxs b/src/wixlib/DirectXExtension.wxs index 2e7ff31a..b83dc98d 100644 --- a/src/wixlib/DirectXExtension.wxs +++ b/src/wixlib/DirectXExtension.wxs | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | </Fragment> | 10 | </Fragment> |
| 11 | 11 | ||
| 12 | <Fragment> | 12 | <Fragment> |
| 13 | <CustomAction Id="WixQueryDirectXCaps" BinaryKey="DirectXCA" DllEntry="WixQueryDirectXCaps" Return="ignore" /> | 13 | <CustomAction Id="WixQueryDirectXCaps" DllEntry="WixQueryDirectXCaps" Return="ignore" BinaryRef="DirectXCA" /> |
| 14 | 14 | ||
| 15 | <InstallUISequence> | 15 | <InstallUISequence> |
| 16 | <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes" Condition="VersionNT > 400" /> | 16 | <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes" Condition="VersionNT > 400" /> |
diff --git a/src/wixlib/caerr.wxi b/src/wixlib/caerr.wxi index 141942f2..ff7ec121 100644 --- a/src/wixlib/caerr.wxi +++ b/src/wixlib/caerr.wxi | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <Include> | 1 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 2 | <?define msierrSecureObjectsFailedCreateSD = 25520?> | 2 | <?define msierrSecureObjectsFailedCreateSD = 25520?> |
| 3 | <?define msierrSecureObjectsFailedSet = 25521?> | 3 | <?define msierrSecureObjectsFailedSet = 25521?> |
| 4 | <?define msierrSecureObjectsUnknownType = 25522?> | 4 | <?define msierrSecureObjectsUnknownType = 25522?> |