Clean up Firewall extension (model for all).

3 files changed, 7 insertions, 49 deletions

diff --git a/src/ext/Firewall/wixlib/FirewallExtension_Platform.wxi b/src/ext/Firewall/wixlib/FirewallExtension_Platform.wxi
index 3861bd5d..ae02bcd0 100644
--- a/src/ext/Firewall/wixlib/FirewallExtension_Platform.wxi
+++ b/src/ext/Firewall/wixlib/FirewallExtension_Platform.wxi
@@ -1,7 +1,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. -->
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caDecor.wxi ?>
+    <?include ..\..\caDecor.wxi ?>
+
     <Fragment>
         <UIRef Id="WixFirewallErrors" />
         <UI>
diff --git a/src/ext/Firewall/wixlib/caDecor.wxi b/src/ext/Firewall/wixlib/caDecor.wxi
deleted file mode 100644
index b1711518..00000000
--- a/src/ext/Firewall/wixlib/caDecor.wxi
+++ /dev/null
@@ -1,39 +0,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. -->
-
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?ifdef Prefix ?>
-        <?undef Prefix ?>
-    <?endif?>
-
-    <?define Prefix="Wix4" ?>
-
-    <?ifndef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?if $(var.platform)="" ?>
-        <?undef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?ifdef Suffix ?>
-        <?undef Suffix ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x86" ?>
-        <?define Suffix="_X86" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x64" ?>
-        <?define Suffix="_X64" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm" ?>
-        <?define Suffix="_A32" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm64" ?>
-        <?define Suffix="_A64" ?>
-    <?endif?>
-</Include>
diff --git a/src/ext/Firewall/wixlib/firewall.wixproj b/src/ext/Firewall/wixlib/firewall.wixproj
index 2230ee0d..51941541 100644
--- a/src/ext/Firewall/wixlib/firewall.wixproj
+++ b/src/ext/Firewall/wixlib/firewall.wixproj
@@ -1,26 +1,22 @@
 <!-- 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">
-
+<Project Sdk="WixToolset.Sdk" ToolsVersion="4.0">
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <BindFiles>true</BindFiles>
     <Cultures>en-us</Cultures>
   </PropertyGroup>
-
   <ItemGroup>
-    <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
-    <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
-    <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
+    <BindInputPaths Include="$(OutputPath)x86" BindName="x86" />
+    <BindInputPaths Include="$(OutputPath)x64" BindName="x64" />
+    <BindInputPaths Include="$(OutputPath)arm64" BindName="arm64" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
     <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file