aboutsummaryrefslogtreecommitdiff
path: root/src/api/burn
diff options
context:
space:
mode:
Diffstat (limited to 'src/api/burn')
-rw-r--r--src/api/burn/Directory.Build.props26
-rw-r--r--src/api/burn/Directory.Build.targets73
-rw-r--r--src/api/burn/Directory.csproj.props13
-rw-r--r--src/api/burn/Directory.vcxproj.props115
-rw-r--r--src/api/burn/NativeMultiTargeting.Build.props10
-rw-r--r--src/api/burn/README.md2
-rw-r--r--src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec17
-rw-r--r--src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj18
-rw-r--r--src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj51
-rw-r--r--src/api/burn/api_burn.sln (renamed from src/api/burn/balutil.sln)14
-rw-r--r--src/api/burn/appveyor.cmd27
-rw-r--r--src/api/burn/appveyor.yml42
-rw-r--r--src/api/burn/balutil/balutil.nuspec33
-rw-r--r--src/api/burn/balutil/balutil.vcxproj23
-rw-r--r--src/api/burn/balutil/packages.config6
-rw-r--r--src/api/burn/bextutil/bextutil.nuspec33
-rw-r--r--src/api/burn/bextutil/bextutil.vcxproj23
-rw-r--r--src/api/burn/bextutil/packages.config6
-rw-r--r--src/api/burn/mbanative/mbanative.vcxproj46
-rw-r--r--src/api/burn/mbanative/packages.config9
-rw-r--r--src/api/burn/nuget.config10
-rw-r--r--src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj42
-rw-r--r--src/api/burn/test/BalUtilUnitTest/packages.config15
-rw-r--r--src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj45
-rw-r--r--src/api/burn/test/BextUtilUnitTest/packages.config15
-rw-r--r--src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj5
26 files changed, 123 insertions, 596 deletions
diff --git a/src/api/burn/Directory.Build.props b/src/api/burn/Directory.Build.props
deleted file mode 100644
index fb34d54e..00000000
--- a/src/api/burn/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="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
25 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
26</Project>
diff --git a/src/api/burn/Directory.Build.targets b/src/api/burn/Directory.Build.targets
deleted file mode 100644
index 44701fb6..00000000
--- a/src/api/burn/Directory.Build.targets
+++ /dev/null
@@ -1,73 +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<Project>
8 <PropertyGroup>
9 <SigningToolFolder>$(BaseOutputPath)obj\.tools</SigningToolFolder>
10 <SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe>
11 <SigningFilelist>$(SigningToolFolder)\empty-filelist.txt</SigningFilelist>
12 <SigningConfiguration>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json</SigningConfiguration>
13 </PropertyGroup>
14
15 <PropertyGroup>
16 <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
17 <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
18 </PropertyGroup>
19
20 <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"
21 Condition=" Exists('$(MSBuildProjectName).nuspec') ">
22 <PropertyGroup>
23 <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl>
24
25 <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
26 <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(MSBuildProjectDirectory)</NuspecBasePath>
27 <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors="$(Authors)";Configuration=$(Configuration);Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"</NuspecProperties>
28 <NuspecProperties>$(NuspecProperties);Version=$(NPMPackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties>
29 <PublishRepositoryUrl>true</PublishRepositoryUrl>
30 <SymbolPackageFormat>snupkg</SymbolPackageFormat>
31 </PropertyGroup>
32 </Target>
33
34 <Target Name="PackNative" DependsOnTargets="GetBuildVersion;SetNuspecProperties"
35 Condition=" Exists('$(MSBuildProjectName).nuspec') ">
36
37 <Exec Command='nuget pack $(NuspecFile) -OutputDirectory "$(BaseOutputPath)$(Configuration)" -BasePath "$(NuspecBasePath)" -Properties $(NuspecProperties)'
38 WorkingDirectory="$(MSBuildProjectDirectory)" />
39
40 <ItemGroup>
41 <NuGetPackOutput Include="$(BaseOutputPath)$(Configuration)\**\$(PackageId)*.nupkg" />
42 </ItemGroup>
43 </Target>
44
45 <Target Name="_GetSignClient"
46 Condition=" !Exists('$(SigningToolExe)') ">
47
48 <WriteLinesToFile File='$(SigningFilelist)' Lines='do-not-sign-files-in-nupkg' Overwrite='true' />
49
50 <Exec Command='dotnet.exe tool install --tool-path "$(SigningToolFolder)" SignClient' />
51 </Target>
52
53 <Target Name="SignOutput" DependsOnTargets="_GetSignClient" AfterTargets="AfterBuild"
54 Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' and
55 ('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))">
56
57 <Exec Command='"$(SigningToolExe)" sign -i $(TargetPath) -c "$(SigningConfiguration)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
58 WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
59 </Target>
60
61 <Target Name="SignNupkg" DependsOnTargets="_GetSignClient" AfterTargets="Pack;PackNative"
62 Condition=" '$(SigningUser)'!='' and '@(NuGetPackOutput)'!='' and '$(SignNupkg)'!='false' ">
63 <ItemGroup>
64 <SigningNupkgs Include="@(NuGetPackOutput)" Condition=" '%(Extension)'=='.nupkg' " />
65 </ItemGroup>
66
67 <Exec Command='"$(SigningToolExe)" sign -i "@(SigningNupkgs->&apos;%(Identity)&apos;)" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
68 WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
69 </Target>
70
71 <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
72 <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
73</Project>
diff --git a/src/api/burn/Directory.csproj.props b/src/api/burn/Directory.csproj.props
deleted file mode 100644
index 81d24ad1..00000000
--- a/src/api/burn/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/api/burn/Directory.vcxproj.props b/src/api/burn/Directory.vcxproj.props
deleted file mode 100644
index 9ea7071b..00000000
--- a/src/api/burn/Directory.vcxproj.props
+++ /dev/null
@@ -1,115 +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 Condition=" Exists('$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset') ">$(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)'=='Debug' and '$(CLRSupport)'=='true' ">
85 <ClCompile>
86 <BasicRuntimeChecks></BasicRuntimeChecks>
87 <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
88 </ClCompile>
89 </ItemDefinitionGroup>
90 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
91 <ClCompile>
92 <Optimization>MinSpace</Optimization>
93 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
94 <FunctionLevelLinking>true</FunctionLevelLinking>
95 <IntrinsicFunctions>true</IntrinsicFunctions>
96 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
97 </ClCompile>
98 <Link>
99 <EnableCOMDATFolding>true</EnableCOMDATFolding>
100 <OptimizeReferences>true</OptimizeReferences>
101 </Link>
102 </ItemDefinitionGroup>
103 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
104 <ClCompile>
105 <BasicRuntimeChecks></BasicRuntimeChecks>
106 <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
107 </ClCompile>
108 </ItemDefinitionGroup>
109 <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
110 <Link>
111 <KeyFile>$(LinkKeyFile)</KeyFile>
112 <DelaySign>$(LinkDelaySign)</DelaySign>
113 </Link>
114 </ItemDefinitionGroup>
115</Project>
diff --git a/src/api/burn/NativeMultiTargeting.Build.props b/src/api/burn/NativeMultiTargeting.Build.props
deleted file mode 100644
index 1ff46559..00000000
--- a/src/api/burn/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/api/burn/README.md b/src/api/burn/README.md
deleted file mode 100644
index 380bbda3..00000000
--- a/src/api/burn/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
1# balutil
2balutil.lib - WiX Toolset Bootstrapper Application Layer native utility library
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec
index b10b75d2..d86bb3cd 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec
@@ -1,19 +1,20 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2<package > 2<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3 <metadata> 3 <metadata minClientVersion="4.0">
4 <id>$id$</id> 4 <id>$id$</id>
5 <version>$version$</version> 5 <version>$version$</version>
6 <authors>WiX Toolset Team</authors> 6 <title>$title$</title>
7 <owners>WiX Toolset Team</owners> 7 <description>$description$</description>
8 <authors>$authors$</authors>
8 <license type="expression">MS-RL</license> 9 <license type="expression">MS-RL</license>
9 <projectUrl>https://github.com/wixtoolset/BootstrapperCore</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 </metadata> 14 </metadata>
14 15
15 <files> 16 <files>
16 <file src="build\$id$.props" target="build\" /> 17 <file src="$projectFolder$\build\$id$.props" target="build\" />
17 <file src="inc\*" target="build\native\include" /> 18 <file src="$projectFolder$\inc\*" target="build\native\include" />
18 </files> 19 </files>
19</package> 20</package>
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj
index 0899bdcf..0bd374c7 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj
@@ -1,19 +1,19 @@
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 4<Project Sdk="Microsoft.Build.NoTargets/3.0.4">
5<Project ToolsVersion="4.0" DefaultTargets="Pack" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <PackageId>WixToolset.BootstrapperCore.Native</PackageId> 7 <PackageId>WixToolset.BootstrapperCore.Native</PackageId>
8 <Description>WiX Bootstrapper native interfaces</Description> 8 <Description>WiX Bootstrapper native interfaces</Description>
9 </PropertyGroup> 9 </PropertyGroup>
10 10
11 <Target Name="PackNative" DependsOnTargets="GetBuildVersion"> 11 <ItemGroup>
12 <Exec Command='nuget pack $(PackageId).nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Id=$(PackageId);Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)"' /> 12 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
13 </Target> 13 <PackageReference Include="GitInfo" PrivateAssets="All" />
14 14 </ItemGroup>
15 <Import Project="..\Directory.Build.props" />
16 <!-- <Import Project="..\Directory.Build.targets" /> -->
17 15
18 <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> 16 <Target Name="Pack"
17 DependsOnTargets="GitVersion;PackNative"
18 BeforeTargets="AfterBuild" />
19</Project> 19</Project>
diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
index 2bd7ca80..ce8c7105 100644
--- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
@@ -13,47 +13,16 @@
13 <CreateDocumentationFile>true</CreateDocumentationFile> 13 <CreateDocumentationFile>true</CreateDocumentationFile>
14 </PropertyGroup> 14 </PropertyGroup>
15 15
16 <ItemGroup> 16 <ItemGroup Condition=" '$(NCrunch)'=='' ">
17 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> 17 <ProjectReference Include="..\mbanative\mbanative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=x86" />
18 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
19 </ItemGroup> 18 </ItemGroup>
20 19
21 <PropertyGroup> 20 <ItemGroup Condition=" '$(NCrunch)'=='' ">
22 <NuspecBasePath>$(OutputPath)</NuspecBasePath> 21 <None Include="$(BaseOutputPath)$(Configuration)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
23 <NativeFileListPath Condition=" '$(NCrunch)'=='' ">$(MSBuildProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath> 22 <None Include="$(BaseOutputPath)$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
24 <NativeFileListPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath> 23 </ItemGroup>
25 </PropertyGroup> 24 <ItemGroup Condition=" '$(NCrunch)'=='1' ">
26 25 <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
27 <Target Name="BuildMbaNative" BeforeTargets="GetCopyToOutputDirectoryItems" Condition=" '$(NCrunch)'=='' "> 26 <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
28 <MSBuild Projects="..\mbanative\mbanative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;ContentFilesProjectOutputGroup;DebugSymbolsProjectOutputGroup"> 27 </ItemGroup>
29 <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" />
30 </MSBuild>
31
32 <WriteLinesToFile File="$(NativeFileListPath)" Lines="@(_NativeProjectOutput)" Overwrite="true" />
33
34 <ItemGroup>
35 <FileWrites Include="$(NativeFileListPath)" />
36
37 <AllItemsFullPathWithTargetPath Include="@(_NativeProjectOutput->'%(FullPath)')">
38 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
39 <TargetPath>%(Filename)%(Extension)</TargetPath>
40 </AllItemsFullPathWithTargetPath>
41 </ItemGroup>
42 </Target>
43
44 <Target Name="NCrunchCopyNative" AfterTargets="AfterBuild" Condition=" '$(NCrunch)'=='1' ">
45 <ReadLinesFromFile File="$(NativeFileListPath)">
46 <Output TaskParameter="Lines" ItemName="_NCrunchNativeProjectOutput" />
47 </ReadLinesFromFile>
48
49 <Error Text="You must build $(MSBuildProjectName) to create the referenced native projects. Once built, 'Reload and rebuild' the project in the NCrunch Tests. The $(NativeFileListPath) file must not be empty." Condition=" '@(_NCrunchNativeProjectOutput)'=='' " />
50
51 <Copy SourceFiles="@(_NCrunchNativeProjectOutput)" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true">
52 <Output TaskParameter="CopiedFiles" ItemName="_NCrunchNativeCopied" />
53 </Copy>
54
55 <ItemGroup>
56 <FileWrites Include="@(_NCrunchNativeCopied)" />
57 </ItemGroup>
58 </Target>
59</Project> 28</Project>
diff --git a/src/api/burn/balutil.sln b/src/api/burn/api_burn.sln
index cae580f3..858272fb 100644
--- a/src/api/burn/balutil.sln
+++ b/src/api/burn/api_burn.sln
@@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
3# Visual Studio Version 16 3# Visual Studio Version 16
4VisualStudioVersion = 16.0.29503.13 4VisualStudioVersion = 16.0.29503.13
5MinimumVisualStudioVersion = 15.0.26124.0 5MinimumVisualStudioVersion = 15.0.26124.0
6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "src\balutil\balutil.vcxproj", "{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}" 6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "balutil\balutil.vcxproj", "{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}"
7EndProject 7EndProject
8Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "src\bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}" 8Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}"
9EndProject 9EndProject
10Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}" 10Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}"
11EndProject 11EndProject
12Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "src\mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}" 12Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}"
13EndProject 13EndProject
14Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{F54997F7-10D7-409B-B9F2-DB546490EDC0}" 14Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{F54997F7-10D7-409B-B9F2-DB546490EDC0}"
15EndProject 15EndProject
16Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "src\test\BalUtilUnitTest\BalUtilUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}" 16Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "test\BalUtilUnitTest\BalUtilUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}"
17EndProject 17EndProject
18Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "src\test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}" 18Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}"
19EndProject 19EndProject
20Global 20Global
21 GlobalSection(SolutionConfigurationPlatforms) = preSolution 21 GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/api/burn/appveyor.cmd b/src/api/burn/appveyor.cmd
deleted file mode 100644
index 26f75243..00000000
--- a/src/api/burn/appveyor.cmd
+++ /dev/null
@@ -1,27 +0,0 @@
1@setlocal
2@pushd %~dp0
3@set _C=Release
4@if /i "%1"=="debug" set _C=Debug
5
6nuget restore || exit /b
7
8msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 || exit /b
9msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 || exit /b
10
11msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 || exit /b
12msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 || exit /b
13msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 || exit /b
14
15msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 || exit /b
16msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 || exit /b
17msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 || exit /b
18
19dotnet test -c %_C% --no-build src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b
20
21msbuild -t:PackNative -p:Configuration=%_C% src\balutil\balutil.vcxproj || exit /b
22msbuild -t:PackNative -p:Configuration=%_C% src\bextutil\bextutil.vcxproj || exit /b
23msbuild -t:PackNative -p:Configuration=%_C% src\WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj || exit /b
24msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj || exit /b
25
26@popd
27@endlocal \ No newline at end of file
diff --git a/src/api/burn/appveyor.yml b/src/api/burn/appveyor.yml
deleted file mode 100644
index e4d25586..00000000
--- a/src/api/burn/appveyor.yml
+++ /dev/null
@@ -1,42 +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
24test: off
25
26pull_requests:
27 do_not_increment_build_number: true
28
29nuget:
30 disable_publish_on_pr: true
31
32skip_branch_with_pr: true
33skip_tags: true
34
35artifacts:
36- path: build\Release\**\*.nupkg
37 name: nuget
38
39notifications:
40- provider: Slack
41 incoming_webhook:
42 secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA=
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec
index e38362ec..82509140 100644
--- a/src/api/burn/balutil/balutil.nuspec
+++ b/src/api/burn/balutil/balutil.nuspec
@@ -1,31 +1,32 @@
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/balutil</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.BootstrapperCore.Native" version="[4,5)" /> 15 <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" />
15 <dependency id="WixToolset.DUtil" version="[4,5)" /> 16 <dependency id="WixToolset.DUtil" version="[4,5)" />
16 </dependencies> 17 </dependencies>
17 </metadata> 18 </metadata>
18 19
19 <files> 20 <files>
20 <file src="build\$id$.props" target="build\" /> 21 <file src="$projectFolder$\build\$id$.props" target="build\" />
21 <file src="inc\*" target="build\native\include" /> 22 <file src="$projectFolder$\inc\*" target="build\native\include" />
22 <file src="..\..\build\$configuration$\v140\x86\balutil.lib" target="build\native\v140\x86" /> 23 <!-- <file src="..\..\v140\x86\balutil.lib" target="build\native\v140\x86" />
23 <file src="..\..\build\$configuration$\v140\x64\balutil.lib" target="build\native\v140\x64" /> 24 <file src="..\..\v140\x64\balutil.lib" target="build\native\v140\x64" />
24 <file src="..\..\build\$configuration$\v141\x86\balutil.lib" target="build\native\v141\x86" /> 25 <file src="..\..\v141\x86\balutil.lib" target="build\native\v141\x86" />
25 <file src="..\..\build\$configuration$\v141\x64\balutil.lib" target="build\native\v141\x64" /> 26 <file src="..\..\v141\x64\balutil.lib" target="build\native\v141\x64" />
26 <file src="..\..\build\$configuration$\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" /> 27 <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" /> -->
27 <file src="..\..\build\$configuration$\v142\x86\balutil.lib" target="build\native\v142\x86" /> 28 <file src="..\..\v142\x86\balutil.lib" target="build\native\v142\x86" />
28 <file src="..\..\build\$configuration$\v142\x64\balutil.lib" target="build\native\v142\x64" /> 29 <file src="..\..\v142\x64\balutil.lib" target="build\native\v142\x64" />
29 <file src="..\..\build\$configuration$\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" /> 30 <file src="..\..\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" />
30 </files> 31 </files>
31</package> 32</package>
diff --git a/src/api/burn/balutil/balutil.vcxproj b/src/api/burn/balutil/balutil.vcxproj
index ab33f159..8f763324 100644
--- a/src/api/burn/balutil/balutil.vcxproj
+++ b/src/api/burn/balutil/balutil.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.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />
6 <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.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>
@@ -44,8 +41,7 @@
44 41
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
46 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 43 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
47 <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> 44 <Import Project="..\..\..\NativeMultiTargeting.Build.props" />
48 <Import Project="..\NativeMultiTargeting.Build.props" />
49 45
50 <ImportGroup Label="ExtensionSettings"> 46 <ImportGroup Label="ExtensionSettings">
51 </ImportGroup> 47 </ImportGroup>
@@ -54,7 +50,7 @@
54 </ImportGroup> 50 </ImportGroup>
55 51
56 <PropertyGroup> 52 <PropertyGroup>
57 <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\inc</ProjectAdditionalIncludeDirectories> 53 <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories>
58 </PropertyGroup> 54 </PropertyGroup>
59 55
60 <ItemGroup> 56 <ItemGroup>
@@ -86,16 +82,11 @@
86 </ItemGroup> 82 </ItemGroup>
87 83
88 <ItemGroup> 84 <ItemGroup>
89 <None Include="packages.config" /> 85 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
86 <PackageReference Include="GitInfo" PrivateAssets="All" />
87
88 <PackageReference Include="WixToolset.DUtil" />
90 </ItemGroup> 89 </ItemGroup>
91 90
92 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 91 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
93 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 92</Project>
94 <PropertyGroup>
95 <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>
96 </PropertyGroup>
97 <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'))" />
98 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
99 <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />
100 </Target>
101</Project> \ No newline at end of file
diff --git a/src/api/burn/balutil/packages.config b/src/api/burn/balutil/packages.config
deleted file mode 100644
index 08ea3364..00000000
--- a/src/api/burn/balutil/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<packages>
3 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
4 <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
5 <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
6</packages> \ No newline at end of file
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index 752dbb97..e75c4a43 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -1,31 +1,32 @@
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/balutil</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.BootstrapperCore.Native" version="[4,5)" /> 15 <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" />
15 <dependency id="WixToolset.DUtil" version="[4,5)" /> 16 <dependency id="WixToolset.DUtil" version="[4,5)" />
16 </dependencies> 17 </dependencies>
17 </metadata> 18 </metadata>
18 19
19 <files> 20 <files>
20 <file src="build\$id$.props" target="build\" /> 21 <file src="$projectFolder$\build\$id$.props" target="build\" />
21 <file src="inc\*" target="build\native\include" /> 22 <file src="$projectFolder$\inc\*" target="build\native\include" />
22 <file src="..\..\build\$configuration$\v140\x86\bextutil.lib" target="build\native\v140\x86" /> 23 <file src="..\..\v140\x86\bextutil.lib" target="build\native\v140\x86" />
23 <file src="..\..\build\$configuration$\v140\x64\bextutil.lib" target="build\native\v140\x64" /> 24 <file src="..\..\v140\x64\bextutil.lib" target="build\native\v140\x64" />
24 <file src="..\..\build\$configuration$\v141\x86\bextutil.lib" target="build\native\v141\x86" /> 25 <file src="..\..\v141\x86\bextutil.lib" target="build\native\v141\x86" />
25 <file src="..\..\build\$configuration$\v141\x64\bextutil.lib" target="build\native\v141\x64" /> 26 <file src="..\..\v141\x64\bextutil.lib" target="build\native\v141\x64" />
26 <file src="..\..\build\$configuration$\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" /> 27 <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" />
27 <file src="..\..\build\$configuration$\v142\x86\bextutil.lib" target="build\native\v142\x86" /> 28 <file src="..\..\v142\x86\bextutil.lib" target="build\native\v142\x86" />
28 <file src="..\..\build\$configuration$\v142\x64\bextutil.lib" target="build\native\v142\x64" /> 29 <file src="..\..\v142\x64\bextutil.lib" target="build\native\v142\x64" />
29 <file src="..\..\build\$configuration$\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" /> 30 <file src="..\..\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" />
30 </files> 31 </files>
31</package> 32</package>
diff --git a/src/api/burn/bextutil/bextutil.vcxproj b/src/api/burn/bextutil/bextutil.vcxproj
index b9334cf3..cbb83b96 100644
--- a/src/api/burn/bextutil/bextutil.vcxproj
+++ b/src/api/burn/bextutil/bextutil.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.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />
6 <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.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>
@@ -44,8 +41,7 @@
44 41
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
46 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 43 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
47 <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> 44 <Import Project="..\..\..\NativeMultiTargeting.Build.props" />
48 <Import Project="..\NativeMultiTargeting.Build.props" />
49 45
50 <ImportGroup Label="ExtensionSettings"> 46 <ImportGroup Label="ExtensionSettings">
51 </ImportGroup> 47 </ImportGroup>
@@ -54,7 +50,7 @@
54 </ImportGroup> 50 </ImportGroup>
55 51
56 <PropertyGroup> 52 <PropertyGroup>
57 <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\inc</ProjectAdditionalIncludeDirectories> 53 <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories>
58 </PropertyGroup> 54 </PropertyGroup>
59 55
60 <ItemGroup> 56 <ItemGroup>
@@ -75,16 +71,11 @@
75 </ItemGroup> 71 </ItemGroup>
76 72
77 <ItemGroup> 73 <ItemGroup>
78 <None Include="packages.config" /> 74 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
75 <PackageReference Include="GitInfo" PrivateAssets="All" />
76
77 <PackageReference Include="WixToolset.DUtil" />
79 </ItemGroup> 78 </ItemGroup>
80 79
81 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 80 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
82 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 81</Project>
83 <PropertyGroup>
84 <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>
85 </PropertyGroup>
86 <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'))" />
87 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
88 <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />
89 </Target>
90</Project> \ No newline at end of file
diff --git a/src/api/burn/bextutil/packages.config b/src/api/burn/bextutil/packages.config
deleted file mode 100644
index 08ea3364..00000000
--- a/src/api/burn/bextutil/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<packages>
3 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
4 <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
5 <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
6</packages> \ No newline at end of file
diff --git a/src/api/burn/mbanative/mbanative.vcxproj b/src/api/burn/mbanative/mbanative.vcxproj
index f91fe3be..af02f34e 100644
--- a/src/api/burn/mbanative/mbanative.vcxproj
+++ b/src/api/burn/mbanative/mbanative.vcxproj
@@ -2,12 +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.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />
6 <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
7 <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
8 <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
9 <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />
10
11 <ItemGroup Label="ProjectConfigurations"> 5 <ItemGroup Label="ProjectConfigurations">
12 <ProjectConfiguration Include="Debug|ARM64"> 6 <ProjectConfiguration Include="Debug|ARM64">
13 <Configuration>Debug</Configuration> 7 <Configuration>Debug</Configuration>
@@ -47,18 +41,10 @@
47 41
48 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 43 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
50 <Import Project="..\NativeMultiTargeting.Build.props" /> 44 <Import Project="..\..\..\NativeMultiTargeting.Build.props" />
51
52 <ImportGroup Label="Shared">
53 <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
54 <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
55 <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
56 <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
57 </ImportGroup>
58 45
59 <PropertyGroup> 46 <PropertyGroup>
60 <ProjectAdditionalIncludeDirectories>..\balutil\inc</ProjectAdditionalIncludeDirectories> 47 <ProjectAdditionalIncludeDirectories>..\balutil\inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories>
61 <ProjectAdditionalLinkLibraries>balutil.lib</ProjectAdditionalLinkLibraries>
62 </PropertyGroup> 48 </PropertyGroup>
63 49
64 <ItemGroup> 50 <ItemGroup>
@@ -75,28 +61,18 @@
75 </ItemGroup> 61 </ItemGroup>
76 62
77 <ItemGroup> 63 <ItemGroup>
78 <None Include="packages.config" />
79 </ItemGroup>
80
81 <ItemGroup>
82 <ProjectReference Include="..\balutil\balutil.vcxproj"> 64 <ProjectReference Include="..\balutil\balutil.vcxproj">
83 <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project> 65 <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project>
66 <Properties>Configuration=$(Configuration);Platform=$(Platform)</Properties>
84 </ProjectReference> 67 </ProjectReference>
85 </ItemGroup> 68 </ItemGroup>
86 69
70 <ItemGroup>
71 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
72 <PackageReference Include="GitInfo" PrivateAssets="All" />
73
74 <PackageReference Include="WixToolset.DUtil" />
75 </ItemGroup>
76
87 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 77 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
88 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 78</Project>
89 <PropertyGroup>
90 <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>
91 </PropertyGroup>
92 <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
93 <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
94 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" />
95 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
96 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
97 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
98 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
99 <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'))" />
100 <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />
101 </Target>
102</Project> \ No newline at end of file
diff --git a/src/api/burn/mbanative/packages.config b/src/api/burn/mbanative/packages.config
deleted file mode 100644
index 745fcae9..00000000
--- a/src/api/burn/mbanative/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<packages>
3 <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
4 <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
5 <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
6 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
7 <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
8 <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
9</packages> \ No newline at end of file
diff --git a/src/api/burn/nuget.config b/src/api/burn/nuget.config
deleted file mode 100644
index 2c6c5608..00000000
--- a/src/api/burn/nuget.config
+++ /dev/null
@@ -1,10 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<configuration>
3 <packageSources>
4 <clear />
5 <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" />
6 <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" />
7 <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" />
8 <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
9 </packageSources>
10</configuration> \ No newline at end of file
diff --git a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
index d3a81e2a..345c324c 100644
--- a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
+++ b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
@@ -3,9 +3,8 @@
3 3
4 4
5<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 5<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6 <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> 6 <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" />
7 <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" /> 7
8 <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />
9 <ItemGroup Label="ProjectConfigurations"> 8 <ItemGroup Label="ProjectConfigurations">
10 <ProjectConfiguration Include="Debug|Win32"> 9 <ProjectConfiguration Include="Debug|Win32">
11 <Configuration>Debug</Configuration> 10 <Configuration>Debug</Configuration>
@@ -16,6 +15,7 @@
16 <Platform>Win32</Platform> 15 <Platform>Win32</Platform>
17 </ProjectConfiguration> 16 </ProjectConfiguration>
18 </ItemGroup> 17 </ItemGroup>
18
19 <PropertyGroup Label="Globals"> 19 <PropertyGroup Label="Globals">
20 <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> 20 <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
21 <ProjectGuid>{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}</ProjectGuid> 21 <ProjectGuid>{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}</ProjectGuid>
@@ -26,12 +26,15 @@
26 <CLRSupport>true</CLRSupport> 26 <CLRSupport>true</CLRSupport>
27 <SignOutput>false</SignOutput> 27 <SignOutput>false</SignOutput>
28 </PropertyGroup> 28 </PropertyGroup>
29
29 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 30 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
30 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 31 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
32
31 <PropertyGroup> 33 <PropertyGroup>
32 <ProjectAdditionalIncludeDirectories>..\..\balutil\inc</ProjectAdditionalIncludeDirectories> 34 <ProjectAdditionalIncludeDirectories>..\..\balutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
33 <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries> 35 <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
34 </PropertyGroup> 36 </PropertyGroup>
37
35 <ItemGroup> 38 <ItemGroup>
36 <ClCompile Include="precomp.cpp"> 39 <ClCompile Include="precomp.cpp">
37 <PrecompiledHeader>Create</PrecompiledHeader> 40 <PrecompiledHeader>Create</PrecompiledHeader>
@@ -41,36 +44,17 @@
41 <ClCompile Include="TestBAFunctions.cpp" /> 44 <ClCompile Include="TestBAFunctions.cpp" />
42 <ClCompile Include="TestBootstrapperApplication.cpp" /> 45 <ClCompile Include="TestBootstrapperApplication.cpp" />
43 </ItemGroup> 46 </ItemGroup>
47
44 <ItemGroup> 48 <ItemGroup>
45 <ClInclude Include="precomp.h" /> 49 <ClInclude Include="precomp.h" />
46 </ItemGroup> 50 </ItemGroup>
47 <ItemGroup> 51
48 <None Include="packages.config" />
49 </ItemGroup>
50 <ItemGroup>
51 <Reference Include="System" />
52 <Reference Include="System.Core" />
53 <Reference Include="WixBuildTools.TestSupport">
54 <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath>
55 </Reference>
56 <Reference Include="WixBuildTools.TestSupport.Native">
57 <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>
58 </Reference>
59 </ItemGroup>
60 <ItemGroup> 52 <ItemGroup>
61 <ProjectReference Include="..\..\balutil\balutil.vcxproj"> 53 <ProjectReference Include="..\..\balutil\balutil.vcxproj">
62 <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project> 54 <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project>
63 </ProjectReference> 55 </ProjectReference>
64 </ItemGroup> 56 </ItemGroup>
57
65 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 58 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
66 <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" /> 59 <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" />
67 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 60</Project>
68 <PropertyGroup>
69 <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>
70 </PropertyGroup>
71 <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" />
72 <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" />
73 <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'))" />
74 <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />
75 </Target>
76</Project> \ No newline at end of file
diff --git a/src/api/burn/test/BalUtilUnitTest/packages.config b/src/api/burn/test/BalUtilUnitTest/packages.config
deleted file mode 100644
index 6d381fbe..00000000
--- a/src/api/burn/test/BalUtilUnitTest/packages.config
+++ /dev/null
@@ -1,15 +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<packages>
4 <package id="WixBuildTools.TestSupport" version="4.0.50" />
5 <package id="WixBuildTools.TestSupport.Native" version="4.0.50" />
6 <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
7 <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
8 <package id="xunit.abstractions" version="2.0.3" />
9 <package id="xunit.assert" version="2.4.1" />
10 <package id="xunit.core" version="2.4.1" />
11 <package id="xunit.extensibility.core" version="2.4.1" />
12 <package id="xunit.extensibility.execution" version="2.4.1" />
13 <package id="xunit.runner.msbuild" version="2.4.1" />
14 <package id="xunit.runner.visualstudio" version="2.4.1" />
15</packages> \ No newline at end of file
diff --git a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
index a9937894..fc31ce57 100644
--- a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
+++ b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
@@ -1,11 +1,9 @@
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
5<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">
6 <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> 5 <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" />
7 <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" /> 6
8 <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />
9 <ItemGroup Label="ProjectConfigurations"> 7 <ItemGroup Label="ProjectConfigurations">
10 <ProjectConfiguration Include="Debug|Win32"> 8 <ProjectConfiguration Include="Debug|Win32">
11 <Configuration>Debug</Configuration> 9 <Configuration>Debug</Configuration>
@@ -16,6 +14,7 @@
16 <Platform>Win32</Platform> 14 <Platform>Win32</Platform>
17 </ProjectConfiguration> 15 </ProjectConfiguration>
18 </ItemGroup> 16 </ItemGroup>
17
19 <PropertyGroup Label="Globals"> 18 <PropertyGroup Label="Globals">
20 <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> 19 <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
21 <ProjectGuid>{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}</ProjectGuid> 20 <ProjectGuid>{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}</ProjectGuid>
@@ -26,12 +25,15 @@
26 <CLRSupport>true</CLRSupport> 25 <CLRSupport>true</CLRSupport>
27 <SignOutput>false</SignOutput> 26 <SignOutput>false</SignOutput>
28 </PropertyGroup> 27 </PropertyGroup>
28
29 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 29 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
30 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 30 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31
31 <PropertyGroup> 32 <PropertyGroup>
32 <ProjectAdditionalIncludeDirectories>..\..\bextutil\inc</ProjectAdditionalIncludeDirectories> 33 <ProjectAdditionalIncludeDirectories>..\..\bextutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
33 <ProjectAdditionalLinkLibraries></ProjectAdditionalLinkLibraries> 34 <ProjectAdditionalLinkLibraries>$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
34 </PropertyGroup> 35 </PropertyGroup>
36
35 <ItemGroup> 37 <ItemGroup>
36 <ClCompile Include="precomp.cpp"> 38 <ClCompile Include="precomp.cpp">
37 <PrecompiledHeader>Create</PrecompiledHeader> 39 <PrecompiledHeader>Create</PrecompiledHeader>
@@ -40,36 +42,17 @@
40 </ClCompile> 42 </ClCompile>
41 <ClCompile Include="TestBundleExtension.cpp" /> 43 <ClCompile Include="TestBundleExtension.cpp" />
42 </ItemGroup> 44 </ItemGroup>
45
43 <ItemGroup> 46 <ItemGroup>
44 <ClInclude Include="precomp.h" /> 47 <ClInclude Include="precomp.h" />
45 </ItemGroup> 48 </ItemGroup>
49
46 <ItemGroup> 50 <ItemGroup>
47 <None Include="packages.config" /> 51 <ProjectReference Include="..\..\bextutil\bextutil.vcxproj">
48 </ItemGroup>
49 <ItemGroup>
50 <Reference Include="System" />
51 <Reference Include="System.Core" />
52 <Reference Include="WixBuildTools.TestSupport">
53 <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath>
54 </Reference>
55 <Reference Include="WixBuildTools.TestSupport.Native">
56 <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>
57 </Reference>
58 </ItemGroup>
59 <ItemGroup>
60 <ProjectReference Include="..\..\balutil\balutil.vcxproj">
61 <Project>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</Project> 52 <Project>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</Project>
62 </ProjectReference> 53 </ProjectReference>
63 </ItemGroup> 54 </ItemGroup>
55
64 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 56 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
65 <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" /> 57 <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" />
66 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 58</Project>
67 <PropertyGroup>
68 <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>
69 </PropertyGroup>
70 <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" />
71 <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" />
72 <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'))" />
73 <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />
74 </Target>
75</Project> \ No newline at end of file
diff --git a/src/api/burn/test/BextUtilUnitTest/packages.config b/src/api/burn/test/BextUtilUnitTest/packages.config
deleted file mode 100644
index 6d381fbe..00000000
--- a/src/api/burn/test/BextUtilUnitTest/packages.config
+++ /dev/null
@@ -1,15 +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<packages>
4 <package id="WixBuildTools.TestSupport" version="4.0.50" />
5 <package id="WixBuildTools.TestSupport.Native" version="4.0.50" />
6 <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
7 <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
8 <package id="xunit.abstractions" version="2.0.3" />
9 <package id="xunit.assert" version="2.4.1" />
10 <package id="xunit.core" version="2.4.1" />
11 <package id="xunit.extensibility.core" version="2.4.1" />
12 <package id="xunit.extensibility.execution" version="2.4.1" />
13 <package id="xunit.runner.msbuild" version="2.4.1" />
14 <package id="xunit.runner.visualstudio" version="2.4.1" />
15</packages> \ No newline at end of file
diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
index 53d82f7e..bdb6a829 100644
--- a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+++ b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
@@ -14,8 +14,7 @@
14 </ItemGroup> 14 </ItemGroup>
15 15
16 <ItemGroup> 16 <ItemGroup>
17 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> 17 <PackageReference Include="xunit" />
18 <PackageReference Include="xunit" Version="2.4.1" /> 18 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
19 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
20 </ItemGroup> 19 </ItemGroup>
21</Project> 20</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-25 02:11:38 +0000