aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Util
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-04-26 11:31:05 -0700
committerRob Mensching <rob@firegiant.com>2021-05-11 11:14:01 -0700
commitdf016066100df955d5ff98811e113fb2b1bd4b8a (patch)
treea27b35a3651ca7b1d8c4bb7c7483ec2f92583e08 /src/ext/Util
parentdc6022da6cdbb9d7ca54c4a36485ceead07feaaf (diff)
downloadwix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.gz
wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.bz2
wix-df016066100df955d5ff98811e113fb2b1bd4b8a.zip
Implement integrated build process
Diffstat (limited to 'src/ext/Util')
-rw-r--r--src/ext/Util/Directory.Build.props23
-rw-r--r--src/ext/Util/Directory.Build.targets51
-rw-r--r--src/ext/Util/Directory.csproj.props13
-rw-r--r--src/ext/Util/Directory.csproj.targets26
-rw-r--r--src/ext/Util/Directory.vcxproj.props97
-rw-r--r--src/ext/Util/Util.wixext.sln10
-rw-r--r--src/ext/Util/Util.wixext.v3.ncrunchsolution6
-rw-r--r--src/ext/Util/appveyor.cmd19
-rw-r--r--src/ext/Util/appveyor.yml40
-rw-r--r--src/ext/Util/be/precomp.h2
-rw-r--r--src/ext/Util/be/utilbe.vcxproj13
-rw-r--r--src/ext/Util/ca/precomp.h2
-rw-r--r--src/ext/Util/ca/utilca.vcxproj8
-rw-r--r--src/ext/Util/nuget.config18
-rw-r--r--src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj16
-rw-r--r--src/ext/Util/util.cmd24
-rw-r--r--src/ext/Util/wix.snkbin596 -> 0 bytes
-rw-r--r--src/ext/Util/wixext/WixToolset.Util.wixext.csproj9
-rw-r--r--src/ext/Util/wixext/WixToolset.Util.wixext.nuspec10
-rw-r--r--src/ext/Util/wixlib/util.wixproj4
20 files changed, 59 insertions, 332 deletions
diff --git a/src/ext/Util/Directory.Build.props b/src/ext/Util/Directory.Build.props
index b3c6287c..9c9383c6 100644
--- a/src/ext/Util/Directory.Build.props
+++ b/src/ext/Util/Directory.Build.props
@@ -1,27 +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>Util.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="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> 9 <Import Project="..\..\Directory.Build.props" />
26 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
27</Project> 10</Project>
diff --git a/src/ext/Util/Directory.Build.targets b/src/ext/Util/Directory.Build.targets
deleted file mode 100644
index 2fcc765a..00000000
--- a/src/ext/Util/Directory.Build.targets
+++ /dev/null
@@ -1,51 +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>(?&lt;="[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
49 <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
50 <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
51</Project>
diff --git a/src/ext/Util/Directory.csproj.props b/src/ext/Util/Directory.csproj.props
deleted file mode 100644
index 81d24ad1..00000000
--- a/src/ext/Util/Directory.csproj.props
+++ /dev/null
@@ -1,13 +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 <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
9 <SignAssembly>true</SignAssembly>
10 <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
11 <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
12 </PropertyGroup>
13</Project>
diff --git a/src/ext/Util/Directory.csproj.targets b/src/ext/Util/Directory.csproj.targets
deleted file mode 100644
index c3270426..00000000
--- a/src/ext/Util/Directory.csproj.targets
+++ /dev/null
@@ -1,26 +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\Directory.csproj.targets
4 then update all of the repos.
5-->
6<Project>
7 <PropertyGroup>
8 <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
9 <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
10 </PropertyGroup>
11
12 <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"
13 Condition=" Exists('$(MSBuildProjectName).nuspec') ">
14 <PropertyGroup>
15 <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl>
16
17 <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
18 <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath>
19 <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
20 <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties>
21 <PublishRepositoryUrl>true</PublishRepositoryUrl>
22 <SymbolPackageFormat>snupkg</SymbolPackageFormat>
23 </PropertyGroup>
24 </Target>
25
26</Project>
diff --git a/src/ext/Util/Directory.vcxproj.props b/src/ext/Util/Directory.vcxproj.props
deleted file mode 100644
index 11778f41..00000000
--- a/src/ext/Util/Directory.vcxproj.props
+++ /dev/null
@@ -1,97 +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
10 <!-- NBGV properties -->
11 <AssemblyCompany>$(Company)</AssemblyCompany>
12 <AssemblyCopyright>$(Copyright)</AssemblyCopyright>
13
14 <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
15 <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
16 </PropertyGroup>
17
18 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
19 <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
20 </PropertyGroup>
21
22 <PropertyGroup>
23 <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
24 </PropertyGroup>
25
26 <ItemDefinitionGroup>
27 <ClCompile>
28 <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
29 <WarningLevel>Level4</WarningLevel>
30 <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
31 <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
32 <PrecompiledHeader>Use</PrecompiledHeader>
33 <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
34 <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
35 <TreatWarningAsError>true</TreatWarningAsError>
36 <ExceptionHandling>false</ExceptionHandling>
37 <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
38 <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
39 <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation>
40 </ClCompile>
41 <ResourceCompile>
42 <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
43 <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
44 </ResourceCompile>
45 <Lib>
46 <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
47 </Lib>
48 <Link>
49 <SubSystem>$(ProjectSubSystem)</SubSystem>
50 <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile>
51 <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint>
52 <GenerateDebugInformation>true</GenerateDebugInformation>
53 <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
54 <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
55 <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
56 </Link>
57 </ItemDefinitionGroup>
58
59 <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'">
60 <ClCompile>
61 <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
62 </ClCompile>
63 </ItemDefinitionGroup>
64 <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' ">
65 <ClCompile>
66 <CallingConvention>CDecl</CallingConvention>
67 </ClCompile>
68 </ItemDefinitionGroup>
69 <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' ">
70 <ClCompile>
71 <DebugInformationFormat>OldStyle</DebugInformationFormat>
72 <OmitDefaultLibName>true</OmitDefaultLibName>
73 <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
74 </ClCompile>
75 </ItemDefinitionGroup>
76 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' ">
77 <ClCompile>
78 <Optimization>Disabled</Optimization>
79 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
80 <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
81 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
82 </ClCompile>
83 </ItemDefinitionGroup>
84 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
85 <ClCompile>
86 <Optimization>MinSpace</Optimization>
87 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
88 <FunctionLevelLinking>true</FunctionLevelLinking>
89 <IntrinsicFunctions>true</IntrinsicFunctions>
90 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
91 </ClCompile>
92 <Link>
93 <EnableCOMDATFolding>true</EnableCOMDATFolding>
94 <OptimizeReferences>true</OptimizeReferences>
95 </Link>
96 </ItemDefinitionGroup>
97</Project>
diff --git a/src/ext/Util/Util.wixext.sln b/src/ext/Util/Util.wixext.sln
index 050fd8b3..259a8164 100644
--- a/src/ext/Util/Util.wixext.sln
+++ b/src/ext/Util/Util.wixext.sln
@@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
3# Visual Studio Version 16 3# Visual Studio Version 16
4VisualStudioVersion = 16.0.30204.135 4VisualStudioVersion = 16.0.30204.135
5MinimumVisualStudioVersion = 15.0.26124.0 5MinimumVisualStudioVersion = 15.0.26124.0
6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "src\be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}" 6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}"
7EndProject 7EndProject
8Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilca", "src\ca\utilca.vcxproj", "{076018F7-19BD-423A-ABBF-229273DA08D8}" 8Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilca", "ca\utilca.vcxproj", "{076018F7-19BD-423A-ABBF-229273DA08D8}"
9EndProject 9EndProject
10Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "util", "src\wixlib\util.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" 10Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "util", "wixlib\util.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}"
11EndProject 11EndProject
12Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Util.wixext", "src\wixext\WixToolset.Util.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}" 12Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Util.wixext", "wixext\WixToolset.Util.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}"
13EndProject 13EndProject
14Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Util", "src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}" 14Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Util", "test\WixToolsetTest.Util\WixToolsetTest.Util.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}"
15EndProject 15EndProject
16Global 16Global
17 GlobalSection(SolutionConfigurationPlatforms) = preSolution 17 GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/ext/Util/Util.wixext.v3.ncrunchsolution b/src/ext/Util/Util.wixext.v3.ncrunchsolution
deleted file mode 100644
index 10420ac9..00000000
--- a/src/ext/Util/Util.wixext.v3.ncrunchsolution
+++ /dev/null
@@ -1,6 +0,0 @@
1<SolutionConfiguration>
2 <Settings>
3 <AllowParallelTestExecution>True</AllowParallelTestExecution>
4 <SolutionConfigured>True</SolutionConfigured>
5 </Settings>
6</SolutionConfiguration> \ No newline at end of file
diff --git a/src/ext/Util/appveyor.cmd b/src/ext/Util/appveyor.cmd
deleted file mode 100644
index 8322ffae..00000000
--- a/src/ext/Util/appveyor.cmd
+++ /dev/null
@@ -1,19 +0,0 @@
1@setlocal
2@pushd %~dp0
3@set _C=Release
4@if /i "%1"=="debug" set _C=Debug
5
6:: Restore
7msbuild -p:Configuration=%_C% -t:Restore || exit /b
8
9:: Build
10msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b
11
12:: Test
13dotnet test -c %_C% --no-build src\test\WixToolsetTest.Util || exit /b
14
15:: Pack
16msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b
17
18@popd
19@endlocal
diff --git a/src/ext/Util/appveyor.yml b/src/ext/Util/appveyor.yml
deleted file mode 100644
index 7c686b04..00000000
--- a/src/ext/Util/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
6branches:
7 only:
8 - master
9 - develop
10
11image: Visual Studio 2019
12
13version: 0.0.0.{build}
14configuration: Release
15
16environment:
17 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
18 DOTNET_CLI_TELEMETRY_OPTOUT: 1
19 NUGET_XMLDOC_MODE: skip
20
21build_script:
22 - appveyor.cmd
23
24pull_requests:
25 do_not_increment_build_number: true
26
27nuget:
28 disable_publish_on_pr: true
29
30skip_branch_with_pr: true
31skip_tags: true
32
33artifacts:
34- path: build\Release\**\*.nupkg
35 name: nuget
36
37notifications:
38- provider: Slack
39 incoming_webhook:
40 secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA=
diff --git a/src/ext/Util/be/precomp.h b/src/ext/Util/be/precomp.h
index 76d24c7b..bb36b3f3 100644
--- a/src/ext/Util/be/precomp.h
+++ b/src/ext/Util/be/precomp.h
@@ -15,7 +15,7 @@
15 15
16#include <msxml2.h> 16#include <msxml2.h>
17 17
18#define MAXUINT USHRT_MAX 18// #define MAXUINT USHRT_MAX
19 19
20#include <dutil.h> 20#include <dutil.h>
21#include <memutil.h> 21#include <memutil.h>
diff --git a/src/ext/Util/be/utilbe.vcxproj b/src/ext/Util/be/utilbe.vcxproj
index 683b376a..5e5a44d3 100644
--- a/src/ext/Util/be/utilbe.vcxproj
+++ b/src/ext/Util/be/utilbe.vcxproj
@@ -1,7 +1,7 @@
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<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 4<Project DefaultTargets="Build" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <ItemGroup Label="ProjectConfigurations"> 5 <ItemGroup Label="ProjectConfigurations">
6 <ProjectConfiguration Include="Debug|ARM64"> 6 <ProjectConfiguration Include="Debug|ARM64">
7 <Configuration>Debug</Configuration> 7 <Configuration>Debug</Configuration>
@@ -69,11 +69,12 @@
69 </ItemGroup> 69 </ItemGroup>
70 70
71 <ItemGroup> 71 <ItemGroup>
72 <PackageReference Include="WixToolset.BextUtil" Version="4.0.58" /> 72 <PackageReference Include="WixToolset.DUtil" />
73 <PackageReference Include="WixToolset.BootstrapperCore.Native" Version="4.0.141" /> 73 <PackageReference Include="WixToolset.BextUtil" />
74 <PackageReference Include="WixToolset.DUtil" Version="4.0.72" /> 74 <PackageReference Include="WixToolset.BootstrapperCore.Native" />
75 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> 75
76 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> 76 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
77 <PackageReference Include="GitInfo" PrivateAssets="All" />
77 </ItemGroup> 78 </ItemGroup>
78 79
79 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 80 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/ext/Util/ca/precomp.h b/src/ext/Util/ca/precomp.h
index c5d6afe5..98e61e1a 100644
--- a/src/ext/Util/ca/precomp.h
+++ b/src/ext/Util/ca/precomp.h
@@ -22,7 +22,7 @@
22#include <shlobj.h> 22#include <shlobj.h>
23#include <intshcut.h> 23#include <intshcut.h>
24 24
25#define MAXUINT USHRT_MAX 25// #define MAXUINT USHRT_MAX
26 26
27#include "wcautil.h" 27#include "wcautil.h"
28#include "wcawow64.h" 28#include "wcawow64.h"
diff --git a/src/ext/Util/ca/utilca.vcxproj b/src/ext/Util/ca/utilca.vcxproj
index 7b64db95..f090181b 100644
--- a/src/ext/Util/ca/utilca.vcxproj
+++ b/src/ext/Util/ca/utilca.vcxproj
@@ -96,10 +96,10 @@
96 </ItemGroup> 96 </ItemGroup>
97 97
98 <ItemGroup> 98 <ItemGroup>
99 <PackageReference Include="WixToolset.Dutil" Version="4.0.72" /> 99 <PackageReference Include="WixToolset.Dutil" />
100 <PackageReference Include="WixToolset.WcaUtil" Version="4.0.19" /> 100 <PackageReference Include="WixToolset.WcaUtil" />
101 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> 101 <PackageReference Include="Microsoft.SourceLink.GitHub" />
102 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> 102 <PackageReference Include="GitInfo" />
103 </ItemGroup> 103 </ItemGroup>
104 104
105 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 105 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/ext/Util/nuget.config b/src/ext/Util/nuget.config
deleted file mode 100644
index 8d711148..00000000
--- a/src/ext/Util/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-balutil" value="https://ci.appveyor.com/nuget/wixtoolset-balutil" />
6 <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" />
7 <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" />
8 <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" />
9 <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" />
10 <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" />
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/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
index e77ecbed..bb1fc1f7 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
+++ b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.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>
@@ -20,19 +21,12 @@
20 </ItemGroup> 21 </ItemGroup>
21 22
22 <ItemGroup> 23 <ItemGroup>
23 <PackageReference Include="WixToolset.Core" Version="4.0.*" /> 24 <PackageReference Include="WixToolset.Core.TestPackage" />
24 <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
25 <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
26 <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
27 </ItemGroup> 25 </ItemGroup>
28 26
29 <ItemGroup> 27 <ItemGroup>
30 <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> 28 <PackageReference Include="Microsoft.NET.Test.Sdk" />
31 </ItemGroup> 29 <PackageReference Include="xunit" />
32 30 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
33 <ItemGroup>
34 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
35 <PackageReference Include="xunit" Version="2.4.1" />
36 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
37 </ItemGroup> 31 </ItemGroup>
38</Project> 32</Project>
diff --git a/src/ext/Util/util.cmd b/src/ext/Util/util.cmd
new file mode 100644
index 00000000..1b189086
--- /dev/null
+++ b/src/ext/Util/util.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 Building ext\Util %_C% using %_N%
10
11:: Restore
12msbuild -t:Restore -p:Configuration=%_C% || exit /b
13
14:: Build
15msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b
16
17:: Test
18dotnet test -c %_C% --no-build test\WixToolsetTest.Util || exit /b
19
20:: Pack
21msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack wixext\WixToolset.Util.wixext.csproj || exit /b
22
23@popd
24@endlocal
diff --git a/src/ext/Util/wix.snk b/src/ext/Util/wix.snk
deleted file mode 100644
index 3908a66a..00000000
--- a/src/ext/Util/wix.snk
+++ /dev/null
Binary files differ
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
index 10fc569e..434accf3 100644
--- a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
@@ -20,12 +20,7 @@
20 </ItemGroup> 20 </ItemGroup>
21 21
22 <ItemGroup> 22 <ItemGroup>
23 <PackageReference Include="WixToolset.Data" Version="4.0.*" /> 23 <PackageReference Include="WixToolset.Data" />
24 <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" /> 24 <PackageReference Include="WixToolset.Extensibility" />
25 </ItemGroup>
26
27 <ItemGroup>
28 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
29 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
30 </ItemGroup> 25 </ItemGroup>
31</Project> 26</Project>
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
index ba3eaade..da07f591 100644
--- a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
@@ -14,12 +14,12 @@
14 </metadata> 14 </metadata>
15 15
16 <files> 16 <files>
17 <file src="$projectFolder$$id$.targets" target="build" /> 17 <file src="$projectFolder$\$id$.targets" target="build" />
18 18
19 <file src="netstandard2.0\$id$.dll" target="tools" /> 19 <file src="$id$.dll" target="tools" />
20 20
21 <file src="ARM64\*.pdb" target="pdbs\ARM64" /> 21 <file src="..\ARM64\*.pdb" target="pdbs\ARM64" />
22 <file src="x86\*.pdb" target="pdbs\x86" /> 22 <file src="..\x86\*.pdb" target="pdbs\x86" />
23 <file src="x64\*.pdb" target="pdbs\x64" /> 23 <file src="..\x64\*.pdb" target="pdbs\x64" />
24 </files> 24 </files>
25</package> 25</package>
diff --git a/src/ext/Util/wixlib/util.wixproj b/src/ext/Util/wixlib/util.wixproj
index 99dede7d..56a16ff4 100644
--- a/src/ext/Util/wixlib/util.wixproj
+++ b/src/ext/Util/wixlib/util.wixproj
@@ -1,6 +1,5 @@
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">
3
4 <PropertyGroup> 3 <PropertyGroup>
5 <OutputType>Library</OutputType> 4 <OutputType>Library</OutputType>
6 <BindFiles>true</BindFiles> 5 <BindFiles>true</BindFiles>
@@ -22,6 +21,7 @@
22 </ItemGroup> 21 </ItemGroup>
23 22
24 <ItemGroup> 23 <ItemGroup>
25 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> 24 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
25 <PackageReference Include="GitInfo" PrivateAssets="All" />
26 </ItemGroup> 26 </ItemGroup>
27</Project> 27</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-16 23:50:51 +0000