aboutsummaryrefslogtreecommitdiff
path: root/src/libs/wcautil
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/libs/wcautil
parentdc6022da6cdbb9d7ca54c4a36485ceead07feaaf (diff)
downloadwix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.gz
wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.bz2
wix-df016066100df955d5ff98811e113fb2b1bd4b8a.zip
Implement integrated build process
Diffstat (limited to 'src/libs/wcautil')
-rw-r--r--src/libs/wcautil/Cpp.Build.props104
-rw-r--r--src/libs/wcautil/Directory.Build.props26
-rw-r--r--src/libs/wcautil/Directory.Build.targets48
-rw-r--r--src/libs/wcautil/NativeMultiTargeting.Build.props10
-rw-r--r--src/libs/wcautil/WixToolset.WcaUtil/packages.config5
-rw-r--r--src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec29
-rw-r--r--src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj31
-rw-r--r--src/libs/wcautil/appveyor.cmd20
-rw-r--r--src/libs/wcautil/appveyor.yml35
-rw-r--r--src/libs/wcautil/nuget.config8
10 files changed, 27 insertions, 289 deletions
diff --git a/src/libs/wcautil/Cpp.Build.props b/src/libs/wcautil/Cpp.Build.props
deleted file mode 100644
index 44a042c7..00000000
--- a/src/libs/wcautil/Cpp.Build.props
+++ /dev/null
@@ -1,104 +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) &gt; 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)'=='Debug' and '$(CLRSupport)'=='true' ">
74 <ClCompile>
75 <BasicRuntimeChecks></BasicRuntimeChecks>
76 <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
77 </ClCompile>
78 </ItemDefinitionGroup>
79 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
80 <ClCompile>
81 <Optimization>MinSpace</Optimization>
82 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
83 <FunctionLevelLinking>true</FunctionLevelLinking>
84 <IntrinsicFunctions>true</IntrinsicFunctions>
85 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
86 </ClCompile>
87 <Link>
88 <EnableCOMDATFolding>true</EnableCOMDATFolding>
89 <OptimizeReferences>true</OptimizeReferences>
90 </Link>
91 </ItemDefinitionGroup>
92 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
93 <ClCompile>
94 <BasicRuntimeChecks></BasicRuntimeChecks>
95 <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
96 </ClCompile>
97 </ItemDefinitionGroup>
98 <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
99 <Link>
100 <KeyFile>$(LinkKeyFile)</KeyFile>
101 <DelaySign>$(LinkDelaySign)</DelaySign>
102 </Link>
103 </ItemDefinitionGroup>
104</Project>
diff --git a/src/libs/wcautil/Directory.Build.props b/src/libs/wcautil/Directory.Build.props
deleted file mode 100644
index e853e22d..00000000
--- a/src/libs/wcautil/Directory.Build.props
+++ /dev/null
@@ -1,26 +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.props
5 then update all of the repos.
6-->
7<Project>
8 <PropertyGroup>
9 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
10 <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
11
12 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
13 <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath>
14 <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
15 <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
16
17 <Authors>WiX Toolset Team</Authors>
18 <Company>WiX Toolset</Company>
19 <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
20 <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
21 <Product>WiX Toolset</Product>
22 </PropertyGroup>
23
24 <Import Project="Cpp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' " />
25 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
26</Project>
diff --git a/src/libs/wcautil/Directory.Build.targets b/src/libs/wcautil/Directory.Build.targets
deleted file mode 100644
index dac7452a..00000000
--- a/src/libs/wcautil/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>(?&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</Project>
diff --git a/src/libs/wcautil/NativeMultiTargeting.Build.props b/src/libs/wcautil/NativeMultiTargeting.Build.props
deleted file mode 100644
index 1ff46559..00000000
--- a/src/libs/wcautil/NativeMultiTargeting.Build.props
+++ /dev/null
@@ -1,10 +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 <!-- Overrides the standard Cpp.Build.props to include the PlatformToolset in the output path. -->
6 <PropertyGroup>
7 <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\</IntDir>
8 <OutDir>$(OutputPath)$(PlatformToolset)\$(PlatformTarget)\</OutDir>
9 </PropertyGroup>
10</Project>
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/packages.config b/src/libs/wcautil/WixToolset.WcaUtil/packages.config
deleted file mode 100644
index aa8b4077..00000000
--- a/src/libs/wcautil/WixToolset.WcaUtil/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<packages>
3 <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
4 <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
5</packages> \ No newline at end of file
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
index a57a5749..b9547a8b 100644
--- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
@@ -1,30 +1,31 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2<package > 2<package >
3 <metadata> 3 <metadata minClientVersion="4.0">
4 <id>$id$</id> 4 <id>$id$</id>
5 <version>$version$</version> 5 <version>$version$</version>
6 <title>$title$</title>
7 <description>$description$</description>
6 <authors>$authors$</authors> 8 <authors>$authors$</authors>
7 <owners>$authors$</owners>
8 <license type="expression">MS-RL</license> 9 <license type="expression">MS-RL</license>
9 <projectUrl>https://github.com/wixtoolset/wcautil</projectUrl>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 10 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <description>$description$</description>
12 <copyright>$copyright$</copyright> 11 <copyright>$copyright$</copyright>
12 <projectUrl>$projectUrl$</projectUrl>
13 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
13 <dependencies> 14 <dependencies>
14 <dependency id="WixToolset.DUtil" version="[4,5)" /> 15 <dependency id="WixToolset.DUtil" version="[4,5)" />
15 </dependencies> 16 </dependencies>
16 </metadata> 17 </metadata>
17 18
18 <files> 19 <files>
19 <file src="build\$id$.props" target="build\" /> 20 <file src="$projectFolder$\build\$id$.props" target="build\" />
20 <file src="inc\*" target="build\native\include" /> 21 <file src="$projectFolder$\inc\*" target="build\native\include" />
21 <file src="..\..\build\$configuration$\v140\x64\wcautil.lib" target="build\native\v140\x64" /> 22 <file src="..\..\v140\x64\wcautil.lib" target="build\native\v140\x64" />
22 <file src="..\..\build\$configuration$\v140\x86\wcautil.lib" target="build\native\v140\x86" /> 23 <file src="..\..\v140\x86\wcautil.lib" target="build\native\v140\x86" />
23 <file src="..\..\build\$configuration$\v141\x64\wcautil.lib" target="build\native\v141\x64" /> 24 <file src="..\..\v141\x64\wcautil.lib" target="build\native\v141\x64" />
24 <file src="..\..\build\$configuration$\v141\x86\wcautil.lib" target="build\native\v141\x86" /> 25 <file src="..\..\v141\x86\wcautil.lib" target="build\native\v141\x86" />
25 <file src="..\..\build\$configuration$\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" /> 26 <file src="..\..\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" />
26 <file src="..\..\build\$configuration$\v142\x64\wcautil.lib" target="build\native\v142\x64" /> 27 <file src="..\..\v142\x64\wcautil.lib" target="build\native\v142\x64" />
27 <file src="..\..\build\$configuration$\v142\x86\wcautil.lib" target="build\native\v142\x86" /> 28 <file src="..\..\v142\x86\wcautil.lib" target="build\native\v142\x86" />
28 <file src="..\..\build\$configuration$\v142\ARM64\wcautil.lib" target="build\native\v142\ARM64" /> 29 <file src="..\..\v142\ARM64\wcautil.lib" target="build\native\v142\ARM64" />
29 </files> 30 </files>
30</package> 31</package>
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj
index 6876bd5b..377358ef 100644
--- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj
+++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.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<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">
4 <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />
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>
@@ -28,6 +28,7 @@
28 <Platform>x64</Platform> 28 <Platform>x64</Platform>
29 </ProjectConfiguration> 29 </ProjectConfiguration>
30 </ItemGroup> 30 </ItemGroup>
31
31 <PropertyGroup Label="Globals"> 32 <PropertyGroup Label="Globals">
32 <ProjectGuid>{5B3714B6-3A76-463E-8595-D48DA276C512}</ProjectGuid> 33 <ProjectGuid>{5B3714B6-3A76-463E-8595-D48DA276C512}</ProjectGuid>
33 <ConfigurationType>StaticLibrary</ConfigurationType> 34 <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -36,14 +37,17 @@
36 <PlatformToolset>v142</PlatformToolset> 37 <PlatformToolset>v142</PlatformToolset>
37 <CharacterSet>MultiByte</CharacterSet> 38 <CharacterSet>MultiByte</CharacterSet>
38 <Description>WiX Toolset Custom Action native utility library</Description> 39 <Description>WiX Toolset Custom Action native utility library</Description>
40 <PackageId>WixToolset.WcaUtil</PackageId>
39 </PropertyGroup> 41 </PropertyGroup>
40 42
41 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 43 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 44 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
43 <ImportGroup Label="Shared"> 45
44 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> 46 <Import Project="..\..\..\NativeMultiTargeting.Build.props" />
45 </ImportGroup> 47
46 <Import Project="..\NativeMultiTargeting.Build.props" /> 48 <PropertyGroup>
49 <ProjectAdditionalIncludeDirectories>..\..\dutil\WixToolset.DUtil\inc</ProjectAdditionalIncludeDirectories>
50 </PropertyGroup>
47 51
48 <ItemGroup> 52 <ItemGroup>
49 <ClCompile Include="exbinary.cpp" /> 53 <ClCompile Include="exbinary.cpp" />
@@ -75,20 +79,9 @@
75 </ItemGroup> 79 </ItemGroup>
76 80
77 <ItemGroup> 81 <ItemGroup>
78 <None Include="packages.config" /> 82 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
83 <PackageReference Include="GitInfo" PrivateAssets="All" />
79 </ItemGroup> 84 </ItemGroup>
80 85
81 <Target Name="PackNativeNuget"
82 DependsOnTargets="GetBuildVersion">
83 <Exec Command='nuget pack wcautil.nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=WixToolset.WcaUtil;Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
84 </Target>
85
86 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 86 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
87 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 87</Project>
88 <PropertyGroup>
89 <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>
90 </PropertyGroup>
91 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
92 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" />
93 </Target>
94</Project> \ No newline at end of file
diff --git a/src/libs/wcautil/appveyor.cmd b/src/libs/wcautil/appveyor.cmd
deleted file mode 100644
index a2596256..00000000
--- a/src/libs/wcautil/appveyor.cmd
+++ /dev/null
@@ -1,20 +0,0 @@
1@setlocal
2@pushd %~dp0
3
4nuget restore || exit /b
5
6msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140 || exit /b
7msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140 || exit /b
8
9msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141 || exit /b
10msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141 || exit /b
11msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141 || exit /b
12
13msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v142 || exit /b
14msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v142 || exit /b
15msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v142 || exit /b
16
17msbuild -p:Configuration=Release -t:PackNativeNuget src\wcautil\wcautil.vcxproj || exit /b
18
19@popd
20@endlocal \ No newline at end of file
diff --git a/src/libs/wcautil/appveyor.yml b/src/libs/wcautil/appveyor.yml
deleted file mode 100644
index bbf880f0..00000000
--- a/src/libs/wcautil/appveyor.yml
+++ /dev/null
@@ -1,35 +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
6image: Visual Studio 2019
7
8version: 0.0.0.{build}
9configuration: Release
10
11environment:
12 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
13 DOTNET_CLI_TELEMETRY_OPTOUT: 1
14 NUGET_XMLDOC_MODE: skip
15
16build_script:
17 - appveyor.cmd
18
19pull_requests:
20 do_not_increment_build_number: true
21
22nuget:
23 disable_publish_on_pr: true
24
25skip_branch_with_pr: true
26skip_tags: true
27
28artifacts:
29- path: build\Release\**\*.nupkg
30 name: nuget
31
32notifications:
33- provider: Slack
34 incoming_webhook:
35 secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA=
diff --git a/src/libs/wcautil/nuget.config b/src/libs/wcautil/nuget.config
deleted file mode 100644
index 790be2b0..00000000
--- a/src/libs/wcautil/nuget.config
+++ /dev/null
@@ -1,8 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<configuration>
3 <packageSources>
4 <clear />
5 <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" />
6 <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
7 </packageSources>
8</configuration> \ No newline at end of file
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 02:38:36 +0000