diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-26 11:31:05 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-05-11 11:14:01 -0700 |
commit | df016066100df955d5ff98811e113fb2b1bd4b8a (patch) | |
tree | a27b35a3651ca7b1d8c4bb7c7483ec2f92583e08 /src/ext/Firewall | |
parent | dc6022da6cdbb9d7ca54c4a36485ceead07feaaf (diff) | |
download | wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.gz wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.bz2 wix-df016066100df955d5ff98811e113fb2b1bd4b8a.zip |
Implement integrated build process
Diffstat (limited to 'src/ext/Firewall')
-rw-r--r-- | src/ext/Firewall/CSharp.Build.props | 11 | ||||
-rw-r--r-- | src/ext/Firewall/Cpp.Build.props | 86 | ||||
-rw-r--r-- | src/ext/Firewall/Directory.Build.props | 25 | ||||
-rw-r--r-- | src/ext/Firewall/Directory.Build.targets | 48 | ||||
-rw-r--r-- | src/ext/Firewall/Firewall.wixext.sln | 8 | ||||
-rw-r--r-- | src/ext/Firewall/appveyor.cmd | 14 | ||||
-rw-r--r-- | src/ext/Firewall/appveyor.yml | 40 | ||||
-rw-r--r-- | src/ext/Firewall/ca/fwca.vcxproj | 19 | ||||
-rw-r--r-- | src/ext/Firewall/ca/packages.config | 5 | ||||
-rw-r--r-- | src/ext/Firewall/firewall.cmd | 24 | ||||
-rw-r--r-- | src/ext/Firewall/nuget.config | 18 | ||||
-rw-r--r-- | src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj | 25 | ||||
-rw-r--r-- | src/ext/Firewall/wix.snk | bin | 596 -> 0 bytes | |||
-rw-r--r-- | src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj | 8 | ||||
-rw-r--r-- | src/ext/Firewall/wixlib/firewall.wixproj | 10 |
15 files changed, 51 insertions, 290 deletions
diff --git a/src/ext/Firewall/CSharp.Build.props b/src/ext/Firewall/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/Firewall/CSharp.Build.props +++ /dev/null | |||
@@ -1,11 +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 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props | ||
4 | then update all of the repos. | ||
5 | --> | ||
6 | <Project> | ||
7 | <PropertyGroup> | ||
8 | <SignAssembly>true</SignAssembly> | ||
9 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
10 | </PropertyGroup> | ||
11 | </Project> | ||
diff --git a/src/ext/Firewall/Cpp.Build.props b/src/ext/Firewall/Cpp.Build.props deleted file mode 100644 index 9b7a1bb5..00000000 --- a/src/ext/Firewall/Cpp.Build.props +++ /dev/null | |||
@@ -1,86 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
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. --> | ||
3 | |||
4 | <Project> | ||
5 | <PropertyGroup> | ||
6 | <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform> | ||
7 | <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir> | ||
8 | <OutDir>$(OutputPath)$(Platform)\</OutDir> | ||
9 | </PropertyGroup> | ||
10 | |||
11 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
12 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
13 | </PropertyGroup> | ||
14 | |||
15 | <ItemDefinitionGroup> | ||
16 | <ClCompile> | ||
17 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
18 | <WarningLevel>Level4</WarningLevel> | ||
19 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
20 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
21 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
22 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
23 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
24 | <TreatWarningAsError>true</TreatWarningAsError> | ||
25 | <ExceptionHandling>false</ExceptionHandling> | ||
26 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
27 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
28 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
29 | </ClCompile> | ||
30 | <ResourceCompile> | ||
31 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
32 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
33 | </ResourceCompile> | ||
34 | <Lib> | ||
35 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
36 | </Lib> | ||
37 | <Link> | ||
38 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
39 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
40 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
41 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
42 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
43 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
44 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
45 | </Link> | ||
46 | </ItemDefinitionGroup> | ||
47 | |||
48 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
49 | <ClCompile> | ||
50 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
51 | </ClCompile> | ||
52 | </ItemDefinitionGroup> | ||
53 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
54 | <ClCompile> | ||
55 | <CallingConvention>CDecl</CallingConvention> | ||
56 | </ClCompile> | ||
57 | </ItemDefinitionGroup> | ||
58 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
59 | <ClCompile> | ||
60 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
61 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
62 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
63 | </ClCompile> | ||
64 | </ItemDefinitionGroup> | ||
65 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
66 | <ClCompile> | ||
67 | <Optimization>Disabled</Optimization> | ||
68 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
69 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
70 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
71 | </ClCompile> | ||
72 | </ItemDefinitionGroup> | ||
73 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
74 | <ClCompile> | ||
75 | <Optimization>MinSpace</Optimization> | ||
76 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
77 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
78 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
79 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
80 | </ClCompile> | ||
81 | <Link> | ||
82 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
83 | <OptimizeReferences>true</OptimizeReferences> | ||
84 | </Link> | ||
85 | </ItemDefinitionGroup> | ||
86 | </Project> | ||
diff --git a/src/ext/Firewall/Directory.Build.props b/src/ext/Firewall/Directory.Build.props index f83cc154..a2d81c40 100644 --- a/src/ext/Firewall/Directory.Build.props +++ b/src/ext/Firewall/Directory.Build.props | |||
@@ -1,29 +1,10 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
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. --> | 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. --> |
3 | <!-- | 3 | |
4 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.props | ||
5 | then update all of the repos. | ||
6 | --> | ||
7 | <Project> | 4 | <Project> |
8 | <PropertyGroup> | 5 | <PropertyGroup> |
9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 6 | <SegmentName>Firewall.wixext</SegmentName> |
10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | ||
11 | <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages> | ||
12 | |||
13 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | ||
14 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> | ||
15 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> | ||
16 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> | ||
17 | |||
18 | <Authors>WiX Toolset Team</Authors> | ||
19 | <Company>WiX Toolset</Company> | ||
20 | <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> | ||
21 | <PackageLicenseExpression>MS-RL</PackageLicenseExpression> | ||
22 | <Product>WiX Toolset</Product> | ||
23 | </PropertyGroup> | 7 | </PropertyGroup> |
24 | 8 | ||
25 | <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " /> | 9 | <Import Project="..\..\Directory.Build.props" /> |
26 | <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " /> | ||
27 | <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " /> | ||
28 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
29 | </Project> | 10 | </Project> |
diff --git a/src/ext/Firewall/Directory.Build.targets b/src/ext/Firewall/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/Firewall/Directory.Build.targets +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
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. --> | ||
3 | <!-- | ||
4 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.targets | ||
5 | then update all of the repos. | ||
6 | --> | ||
7 | <!-- | ||
8 | Replace PackageReferences with ProjectReferences when the projects can be found in .sln. | ||
9 | See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284 | ||
10 | --> | ||
11 | <Project> | ||
12 | <PropertyGroup> | ||
13 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
16 | </PropertyGroup> | ||
17 | |||
18 | <Choose> | ||
19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
20 | |||
21 | <PropertyGroup> | ||
22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
25 | </PropertyGroup> | ||
26 | |||
27 | <ItemGroup> | ||
28 | <!-- Keep the identity of the PackageReference --> | ||
29 | <SmartPackageReference Include="@(PackageReference)"> | ||
30 | <PackageName>%(Identity)</PackageName> | ||
31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
32 | </SmartPackageReference> | ||
33 | |||
34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
38 | </PackageInSolution> | ||
39 | |||
40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
41 | |||
42 | <!-- Remove the package references that are now referenced as projects --> | ||
43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> | ||
44 | </ItemGroup> | ||
45 | |||
46 | </When> | ||
47 | </Choose> | ||
48 | </Project> | ||
diff --git a/src/ext/Firewall/Firewall.wixext.sln b/src/ext/Firewall/Firewall.wixext.sln index 59209c88..02bb8c0f 100644 --- a/src/ext/Firewall/Firewall.wixext.sln +++ b/src/ext/Firewall/Firewall.wixext.sln | |||
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
3 | # Visual Studio 15 | 3 | # Visual Studio 15 |
4 | VisualStudioVersion = 15.0.27130.2003 | 4 | VisualStudioVersion = 15.0.27130.2003 |
5 | MinimumVisualStudioVersion = 15.0.26124.0 | 5 | MinimumVisualStudioVersion = 15.0.26124.0 |
6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fwca", "src\ca\fwca.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fwca", "ca\fwca.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" |
7 | EndProject | 7 | EndProject |
8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "firewall", "src\wixlib\firewall.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" | 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "firewall", "wixlib\firewall.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" |
9 | EndProject | 9 | EndProject |
10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Firewall.wixext", "src\wixext\WixToolset.Firewall.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Firewall.wixext", "wixext\WixToolset.Firewall.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}" |
11 | EndProject | 11 | EndProject |
12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Firewall", "src\test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}" | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Firewall", "test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}" |
13 | EndProject | 13 | EndProject |
14 | Global | 14 | Global |
15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/Firewall/appveyor.cmd b/src/ext/Firewall/appveyor.cmd deleted file mode 100644 index 79c24cc1..00000000 --- a/src/ext/Firewall/appveyor.cmd +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | @setlocal | ||
2 | @pushd %~dp0 | ||
3 | |||
4 | nuget restore || exit /b | ||
5 | |||
6 | msbuild -p:Configuration=Release -t:Restore || exit /b | ||
7 | |||
8 | msbuild -p:Configuration=Release src\test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj || exit /b | ||
9 | dotnet test -c Release --no-build src\test\WixToolsetTest.Firewall || exit /b | ||
10 | |||
11 | msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Firewall.wixext.csproj || exit /b | ||
12 | |||
13 | @popd | ||
14 | @endlocal \ No newline at end of file | ||
diff --git a/src/ext/Firewall/appveyor.yml b/src/ext/Firewall/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Firewall/appveyor.yml +++ /dev/null | |||
@@ -1,40 +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 | # Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml | ||
4 | # then update all of the repos. | ||
5 | |||
6 | branches: | ||
7 | only: | ||
8 | - master | ||
9 | - develop | ||
10 | |||
11 | image: Visual Studio 2019 | ||
12 | |||
13 | version: 0.0.0.{build} | ||
14 | configuration: Release | ||
15 | |||
16 | environment: | ||
17 | DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true | ||
18 | DOTNET_CLI_TELEMETRY_OPTOUT: 1 | ||
19 | NUGET_XMLDOC_MODE: skip | ||
20 | |||
21 | build_script: | ||
22 | - appveyor.cmd | ||
23 | |||
24 | pull_requests: | ||
25 | do_not_increment_build_number: true | ||
26 | |||
27 | nuget: | ||
28 | disable_publish_on_pr: true | ||
29 | |||
30 | skip_branch_with_pr: true | ||
31 | skip_tags: true | ||
32 | |||
33 | artifacts: | ||
34 | - path: build\Release\**\*.nupkg | ||
35 | name: nuget | ||
36 | |||
37 | notifications: | ||
38 | - provider: Slack | ||
39 | incoming_webhook: | ||
40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/Firewall/ca/fwca.vcxproj b/src/ext/Firewall/ca/fwca.vcxproj index 5e9a1db6..38497d97 100644 --- a/src/ext/Firewall/ca/fwca.vcxproj +++ b/src/ext/Firewall/ca/fwca.vcxproj | |||
@@ -2,9 +2,6 @@ | |||
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. --> | 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. --> |
3 | 3 | ||
4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
5 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" /> | ||
6 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" /> | ||
7 | |||
8 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
9 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
10 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
@@ -66,16 +63,14 @@ | |||
66 | 63 | ||
67 | <ItemGroup> | 64 | <ItemGroup> |
68 | <None Include="fwca.def" /> | 65 | <None Include="fwca.def" /> |
69 | <None Include="packages.config" /> | ||
70 | </ItemGroup> | 66 | </ItemGroup> |
71 | 67 | ||
72 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 68 | <ItemGroup> |
69 | <PackageReference Include="WixToolset.Dutil" /> | ||
70 | <PackageReference Include="WixToolset.WcaUtil" /> | ||
71 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | ||
72 | <PackageReference Include="GitInfo" /> | ||
73 | </ItemGroup> | ||
73 | 74 | ||
74 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 75 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
75 | <PropertyGroup> | ||
76 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | ||
77 | </PropertyGroup> | ||
78 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" /> | ||
79 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props'))" /> | ||
80 | </Target> | ||
81 | </Project> | 76 | </Project> |
diff --git a/src/ext/Firewall/ca/packages.config b/src/ext/Firewall/ca/packages.config deleted file mode 100644 index 9d88f529..00000000 --- a/src/ext/Firewall/ca/packages.config +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <packages> | ||
3 | <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" /> | ||
4 | <package id="WixToolset.WcaUtil" version="4.0.17" targetFramework="native" /> | ||
5 | </packages> \ No newline at end of file | ||
diff --git a/src/ext/Firewall/firewall.cmd b/src/ext/Firewall/firewall.cmd new file mode 100644 index 00000000..a735aa23 --- /dev/null +++ b/src/ext/Firewall/firewall.cmd | |||
@@ -0,0 +1,24 @@ | |||
1 | @setlocal | ||
2 | @pushd %~dp0 | ||
3 | |||
4 | @set _C=Debug | ||
5 | :parse_args | ||
6 | @if /i "%1"=="release" set _C=Release& shift | ||
7 | @if not "%1"=="" shift & goto parse_args | ||
8 | |||
9 | @echo Firewall.wixext build %_C% | ||
10 | |||
11 | :: Restore | ||
12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
13 | |||
14 | :: Build | ||
15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj || exit /b | ||
16 | |||
17 | :: Test | ||
18 | dotnet test -c %_C% --no-build test\WixToolsetTest.Firewall || exit /b | ||
19 | |||
20 | :: Pack | ||
21 | msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Firewall.wixext.csproj || exit /b | ||
22 | |||
23 | @popd | ||
24 | @endlocal | ||
diff --git a/src/ext/Firewall/nuget.config b/src/ext/Firewall/nuget.config deleted file mode 100644 index aaf36562..00000000 --- a/src/ext/Firewall/nuget.config +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <configuration> | ||
3 | <packageSources> | ||
4 | <clear /> | ||
5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
6 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
7 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
8 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
9 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
10 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
11 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
12 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
13 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
14 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
15 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
16 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
17 | </packageSources> | ||
18 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj index d04368c1..c291c7f9 100644 --- a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj +++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj | |||
@@ -5,6 +5,7 @@ | |||
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
8 | <SignOutput>false</SignOutput> | ||
8 | </PropertyGroup> | 9 | </PropertyGroup> |
9 | 10 | ||
10 | <PropertyGroup> | 11 | <PropertyGroup> |
@@ -12,14 +13,7 @@ | |||
12 | </PropertyGroup> | 13 | </PropertyGroup> |
13 | 14 | ||
14 | <ItemGroup> | 15 | <ItemGroup> |
15 | <Content Include="TestData\UsingFirewall\example.txt" CopyToOutputDirectory="PreserveNewest" /> | 16 | <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" /> |
16 | <Content Include="TestData\UsingFirewall\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> | ||
17 | <Content Include="TestData\UsingFirewall\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
18 | <Content Include="TestData\UsingFirewall\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
19 | <Content Include="TestData\UsingOutboundFirewall\example.txt" CopyToOutputDirectory="PreserveNewest" /> | ||
20 | <Content Include="TestData\UsingOutboundFirewall\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> | ||
21 | <Content Include="TestData\UsingOutboundFirewall\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
22 | <Content Include="TestData\UsingOutboundFirewall\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
23 | </ItemGroup> | 17 | </ItemGroup> |
24 | 18 | ||
25 | <ItemGroup> | 19 | <ItemGroup> |
@@ -27,19 +21,12 @@ | |||
27 | </ItemGroup> | 21 | </ItemGroup> |
28 | 22 | ||
29 | <ItemGroup> | 23 | <ItemGroup> |
30 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 24 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
31 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
32 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
33 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
34 | </ItemGroup> | 25 | </ItemGroup> |
35 | 26 | ||
36 | <ItemGroup> | 27 | <ItemGroup> |
37 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 28 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
38 | </ItemGroup> | 29 | <PackageReference Include="xunit" /> |
39 | 30 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
40 | <ItemGroup> | ||
41 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
42 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
43 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
44 | </ItemGroup> | 31 | </ItemGroup> |
45 | </Project> | 32 | </Project> |
diff --git a/src/ext/Firewall/wix.snk b/src/ext/Firewall/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/Firewall/wix.snk +++ /dev/null | |||
Binary files differ | |||
diff --git a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj index 6704dad2..43164950 100644 --- a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj +++ b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj | |||
@@ -17,15 +17,11 @@ | |||
17 | </ItemGroup> | 17 | </ItemGroup> |
18 | 18 | ||
19 | <ItemGroup> | 19 | <ItemGroup> |
20 | <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" /> | 20 | <PackageReference Include="WixToolset.Data" PrivateAssets="All" /> |
21 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 21 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" /> |
22 | </ItemGroup> | 22 | </ItemGroup> |
23 | 23 | ||
24 | <ItemGroup> | 24 | <ItemGroup> |
25 | <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 25 | <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> |
26 | </ItemGroup> | 26 | </ItemGroup> |
27 | |||
28 | <ItemGroup> | ||
29 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
30 | </ItemGroup> | ||
31 | </Project> | 27 | </Project> |
diff --git a/src/ext/Firewall/wixlib/firewall.wixproj b/src/ext/Firewall/wixlib/firewall.wixproj index 242fa56e..2230ee0d 100644 --- a/src/ext/Firewall/wixlib/firewall.wixproj +++ b/src/ext/Firewall/wixlib/firewall.wixproj | |||
@@ -14,13 +14,13 @@ | |||
14 | </ItemGroup> | 14 | </ItemGroup> |
15 | 15 | ||
16 | <ItemGroup> | 16 | <ItemGroup> |
17 | <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM64" /> | 17 | <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" /> |
18 | <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x86" /> | 18 | <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> |
19 | <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x64" /> | 19 | <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> |
20 | </ItemGroup> | 20 | </ItemGroup> |
21 | 21 | ||
22 | <ItemGroup> | 22 | <ItemGroup> |
23 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 23 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
24 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
24 | </ItemGroup> | 25 | </ItemGroup> |
25 | |||
26 | </Project> | 26 | </Project> |