From f33b26a3640011cac36c0a657838ed8760a0928b Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Tue, 27 Oct 2020 17:56:17 -0400
Subject: Update project for Package/SummaryInformation change.

---
 .../TestData/UsingDriver/Package.wxs               | 10 +++-------
 src/wixext/DifxAppCompiler.cs                      |  4 ----
 src/wixlib/DifxAppExtension_Platform.wxi           | 23 +++++++++++-----------
 3 files changed, 14 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs b/src/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs
index cdc323ec..082ac4cc 100644
--- a/src/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs
+++ b/src/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs
@@ -1,15 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
-
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
 
     <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
       <ComponentGroupRef Id="ProductComponents" />
     </Feature>
-  </Product>
+  </Package>
 
   <Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/wixext/DifxAppCompiler.cs b/src/wixext/DifxAppCompiler.cs
index e3687a49..e056988f 100644
--- a/src/wixext/DifxAppCompiler.cs
+++ b/src/wixext/DifxAppCompiler.cs
@@ -143,10 +143,6 @@ namespace WixToolset.DifxApp
                     case Platform.X64:
                         this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MsiProcessDrivers_x64");
                         break;
-                    case Platform.IA64:
-                    case Platform.ARM:
-                        this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), node.Name.LocalName));
-                        break;
                 }
 
                 var symbol = section.AddSymbol(new MsiDriverPackagesSymbol(sourceLineNumbers)
diff --git a/src/wixlib/DifxAppExtension_Platform.wxi b/src/wixlib/DifxAppExtension_Platform.wxi
index 7583f7ea..b8d613c9 100644
--- a/src/wixlib/DifxAppExtension_Platform.wxi
+++ b/src/wixlib/DifxAppExtension_Platform.wxi
@@ -1,23 +1,22 @@
-<?xml version='1.0'?>
-<!-- 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. -->
+<!-- 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. -->
 
 
-<Include xmlns='http://wixtoolset.org/schemas/v4/wxs'>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
    <?include caSuffix.wxi ?>
    
    <Fragment>
       <InstallExecuteSequence>
-          <Custom Action='MsiProcessDrivers'   After='InstallFiles'>VersionNT &gt; 400</Custom>
-          <Custom Action='MsiCleanupOnSuccess' After='InstallFinalize'>VersionNT &gt; 400</Custom>
+          <Custom Action="MsiProcessDrivers" After="InstallFiles" Condition="VersionNT &gt; 400" />
+          <Custom Action="MsiCleanupOnSuccess" After="InstallFinalize" Condition="VersionNT &gt; 400" />
       </InstallExecuteSequence>
       
-      <Binary Id='DIFxApp.dll$(var.Suffix)'  SourceFile='$(var.platform)\DIFxApp.dll'/>
-      <Binary Id='DIFxAppA.dll$(var.Suffix)' SourceFile='$(var.platform)\DIFxAppA.dll'/>
+      <Binary Id="DIFxApp.dll$(var.Suffix)" SourceFile="$(var.platform)\DIFxApp.dll" />
+      <Binary Id="DIFxAppA.dll$(var.Suffix)" SourceFile="$(var.platform)\DIFxAppA.dll" />
 
-      <CustomAction Id='MsiProcessDrivers$(var.Suffix)'   BinaryKey='DIFxApp.dll$(var.Suffix)'  DllEntry='ProcessDriverPackages'   SuppressModularization='yes' Execute='immediate' />
-      <CustomAction Id='MsiInstallDrivers$(var.Suffix)'   BinaryKey='DIFxAppA.dll$(var.Suffix)' DllEntry='InstallDriverPackages'   SuppressModularization='yes' Execute='deferred' Impersonate='no' />
-      <CustomAction Id='MsiUninstallDrivers$(var.Suffix)' BinaryKey='DIFxAppA.dll$(var.Suffix)' DllEntry='UninstallDriverPackages' SuppressModularization='yes' Execute='deferred' Impersonate='no' />
-      <CustomAction Id='MsiRollbackInstall$(var.Suffix)'  BinaryKey='DIFxAppA.dll$(var.Suffix)' DllEntry='RollbackInstall'         SuppressModularization='yes' Execute='rollback' Impersonate='no' />
-      <CustomAction Id='MsiCleanupOnSuccess$(var.Suffix)' BinaryKey='DIFxApp.dll$(var.Suffix)'  DllEntry='CleanupOnSuccess'        SuppressModularization='yes' Execute='immediate' />
+      <CustomAction Id="MsiProcessDrivers$(var.Suffix)" DllEntry="ProcessDriverPackages" SuppressModularization="yes" Execute="immediate" BinaryRef="DIFxApp.dll$(var.Suffix)" />
+      <CustomAction Id="MsiInstallDrivers$(var.Suffix)" DllEntry="InstallDriverPackages" SuppressModularization="yes" Execute="deferred" Impersonate="no" BinaryRef="DIFxAppA.dll$(var.Suffix)" />
+      <CustomAction Id="MsiUninstallDrivers$(var.Suffix)" DllEntry="UninstallDriverPackages" SuppressModularization="yes" Execute="deferred" Impersonate="no" BinaryRef="DIFxAppA.dll$(var.Suffix)" />
+      <CustomAction Id="MsiRollbackInstall$(var.Suffix)" DllEntry="RollbackInstall" SuppressModularization="yes" Execute="rollback" Impersonate="no" BinaryRef="DIFxAppA.dll$(var.Suffix)" />
+      <CustomAction Id="MsiCleanupOnSuccess$(var.Suffix)" DllEntry="CleanupOnSuccess" SuppressModularization="yes" Execute="immediate" BinaryRef="DIFxApp.dll$(var.Suffix)" />
    </Fragment>
 </Include>
-- 
cgit v1.2.3-55-g6feb