Don't embed cabs to match test in old repo.
Sean Hall committed
Dec 31, 2020 at 18:31 UTC
543a3f9a87204a32c9ded3f9f519ad6d42107ab7
7 files changed
+12
-4
src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj
-2
@@ -5,13 +5,11 @@
5
<SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
6
</PropertyGroup>
7
<ItemGroup>
8
- <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
8
<ProjectReference Include="..\PackageA\PackageA.wixproj" />
9
<ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
10
<ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" />
11
</ItemGroup>
12
<ItemGroup>
13
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
15
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" />
14
</ItemGroup>
15
</Project>
\ No newline at end of file
src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj
-2
@@ -6,13 +6,11 @@
6
<Version>2.0.0.0</Version>
7
</PropertyGroup>
8
<ItemGroup>
9
- <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
9
<ProjectReference Include="..\PackageBv2\PackageBv2.wixproj" />
10
<ProjectReference Include="..\PackageCv2\PackageCv2.wixproj" />
11
<ProjectReference Include="..\PackageD\PackageD.wixproj" />
12
</ItemGroup>
13
<ItemGroup>
14
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
16
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" />
15
</ItemGroup>
16
</Project>
\ No newline at end of file
src/TestData/MsiTransaction/PackageA/PackageA.wixproj
+1
@@ -1,6 +1,7 @@
1
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
<Project Sdk="WixToolset.Sdk">
3
<PropertyGroup>
4
+ <CabPrefix>a</CabPrefix>
5
<UpgradeCode>{7772FCDF-5FDB-497D-B5DF-C6D17D667976}</UpgradeCode>
6
</PropertyGroup>
7
<ItemGroup>
src/TestData/MsiTransaction/PackageBv1/PackageBv1.wixproj
+3
@@ -1,4 +1,7 @@
1
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
<Project Sdk="WixToolset.Sdk">
3
<Import Project="PackageB.props" />
4
+ <PropertyGroup>
5
+ <CabPrefix>bv1</CabPrefix>
6
+ </PropertyGroup>
7
</Project>
\ No newline at end of file
src/TestData/MsiTransaction/PackageCv1/PackageCv1.wixproj
+3
@@ -1,4 +1,7 @@
1
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
<Project Sdk="WixToolset.Sdk">
3
<Import Project="PackageC.props" />
4
+ <PropertyGroup>
5
+ <CabPrefix>cv1</CabPrefix>
6
+ </PropertyGroup>
7
</Project>
\ No newline at end of file
src/TestData/Templates/Package.wxs
+4
@@ -9,7 +9,11 @@
9
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
10
<Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
11
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
12
+ <?ifndef CabPrefix?>
13
<MediaTemplate EmbedCab="yes" />
14
+ <?else?>
15
+ <MediaTemplate CabinetTemplate="{0}$(var.CabPrefix).cab" />
16
+ <?endif?>
17
18
<Property Id="MsiLogging" Value="voicewarmup" />
19
<PropertyRef Id="TestVersion" />
src/Wix.Build.targets
+1
@@ -4,6 +4,7 @@
4
<PropertyGroup>
5
<PackageName Condition=" '$(PackageName)' == '' ">$(MSBuildProjectName)</PackageName>
6
<DefineConstants>TestGroupName=$(TestGroupName);PackageName=$(PackageName);$(DefineConstants)</DefineConstants>
7
+ <DefineConstants Condition=" '$(CabPrefix)' != '' ">CabPrefix=$(CabPrefix);$(DefineConstants)</DefineConstants>
8
<DefineConstants Condition=" '$(UpgradeCode)' != '' ">UpgradeCode=$(UpgradeCode);$(DefineConstants)</DefineConstants>
9
<DefineConstants Condition=" '$(Version)' != '' ">Version=$(Version);$(DefineConstants)</DefineConstants>
10
</PropertyGroup>