Update project for Package/SummaryInformation change.
Bob Arnson committed
Oct 27, 2020 at 17:56 UTC
f33b26a3640011cac36c0a657838ed8760a0928b
5 files changed
+17
-26
DifxApp.wixext.sln
+2
-2
@@ -1,7 +1,7 @@
1
2
Microsoft Visual Studio Solution File, Format Version 12.00
3
-# Visual Studio 15
4
-VisualStudioVersion = 15.0.27130.2003
3
+# Visual Studio Version 16
4
+VisualStudioVersion = 16.0.30611.23
5
MinimumVisualStudioVersion = 15.0.26124.0
6
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "difxapp", "src\wixlib\difxapp.wixproj", "{5066EB93-D8F7-4FAE-B687-024D7A81BD95}"
7
EndProject
global.json
+1
-1
@@ -1,5 +1,5 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0143"
3
+ "WixToolset.Sdk": "4.0.0-build-0162"
4
}
5
}
src/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs
+3
-7
@@ -1,15 +1,11 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3
- <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
4
- <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
5
-
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2
+ <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7
- <MediaTemplate />
4
5
<Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
6
<ComponentGroupRef Id="ProductComponents" />
7
</Feature>
12
- </Product>
8
+ </Package>
9
10
<Fragment>
11
<Directory Id="TARGETDIR" Name="SourceDir">
src/wixext/DifxAppCompiler.cs
-4
@@ -143,10 +143,6 @@ namespace WixToolset.DifxApp
143
case Platform.X64:
144
this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MsiProcessDrivers_x64");
145
break;
146
- case Platform.IA64:
147
- case Platform.ARM:
148
- this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), node.Name.LocalName));
149
- break;
146
}
147
148
var symbol = section.AddSymbol(new MsiDriverPackagesSymbol(sourceLineNumbers)
src/wixlib/DifxAppExtension_Platform.wxi
+11
-12
@@ -1,23 +1,22 @@
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. -->
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
5
-<Include xmlns='http://wixtoolset.org/schemas/v4/wxs'>
4
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
<?include caSuffix.wxi ?>
6
7
<Fragment>
8
<InstallExecuteSequence>
10
- <Custom Action='MsiProcessDrivers' After='InstallFiles'>VersionNT > 400</Custom>
11
- <Custom Action='MsiCleanupOnSuccess' After='InstallFinalize'>VersionNT > 400</Custom>
9
+ <Custom Action="MsiProcessDrivers" After="InstallFiles" Condition="VersionNT > 400" />
10
+ <Custom Action="MsiCleanupOnSuccess" After="InstallFinalize" Condition="VersionNT > 400" />
11
</InstallExecuteSequence>
12
14
- <Binary Id='DIFxApp.dll$(var.Suffix)' SourceFile='$(var.platform)\DIFxApp.dll'/>
15
- <Binary Id='DIFxAppA.dll$(var.Suffix)' SourceFile='$(var.platform)\DIFxAppA.dll'/>
13
+ <Binary Id="DIFxApp.dll$(var.Suffix)" SourceFile="$(var.platform)\DIFxApp.dll" />
14
+ <Binary Id="DIFxAppA.dll$(var.Suffix)" SourceFile="$(var.platform)\DIFxAppA.dll" />
15
17
- <CustomAction Id='MsiProcessDrivers$(var.Suffix)' BinaryKey='DIFxApp.dll$(var.Suffix)' DllEntry='ProcessDriverPackages' SuppressModularization='yes' Execute='immediate' />
18
- <CustomAction Id='MsiInstallDrivers$(var.Suffix)' BinaryKey='DIFxAppA.dll$(var.Suffix)' DllEntry='InstallDriverPackages' SuppressModularization='yes' Execute='deferred' Impersonate='no' />
19
- <CustomAction Id='MsiUninstallDrivers$(var.Suffix)' BinaryKey='DIFxAppA.dll$(var.Suffix)' DllEntry='UninstallDriverPackages' SuppressModularization='yes' Execute='deferred' Impersonate='no' />
20
- <CustomAction Id='MsiRollbackInstall$(var.Suffix)' BinaryKey='DIFxAppA.dll$(var.Suffix)' DllEntry='RollbackInstall' SuppressModularization='yes' Execute='rollback' Impersonate='no' />
21
- <CustomAction Id='MsiCleanupOnSuccess$(var.Suffix)' BinaryKey='DIFxApp.dll$(var.Suffix)' DllEntry='CleanupOnSuccess' SuppressModularization='yes' Execute='immediate' />
16
+ <CustomAction Id="MsiProcessDrivers$(var.Suffix)" DllEntry="ProcessDriverPackages" SuppressModularization="yes" Execute="immediate" BinaryRef="DIFxApp.dll$(var.Suffix)" />
17
+ <CustomAction Id="MsiInstallDrivers$(var.Suffix)" DllEntry="InstallDriverPackages" SuppressModularization="yes" Execute="deferred" Impersonate="no" BinaryRef="DIFxAppA.dll$(var.Suffix)" />
18
+ <CustomAction Id="MsiUninstallDrivers$(var.Suffix)" DllEntry="UninstallDriverPackages" SuppressModularization="yes" Execute="deferred" Impersonate="no" BinaryRef="DIFxAppA.dll$(var.Suffix)" />
19
+ <CustomAction Id="MsiRollbackInstall$(var.Suffix)" DllEntry="RollbackInstall" SuppressModularization="yes" Execute="rollback" Impersonate="no" BinaryRef="DIFxAppA.dll$(var.Suffix)" />
20
+ <CustomAction Id="MsiCleanupOnSuccess$(var.Suffix)" DllEntry="CleanupOnSuccess" SuppressModularization="yes" Execute="immediate" BinaryRef="DIFxApp.dll$(var.Suffix)" />
21
</Fragment>
22
</Include>