Go back to separate .wixlibs for DifxApp.

Fixes https://github.com/wixtoolset/issues/issues/7015.

4 files changed, 8 insertions, 18 deletions

diff --git a/src/ext/DifxApp/wixext/DifxAppCompiler.cs b/src/ext/DifxApp/wixext/DifxAppCompiler.cs
index 7d000f67..6f32a60b 100644
--- a/src/ext/DifxApp/wixext/DifxAppCompiler.cs
+++ b/src/ext/DifxApp/wixext/DifxAppCompiler.cs
@@ -137,15 +137,7 @@ namespace WixToolset.DifxApp
 
             if (!this.Messaging.EncounteredError)
             {
-                switch (this.Context.Platform)
-                {
-                    case Platform.X86:
-                        this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MsiProcessDrivers");
-                        break;
-                    case Platform.X64:
-                        this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MsiProcessDrivers_x64");
-                        break;
-                }
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MsiProcessDrivers");
 
                 var symbol = section.AddSymbol(new MsiDriverPackagesSymbol(sourceLineNumbers)
                 {
diff --git a/src/ext/DifxApp/wixext/DifxAppExtensionData.cs b/src/ext/DifxApp/wixext/DifxAppExtensionData.cs
index 31a95b8e..5552717c 100644
--- a/src/ext/DifxApp/wixext/DifxAppExtensionData.cs
+++ b/src/ext/DifxApp/wixext/DifxAppExtensionData.cs
@@ -14,10 +14,5 @@ namespace WixToolset.DifxApp
             symbolDefinition = DifxAppSymbolDefinitions.ByName(name);
             return symbolDefinition != null;
         }
-
-        public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
-        {
-            return Intermediate.Load(typeof(DifxAppExtensionData).Assembly, "WixToolset.DifxApp.difxapp.wixlib", symbolDefinitions);
-        }
     }
 }
diff --git a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj
index ec52e897..75ea81ec 100644
--- a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj
+++ b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj
@@ -12,11 +12,13 @@
 
   <Import Project="..\..\WixExt.props" />
 
-  <ItemGroup>
-    <EmbeddedResource Include="$(OutputPath)..\difxapp.wixlib" />
+  <ItemGroup Condition=" '$(NCrunch)'=='' ">
+    <ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Properties="Platform=x86" />
+    <ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Properties="Platform=x64" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(NCrunch)'=='' ">
-    <ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
+  <ItemGroup>
+    <Content Include="$(OutDir)..\difxapp_x86.wixlib" PackagePath="wixext4\" />
+    <Content Include="$(OutDir)..\difxapp_x64.wixlib" PackagePath="wixext4\" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.targets b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.targets
index bf6df083..87fce8f5 100644
--- a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.targets
+++ b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.targets
@@ -7,5 +7,6 @@
        Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <WixLibrary Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\difxapp_$(InstallerPlatform).wixlib" />
   </ItemGroup>
 </Project>