diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-20 15:18:48 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-20 15:18:48 -0600 |
| commit | c72a287548597d6ac23d00f2c2b821256940c35b (patch) | |
| tree | 6d1467c5571c0dec5ad65040397037f169599a00 /src | |
| parent | 61c33d4eafbc9c4a8f12003d46b5027e27beb175 (diff) | |
| download | wix-c72a287548597d6ac23d00f2c2b821256940c35b.tar.gz wix-c72a287548597d6ac23d00f2c2b821256940c35b.tar.bz2 wix-c72a287548597d6ac23d00f2c2b821256940c35b.zip | |
Update to fixed Bal.wixext and use wixstdba for one of the tests.
Diffstat (limited to 'src')
6 files changed, 10 insertions, 7 deletions
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi b/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi index b31be737..ef01c2e9 100644 --- a/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi +++ b/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi | |||
| @@ -4,14 +4,17 @@ | |||
| 4 | <?define Version = 1.0.0.0?> | 4 | <?define Version = 1.0.0.0?> |
| 5 | <?endif?> | 5 | <?endif?> |
| 6 | 6 | ||
| 7 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 7 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 8 | <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{90ED10D5-B187-4470-B498-05D80DAB729A}" Compressed="yes"> | 8 | <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{90ED10D5-B187-4470-B498-05D80DAB729A}" Compressed="yes"> |
| 9 | <Log Prefix="~$(var.TestGroupName)_BundleA" /> | 9 | <Log Prefix="~$(var.TestGroupName)_BundleA" /> |
| 10 | 10 | ||
| 11 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> | 11 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> |
| 12 | 12 | ||
| 13 | <BootstrapperApplication> | ||
| 14 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" /> | ||
| 15 | </BootstrapperApplication> | ||
| 16 | |||
| 13 | <Chain> | 17 | <Chain> |
| 14 | <PackageGroupRef Id="TestBA" /> | ||
| 15 | <PackageGroupRef Id="BundlePackages" /> | 18 | <PackageGroupRef Id="BundlePackages" /> |
| 16 | </Chain> | 19 | </Chain> |
| 17 | </Bundle> | 20 | </Bundle> |
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj index a819e928..57c221f2 100644 --- a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj +++ b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> | 11 | <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> |
| 12 | </ItemGroup> | 12 | </ItemGroup> |
| 13 | <ItemGroup> | 13 | <ItemGroup> |
| 14 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.75" /> | 14 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.76" /> |
| 15 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" /> | 15 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | </Project> \ No newline at end of file | 17 | </Project> \ No newline at end of file |
diff --git a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj index 0bdef393..04a9e858 100644 --- a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj +++ b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <ProjectReference Include="..\PackageD\PackageD.wixproj" /> | 12 | <ProjectReference Include="..\PackageD\PackageD.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.75" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.76" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | </Project> \ No newline at end of file | 18 | </Project> \ No newline at end of file |
diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj index 9718ff2d..8870b4f6 100644 --- a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj +++ b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> | 8 | <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> |
| 9 | </ItemGroup> | 9 | </ItemGroup> |
| 10 | <ItemGroup> | 10 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.75" /> | 11 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.76" /> |
| 12 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" /> | 12 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | </Project> \ No newline at end of file | 14 | </Project> \ No newline at end of file |
diff --git a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj index ef62c033..41bd5f69 100644 --- a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj +++ b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> | 12 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.75" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.76" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | </Project> \ No newline at end of file | 18 | </Project> \ No newline at end of file |
diff --git a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj index 18713d5a..beb4da77 100644 --- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj +++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj | |||
| @@ -12,6 +12,6 @@ | |||
| 12 | <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" /> | 12 | <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.75" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.76" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | </Project> \ No newline at end of file | 17 | </Project> \ No newline at end of file |