diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-02-27 07:50:33 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-02-27 15:42:33 -0800 |
| commit | 3fae69ccb71d99c79adba6855ba7d6402216085d (patch) | |
| tree | 538dfa5877fc26c9f8eb2953e9743fe98adeec13 /src/test/WixToolsetTest.Dependency/TestData/UsingProvides | |
| parent | f217241ff291dc53abefe3ba551d16b120d5a7aa (diff) | |
| download | wix-3fae69ccb71d99c79adba6855ba7d6402216085d.tar.gz wix-3fae69ccb71d99c79adba6855ba7d6402216085d.tar.bz2 wix-3fae69ccb71d99c79adba6855ba7d6402216085d.zip | |
Integrate Dependency into Core
Only the custom action handling is left in Dependency.wixext
Partially fixes wixtoolset/issues#5945
Diffstat (limited to 'src/test/WixToolsetTest.Dependency/TestData/UsingProvides')
3 files changed, 9 insertions, 27 deletions
diff --git a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs index 44820bdd..b15ae8da 100644 --- a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs +++ b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs | |||
| @@ -1,21 +1,16 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" |
| 2 | xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency"> | ||
| 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200"> | 3 | <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)" /> | 4 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> |
| 6 | |||
| 7 | 5 | ||
| 6 | <Directory Id="INSTALLFOLDER" Name="ProgramFilesFolder:\MsiPackage" /> | ||
| 7 | |||
| 8 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> | 8 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> |
| 9 | <ComponentGroupRef Id="ProductComponents" /> | 9 | <Component Directory="INSTALLFOLDER"> |
| 10 | <File Name="example.txt" Source="Package.wxs" /> | ||
| 11 | <Provides Key="UsingProvides" dep:Check="yes" /> | ||
| 12 | </Component> | ||
| 10 | </Feature> | 13 | </Feature> |
| 11 | |||
| 12 | </Package> | ||
| 13 | 14 | ||
| 14 | <Fragment> | 15 | </Package> |
| 15 | <Directory Id="TARGETDIR" Name="SourceDir"> | ||
| 16 | <Directory Id="ProgramFilesFolder"> | ||
| 17 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | ||
| 18 | </Directory> | ||
| 19 | </Directory> | ||
| 20 | </Fragment> | ||
| 21 | </Wix> | 16 | </Wix> |
diff --git a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/PackageComponents.wxs b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/PackageComponents.wxs deleted file mode 100644 index e241fb17..00000000 --- a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/PackageComponents.wxs +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | ||
| 3 | xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency"> | ||
| 4 | <Fragment> | ||
| 5 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | ||
| 6 | <Component> | ||
| 7 | <File Source="example.txt" /> | ||
| 8 | <dep:Provides Key="UsingProvides" /> | ||
| 9 | </Component> | ||
| 10 | </ComponentGroup> | ||
| 11 | </Fragment> | ||
| 12 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/example.txt b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/example.txt deleted file mode 100644 index 1b4ffe8a..00000000 --- a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/example.txt +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | This is example.txt. \ No newline at end of file | ||