aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/TestData/UpdateBundleTests/BundleBv1
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-05-11 09:14:53 -0700
committerRob Mensching <rob@firegiant.com>2021-05-11 09:14:53 -0700
commitdc6022da6cdbb9d7ca54c4a36485ceead07feaaf (patch)
tree80dbfd39b48f80790f5c3c82ba4416b8cfdff78d /src/test/burn/TestData/UpdateBundleTests/BundleBv1
parentaaae65d07ce2a78592fc533701975cc576341a46 (diff)
parentd8e47230e094a506406a83eb78916abf2668b29c (diff)
downloadwix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.gz
wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.bz2
wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.zip
Merge Integration
Diffstat (limited to 'src/test/burn/TestData/UpdateBundleTests/BundleBv1')
-rw-r--r--src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs42
-rw-r--r--src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleB.props7
-rw-r--r--src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj18
-rw-r--r--src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wxs10
-rw-r--r--src/test/burn/TestData/UpdateBundleTests/BundleBv1/FeedBv1.0.xml32
-rw-r--r--src/test/burn/TestData/UpdateBundleTests/BundleBv1/FeedBv2.0.xml51
6 files changed, 160 insertions, 0 deletions
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs
new file mode 100644
index 00000000..906121f4
--- /dev/null
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs
@@ -0,0 +1,42 @@
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
3<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6
7<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
9 <!-- Update should be the only thing different from the template -->
10 <Update Location="$(var.WebServerBaseUrl)BundleB/feed" />
11
12 <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
13
14 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
15
16 <?ifdef SoftwareTag?>
17 <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" />
18 <?endif?>
19
20 <?ifndef BA?>
21 <!-- pulled in through the PackageGroupRef below -->
22 <?elseif $(var.BA) = "TestBAdnc"?>
23 <!-- pulled in through the PackageGroupRef below -->
24 <?elseif $(var.BA) = "hyperlinkLicense"?>
25 <BootstrapperApplication>
26 <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
27 </BootstrapperApplication>
28 <?else?>
29 <BootstrapperApplicationRef Id="$(var.BA)" />
30 <?endif?>
31
32 <Chain>
33 <?ifndef BA?>
34 <PackageGroupRef Id="TestBA" />
35 <?elseif $(var.BA) = "TestBAdnc"?>
36 <PackageGroupRef Id="TestBAdnc" />
37 <?endif?>
38
39 <PackageGroupRef Id="BundlePackages" />
40 </Chain>
41 </Bundle>
42</Wix>
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleB.props b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleB.props
new file mode 100644
index 00000000..8a275612
--- /dev/null
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleB.props
@@ -0,0 +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>
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{BF325BA5-5012-47C7-828C-577B6979CB28}</UpgradeCode>
6 </PropertyGroup>
7</Project>
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj
new file mode 100644
index 00000000..b2685e2e
--- /dev/null
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj
@@ -0,0 +1,18 @@
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="BundleB.props" />
4 <ItemGroup>
5 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
6 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
7 </ItemGroup>
8 <ItemGroup>
9 <Feeds Include="*.xml" />
10 </ItemGroup>
11 <ItemGroup>
12 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
13 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
14 </ItemGroup>
15 <Target Name="CopyFeeds" AfterTargets="AfterBuild">
16 <Copy SourceFiles="@(Feeds)" DestinationFolder="$(OutputPath)" />
17 </Target>
18</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wxs b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wxs
new file mode 100644
index 00000000..00d927ec
--- /dev/null
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wxs
@@ -0,0 +1,10 @@
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
3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <Fragment>
6 <PackageGroup Id="BundlePackages">
7 <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" />
8 </PackageGroup>
9 </Fragment>
10</Wix>
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/FeedBv1.0.xml b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/FeedBv1.0.xml
new file mode 100644
index 00000000..743548be
--- /dev/null
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/FeedBv1.0.xml
@@ -0,0 +1,32 @@
1<?xml version='1.0' ?>
2<!-- 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. -->
3
4
5<feed xmlns="http://www.w3.org/2005/Atom" xmlns:as="http://appsyndication.org/2006/appsyn">
6 <title type="text">BundleB v1.0</title>
7 <subtitle type="text">Bundle Subtitle.</subtitle>
8 <as:application type="application/exe">1116353B-7C6E-4C29-BFA1-D4A972CD421D</as:application>
9 <updated>2014-07-14T12:39:00.000Z</updated>
10 <id>http://localhost:9999/e2e/BundleB/feed</id>
11 <link rel="self" type="application/atom+xml" href="http://localhost:9999/e2e/BundleB/feed"/>
12 <generator version="0.1">manual build</generator>
13 <entry>
14 <title>Bundle v1.0</title>
15 <id>v1.0</id>
16 <author>
17 <name>Bundle_Author</name>
18 <uri>http://mycompany.com/software</uri>
19 <email>Bundle_Author@mycompany.com</email>
20 </author>
21 <link rel="alternate" href="http://www.mycompany.com/content/view/software"/>
22 <link rel="enclosure" href="http://localhost:9999/e2e/BundleB/1.0/BundleB.exe" length="0" type="application/octet-stream"/>
23 <content type="html">
24 &lt;p&gt;Change list:&lt;/p&gt;&lt;ul&gt;
25 &lt;li&gt;Initial release.&lt;/li&gt;
26 &lt;/ul&gt;
27 </content>
28 <as:upgrade version="1.0.0.0-preview" />
29 <as:version>1.0.0.0</as:version>
30 <updated>2014-07-14T12:39:00.000Z</updated>
31 </entry>
32</feed>
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/FeedBv2.0.xml b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/FeedBv2.0.xml
new file mode 100644
index 00000000..c8e3f6ea
--- /dev/null
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/FeedBv2.0.xml
@@ -0,0 +1,51 @@
1<?xml version='1.0' ?>
2<!-- 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. -->
3
4
5<feed xmlns="http://www.w3.org/2005/Atom" xmlns:as="http://appsyndication.org/2006/appsyn">
6 <title type="text">BundleB v2.0</title>
7 <subtitle type="text">Bundle Subtitle.</subtitle>
8 <as:application type="application/exe">1116353B-7C6E-4C29-BFA1-D4A972CD421D</as:application>
9 <updated>2014-07-14T12:39:00.000Z</updated>
10 <id>http://localhost:9999/e2e/BundleB/feed</id>
11 <link rel="self" type="application/atom+xml" href="http://localhost:9999/e2e/BundleB/feed"/>
12 <generator version="0.1">manual build</generator>
13 <entry>
14 <title>Bundle v2.0</title>
15 <id>v2.0</id>
16 <author>
17 <name>Bundle_Author</name>
18 <uri>http://mycompany.com/software</uri>
19 <email>Bundle_Author@mycompany.com</email>
20 </author>
21 <link rel="alternate" href="http://www.mycompany.com/content/view/software"/>
22 <link rel="enclosure" href="http://localhost:9999/e2e/BundleB/2.0/BundleB.exe" length="0" type="application/octet-stream"/>
23 <content type="html">
24 &lt;p&gt;Change list:&lt;/p&gt;&lt;ul&gt;
25 &lt;li&gt;Updated release.&lt;/li&gt;
26 &lt;/ul&gt;
27 </content>
28 <as:upgrade version="1.0" />
29 <as:version>2.0.0.0</as:version>
30 <updated>2014-11-10T12:39:00.000Z</updated>
31 </entry>
32 <entry>
33 <title>Bundle v1.0</title>
34 <id>v1.0</id>
35 <author>
36 <name>Bundle_Author</name>
37 <uri>http://mycompany.com/software</uri>
38 <email>Bundle_Author@mycompany.com</email>
39 </author>
40 <link rel="alternate" href="http://www.mycompany.com/content/view/software"/>
41 <link rel="enclosure" href="http://localhost:9999/e2e/BundleB/1.0/BundleB.exe" length="0" type="application/octet-stream"/>
42 <content type="html">
43 &lt;p&gt;Change list:&lt;/p&gt;&lt;ul&gt;
44 &lt;li&gt;Initial release.&lt;/li&gt;
45 &lt;/ul&gt;
46 </content>
47 <as:upgrade version="1.0.0.0-preview" />
48 <as:version>1.0.0.0</as:version>
49 <updated>2014-11-09T12:39:00.000Z</updated>
50 </entry>
51</feed>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-02-07 17:36:40 +0000