From 71802ec02bae5f882ca3cd894abc202d63da9440 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 22 Jul 2020 18:12:23 +1000 Subject: Fix ManagedHost tests by using Heat to harvest the BA payloads. Also, build all example bundles in the new examples.proj instead of the tests to speed up the solution build. --- src/test/examples/Directory.Build.props | 6 +++ src/test/examples/Directory.Build.targets | 6 +++ .../EarliestCoreBundleFDD.wixproj | 2 + .../FrameworkDependentBundle.wxs | 17 ++++++++ .../EarliestCoreBundleSCD.wixproj | 10 +++++ .../EarliestCoreBundleSCD/SelfContainedBundle.wxs | 13 ++++++ src/test/examples/EarliestCoreBundleSCD/ba.xslt | 20 +++++++++ .../EarliestCoreBundleTrimmedSCD.wixproj | 10 +++++ .../TrimmedSelfContainedBundle.wxs | 13 ++++++ .../examples/EarliestCoreBundleTrimmedSCD/ba.xslt | 20 +++++++++ src/test/examples/FullFramework2Bundle/Bundle.wxs | 15 +++++++ .../FullFramework2Bundle.wixproj | 2 + src/test/examples/FullFramework4Bundle/Bundle.wxs | 15 +++++++ .../FullFramework4Bundle.wixproj | 2 + .../FrameworkDependentBundle.wxs | 17 ++++++++ .../LatestCoreBundleFDD.wixproj | 2 + .../LatestCoreBundleSCD.wixproj | 10 +++++ .../LatestCoreBundleSCD/SelfContainedBundle.wxs | 13 ++++++ src/test/examples/LatestCoreBundleSCD/ba.xslt | 20 +++++++++ .../LatestCoreBundleTrimmedSCD.wixproj | 10 +++++ .../TrimmedSelfContainedBundle.wxs | 13 ++++++ .../examples/LatestCoreBundleTrimmedSCD/ba.xslt | 20 +++++++++ .../WPFCoreBundleFDD/FrameworkDependentBundle.wxs | 17 ++++++++ .../WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj | 2 + src/test/examples/Wix.Build.props | 10 +++++ src/test/examples/Wix.Build.targets | 8 ++++ src/test/examples/examples.proj | 50 ++++++++++++++++++++++ 27 files changed, 343 insertions(+) create mode 100644 src/test/examples/Directory.Build.props create mode 100644 src/test/examples/Directory.Build.targets create mode 100644 src/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj create mode 100644 src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs create mode 100644 src/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj create mode 100644 src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs create mode 100644 src/test/examples/EarliestCoreBundleSCD/ba.xslt create mode 100644 src/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj create mode 100644 src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs create mode 100644 src/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt create mode 100644 src/test/examples/FullFramework2Bundle/Bundle.wxs create mode 100644 src/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj create mode 100644 src/test/examples/FullFramework4Bundle/Bundle.wxs create mode 100644 src/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj create mode 100644 src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs create mode 100644 src/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj create mode 100644 src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj create mode 100644 src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs create mode 100644 src/test/examples/LatestCoreBundleSCD/ba.xslt create mode 100644 src/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj create mode 100644 src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs create mode 100644 src/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt create mode 100644 src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs create mode 100644 src/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj create mode 100644 src/test/examples/Wix.Build.props create mode 100644 src/test/examples/Wix.Build.targets create mode 100644 src/test/examples/examples.proj (limited to 'src/test/examples') diff --git a/src/test/examples/Directory.Build.props b/src/test/examples/Directory.Build.props new file mode 100644 index 00000000..3d5870a5 --- /dev/null +++ b/src/test/examples/Directory.Build.props @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/test/examples/Directory.Build.targets b/src/test/examples/Directory.Build.targets new file mode 100644 index 00000000..6dcf402b --- /dev/null +++ b/src/test/examples/Directory.Build.targets @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj b/src/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs new file mode 100644 index 00000000..5cec494d --- /dev/null +++ b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/src/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj b/src/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj new file mode 100644 index 00000000..ebeebff2 --- /dev/null +++ b/src/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj @@ -0,0 +1,10 @@ + + + + + + publish.Example.EarliestCoreMBA.scd + ba.xslt + + + diff --git a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs new file mode 100644 index 00000000..d951ffc6 --- /dev/null +++ b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/test/examples/EarliestCoreBundleSCD/ba.xslt b/src/test/examples/EarliestCoreBundleSCD/ba.xslt new file mode 100644 index 00000000..06b84256 --- /dev/null +++ b/src/test/examples/EarliestCoreBundleSCD/ba.xslt @@ -0,0 +1,20 @@ + + + + + + + + + + + + + yes + + + + diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj b/src/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj new file mode 100644 index 00000000..a6b56460 --- /dev/null +++ b/src/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj @@ -0,0 +1,10 @@ + + + + + + publish.Example.EarliestCoreMBA.trimmedscd + ba.xslt + + + diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs new file mode 100644 index 00000000..816524ed --- /dev/null +++ b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt b/src/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt new file mode 100644 index 00000000..06b84256 --- /dev/null +++ b/src/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt @@ -0,0 +1,20 @@ + + + + + + + + + + + + + yes + + + + diff --git a/src/test/examples/FullFramework2Bundle/Bundle.wxs b/src/test/examples/FullFramework2Bundle/Bundle.wxs new file mode 100644 index 00000000..c95631db --- /dev/null +++ b/src/test/examples/FullFramework2Bundle/Bundle.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/src/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj b/src/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/test/examples/FullFramework4Bundle/Bundle.wxs b/src/test/examples/FullFramework4Bundle/Bundle.wxs new file mode 100644 index 00000000..be0be131 --- /dev/null +++ b/src/test/examples/FullFramework4Bundle/Bundle.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/src/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj b/src/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs new file mode 100644 index 00000000..22fb3d8b --- /dev/null +++ b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/src/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj b/src/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj b/src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj new file mode 100644 index 00000000..30a860ab --- /dev/null +++ b/src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj @@ -0,0 +1,10 @@ + + + + + + publish.Example.LatestCoreMBA.scd + ba.xslt + + + diff --git a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs new file mode 100644 index 00000000..4b0fe38a --- /dev/null +++ b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/test/examples/LatestCoreBundleSCD/ba.xslt b/src/test/examples/LatestCoreBundleSCD/ba.xslt new file mode 100644 index 00000000..acc7474c --- /dev/null +++ b/src/test/examples/LatestCoreBundleSCD/ba.xslt @@ -0,0 +1,20 @@ + + + + + + + + + + + + + yes + + + + diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj b/src/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj new file mode 100644 index 00000000..5ce89b64 --- /dev/null +++ b/src/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj @@ -0,0 +1,10 @@ + + + + + + publish.Example.LatestCoreMBA.trimmedscd + ba.xslt + + + diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs new file mode 100644 index 00000000..eee87933 --- /dev/null +++ b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt b/src/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt new file mode 100644 index 00000000..acc7474c --- /dev/null +++ b/src/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt @@ -0,0 +1,20 @@ + + + + + + + + + + + + + yes + + + + diff --git a/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs new file mode 100644 index 00000000..ecc5e8c1 --- /dev/null +++ b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/src/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj b/src/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/test/examples/Wix.Build.props b/src/test/examples/Wix.Build.props new file mode 100644 index 00000000..aad94bb6 --- /dev/null +++ b/src/test/examples/Wix.Build.props @@ -0,0 +1,10 @@ + + + + + Bundle + .exe + -generate payloadgroup + $(OutputPath)examples\ + + diff --git a/src/test/examples/Wix.Build.targets b/src/test/examples/Wix.Build.targets new file mode 100644 index 00000000..7e6fe9f2 --- /dev/null +++ b/src/test/examples/Wix.Build.targets @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/test/examples/examples.proj b/src/test/examples/examples.proj new file mode 100644 index 00000000..08cb7511 --- /dev/null +++ b/src/test/examples/examples.proj @@ -0,0 +1,50 @@ + + + + + + + + + EarliestCoreMBA\Example.EarliestCoreMBA.csproj + FullFramework2MBA\Example.FullFramework2MBA.csproj + FullFramework4MBA\Example.FullFramework4MBA.csproj + LatestCoreMBA\Example.LatestCoreMBA.csproj + WPFCoreMBA\Example.WPFCoreMBA.csproj + $(OutputPath)examples\publish\ + + + + + $(MBAPublishPath)Example.EarliestCoreMBA + + + $(MBAPublishPath)Example.LatestCoreMBA + + + $(MBAPublishPath)Example.WPFCoreMBA + true + true + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb