aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Firewall/wixlib
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2021-12-12 17:35:18 -0500
committerBob Arnson <github@bobs.org>2021-12-17 09:03:18 -0500
commitee8b4f230241a00d8e3ed145e85fb5d8d3c75914 (patch)
treeee3d67d9452d8e4776ccf024261e1fbb7583f19f /src/ext/Firewall/wixlib
parent3542ddd0b007673f3fc338bd53c3b807c3ed7308 (diff)
downloadwix-ee8b4f230241a00d8e3ed145e85fb5d8d3c75914.tar.gz
wix-ee8b4f230241a00d8e3ed145e85fb5d8d3c75914.tar.bz2
wix-ee8b4f230241a00d8e3ed145e85fb5d8d3c75914.zip
Clean up Firewall extension (model for all).
Diffstat (limited to 'src/ext/Firewall/wixlib')
-rw-r--r--src/ext/Firewall/wixlib/FirewallExtension_Platform.wxi3
-rw-r--r--src/ext/Firewall/wixlib/caDecor.wxi39
-rw-r--r--src/ext/Firewall/wixlib/firewall.wixproj14
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 @@
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. --> 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 2
3<Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> 3<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <?include caDecor.wxi ?> 4 <?include ..\..\caDecor.wxi ?>
5
5 <Fragment> 6 <Fragment>
6 <UIRef Id="WixFirewallErrors" /> 7 <UIRef Id="WixFirewallErrors" />
7 <UI> 8 <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 @@
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
4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?ifdef Prefix ?>
6 <?undef Prefix ?>
7 <?endif?>
8
9 <?define Prefix="Wix4" ?>
10
11 <?ifndef platform ?>
12 <?define platform="x86" ?>
13 <?endif?>
14
15 <?if $(var.platform)="" ?>
16 <?undef platform ?>
17 <?define platform="x86" ?>
18 <?endif?>
19
20 <?ifdef Suffix ?>
21 <?undef Suffix ?>
22 <?endif?>
23
24 <?if $(var.platform)~="x86" ?>
25 <?define Suffix="_X86" ?>
26 <?endif?>
27
28 <?if $(var.platform)~="x64" ?>
29 <?define Suffix="_X64" ?>
30 <?endif?>
31
32 <?if $(var.platform)~="arm" ?>
33 <?define Suffix="_A32" ?>
34 <?endif?>
35
36 <?if $(var.platform)~="arm64" ?>
37 <?define Suffix="_A64" ?>
38 <?endif?>
39</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 @@
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. --> 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<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk" ToolsVersion="4.0">
3
4 <PropertyGroup> 3 <PropertyGroup>
5 <OutputType>Library</OutputType> 4 <OutputType>Library</OutputType>
6 <BindFiles>true</BindFiles> 5 <BindFiles>true</BindFiles>
7 <Cultures>en-us</Cultures> 6 <Cultures>en-us</Cultures>
8 </PropertyGroup> 7 </PropertyGroup>
9
10 <ItemGroup> 8 <ItemGroup>
11 <BindInputPaths Include="$(OutputPath)x86" BindName='x86' /> 9 <BindInputPaths Include="$(OutputPath)x86" BindName="x86" />
12 <BindInputPaths Include="$(OutputPath)x64" BindName='x64' /> 10 <BindInputPaths Include="$(OutputPath)x64" BindName="x64" />
13 <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' /> 11 <BindInputPaths Include="$(OutputPath)arm64" BindName="arm64" />
14 </ItemGroup> 12 </ItemGroup>
15
16 <ItemGroup> 13 <ItemGroup>
17 <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" /> 14 <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
18 <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> 15 <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
19 <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> 16 <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
20 </ItemGroup> 17 </ItemGroup>
21
22 <ItemGroup> 18 <ItemGroup>
23 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> 19 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
24 <PackageReference Include="GitInfo" PrivateAssets="All" /> 20 <PackageReference Include="GitInfo" PrivateAssets="All" />
25 </ItemGroup> 21 </ItemGroup>
26</Project> 22</Project> \ No newline at end of file