From 8cf0427984a88b0b3ddfb2061e5be721afffe82e Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 22 Apr 2021 17:19:56 -0700
Subject: Move Core into wix

---
 .../TestData/Assembly/Package.en-us.wxl            |  11 ---
 .../TestData/Assembly/Package.wxs                  |  17 -----
 .../TestData/Assembly/PackageComponents.wxs        |  10 ---
 .../TestData/Assembly/Win32Assembly.wxs            |  13 ----
 .../TestData/Assembly/data/candle.exe              | Bin 28672 -> 0 bytes
 .../TestData/Assembly/data/test.manifest           |  76 ---------------------
 6 files changed, 127 deletions(-)
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/PackageComponents.wxs
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/candle.exe
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/test.manifest

(limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/Assembly')

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
deleted file mode 100644
index c345305d..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
+++ /dev/null
@@ -1,17 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="AssemblyMsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="AssemblyMsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/PackageComponents.wxs
deleted file mode 100644
index e0c84c63..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="candle.exe" Assembly=".net" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs
deleted file mode 100644
index 45cc7114..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Directory="INSTALLFOLDER">
-                <File Id="test.txt" Source="test.txt" Assembly="win32" AssemblyManifest="test.dll.manifest" />
-            </Component>
-            <Component Id="test.dll.manifest" Directory="INSTALLFOLDER">
-                <File Id="test.dll.manifest" Source="test.manifest" Name="test.dll.manifest"></File>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/candle.exe b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/candle.exe
deleted file mode 100644
index 18129b73..00000000
Binary files a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/candle.exe and /dev/null differ
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/test.manifest b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/test.manifest
deleted file mode 100644
index 0da1f6d0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/test.manifest
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-             If you want to change the Windows User Account Control level replace the 
-             requestedExecutionLevel node with one of the following.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
-            Remove this element if your application requires this virtualization for backwards
-            compatibility.
-        -->
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- A list of the Windows versions that this application has been tested on
-           and is designed to work with. Uncomment the appropriate elements
-           and Windows will automatically select the most compatible environment. -->
-
-      <!-- Windows Vista -->
-      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
-
-      <!-- Windows 7 -->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
-
-      <!-- Windows 8 -->
-      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
-
-      <!-- Windows 8.1 -->
-      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
-
-      <!-- Windows 10 -->
-      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
-
-    </application>
-  </compatibility>
-
-  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
-       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
-       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
-       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
-  <!--
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-    </windowsSettings>
-  </application>
-  -->
-
-  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
-  <!--
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="*"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
-    </dependentAssembly>
-  </dependency>
-  -->
-
-</assembly>
-- 
cgit v1.2.3-55-g6feb