aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-04-07 22:08:46 -0700
committerRob Mensching <rob@firegiant.com>2021-04-07 22:11:05 -0700
commitb634486e6877f91ee8b88715ef282dde84e28b6e (patch)
tree618750f90204acf32f05b4bab5750ae8518d8893
parent26c0c0af9fbb3653730c4d32ca30b908ac3daf55 (diff)
downloadwix-b634486e6877f91ee8b88715ef282dde84e28b6e.tar.gz
wix-b634486e6877f91ee8b88715ef282dde84e28b6e.tar.bz2
wix-b634486e6877f91ee8b88715ef282dde84e28b6e.zip
Update dependencies
-rw-r--r--global.json2
-rw-r--r--src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs12
2 files changed, 4 insertions, 10 deletions
diff --git a/global.json b/global.json
index 10345833..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-0163" 3 "WixToolset.Sdk": "4.0.0-build-0206"
4 } 4 }
5} 5}
diff --git a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs b/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs
index 44820bdd..bd31e81f 100644
--- a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs
+++ b/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/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>