From ee41358bb583619ef4fe6707958dc3c6c62cd13f Mon Sep 17 00:00:00 2001
From: Bevan Weiss <bevan.weiss@gmail.com>
Date: Sun, 28 Jul 2024 00:12:25 +1000
Subject: Fix up COM+ to be back in working order under Wix4+ Table names
 updated for Wix4 prefix. Custom action names similarly updated. Table names
 Wix4ComPlusUserInApplicationRole, Wix4ComPlusGroupInApplicationRole and
 Wix4ComPlusApplicationRoleProperty had to be shortened to fit within MSI 31
 character table name limit. Migrated from fixed GUID for RegistrationHelper
 to use CLSIDFromProgID in an attempt to fix behaviour under .NET 4+ DLLs.
 Added setting of Partition enable if a Partition is configured in authoring,
 new Windows config has Partitions disabled by default, and they don't work at
 all under Windows workstation (non-server) versions.

Added a new Runtime condition for `RequireWindowsServer` which will skip
execution of Runtime test on workstation/desktop OSes, since COM+ Partitions
only work correctly under Windows Server.

Quite a lot of basic typos fixed also.

Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>
---
 .../InstallUninstallNET3WithoutPartitions.wixproj  | 15 ++++++++++++++
 .../product.wxs                                    | 24 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/InstallUninstallNET3WithoutPartitions.wixproj
 create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/product.wxs

(limited to 'src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions')

diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/InstallUninstallNET3WithoutPartitions.wixproj b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/InstallUninstallNET3WithoutPartitions.wixproj
new file mode 100644
index 00000000..19382c83
--- /dev/null
+++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/InstallUninstallNET3WithoutPartitions.wixproj
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <UpgradeCode>{A3E0B539-63F9-4B43-9E34-F33AE1C6E06D}</UpgradeCode>
+    <ProductComponentsRef>true</ProductComponentsRef>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Util.wixext" />
+    <PackageReference Include="WixToolset.ComPlus.wixext" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/product.wxs b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/product.wxs
new file mode 100644
index 00000000..129669cc
--- /dev/null
+++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/product.wxs
@@ -0,0 +1,24 @@
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"
+     xmlns:complus="http://wixtoolset.org/schemas/v4/wxs/complus">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents">
+            <ComponentRef Id="Component1" />
+        </ComponentGroup>
+    </Fragment>
+
+    <Fragment>
+        <Component Id="Component1" Guid="09624A9A-4BBC-4126-BBF9-0713C5217DB1" Directory="INSTALLFOLDER">
+            <File Id="AssemblyFileNET" Source="../Components/TestComponentNET3.dll" KeyPath="yes" />
+            <File Id="TlbFileNET" Source="../Components/TestComponentNET3.tlb" />
+                <complus:ComPlusApplication Id="APPLICATION" Name="ComPlus .NET 3 Application" Description="ComPlus Application" >
+                    <complus:ComPlusAssembly Id="ASSEMBLY_NET" Type=".net" DllPath="[#AssemblyFileNET]" TlbPath="[#TlbFileNET]" >
+                        <complus:ComPlusComponent Id="MyComNET3" CLSID="17F82C39-5433-493A-A396-36072C645B80" />
+                    </complus:ComPlusAssembly>
+                </complus:ComPlusApplication>
+        </Component>
+    </Fragment>
+</Wix>
-- 
cgit v1.2.3-55-g6feb