diff options
Diffstat (limited to 'src/api')
-rw-r--r-- | src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj | 8 | ||||
-rw-r--r-- | src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec | 12 | ||||
-rw-r--r-- | src/api/burn/balutil/balutil.nuspec | 11 | ||||
-rw-r--r-- | src/api/burn/balutil/balutil.vcxproj | 1 | ||||
-rw-r--r-- | src/api/burn/balutil/build/WixToolset.BalUtil.props | 14 | ||||
-rw-r--r-- | src/api/burn/bextutil/bextutil.nuspec | 11 | ||||
-rw-r--r-- | src/api/burn/bextutil/bextutil.vcxproj | 1 | ||||
-rw-r--r-- | src/api/burn/bextutil/build/WixToolset.BextUtil.props | 14 | ||||
-rw-r--r-- | src/api/burn/burn.proj | 14 | ||||
-rw-r--r-- | src/api/burn/mbanative/mbanative.vcxproj | 2 |
10 files changed, 23 insertions, 65 deletions
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 ce8c7105..4161f7f0 100644 --- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj +++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj | |||
@@ -18,11 +18,11 @@ | |||
18 | </ItemGroup> | 18 | </ItemGroup> |
19 | 19 | ||
20 | <ItemGroup Condition=" '$(NCrunch)'=='' "> | 20 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
21 | <None Include="$(BaseOutputPath)$(Configuration)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" /> | 21 | <None Include="$(BaseOutputPath)$(Configuration)\v143\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" /> |
22 | <None Include="$(BaseOutputPath)$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" /> | 22 | <None Include="$(BaseOutputPath)$(Configuration)\v143\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" /> |
23 | </ItemGroup> | 23 | </ItemGroup> |
24 | <ItemGroup Condition=" '$(NCrunch)'=='1' "> | 24 | <ItemGroup Condition=" '$(NCrunch)'=='1' "> |
25 | <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" /> | 25 | <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v143\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" /> |
26 | <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" /> | 26 | <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v143\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" /> |
27 | </ItemGroup> | 27 | </ItemGroup> |
28 | </Project> | 28 | </Project> |
diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec index a5e09ea9..504496ae 100644 --- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec +++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec | |||
@@ -23,11 +23,11 @@ | |||
23 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> | 23 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> |
24 | <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" /> | 24 | <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" /> |
25 | 25 | ||
26 | <file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" /> | 26 | <file src="v143\ARM64\mbanative.dll" target="runtimes\win-arm64\native" /> |
27 | <file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" /> | 27 | <file src="v143\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" /> |
28 | <file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" /> | 28 | <file src="v143\x64\mbanative.dll" target="runtimes\win-x64\native" /> |
29 | <file src="v142\x64\mbanative.pdb" target="runtimes\win-x64\native" /> | 29 | <file src="v143\x64\mbanative.pdb" target="runtimes\win-x64\native" /> |
30 | <file src="v142\x86\mbanative.dll" target="runtimes\win-x86\native" /> | 30 | <file src="v143\x86\mbanative.dll" target="runtimes\win-x86\native" /> |
31 | <file src="v142\x86\mbanative.pdb" target="runtimes\win-x86\native" /> | 31 | <file src="v143\x86\mbanative.pdb" target="runtimes\win-x86\native" /> |
32 | </files> | 32 | </files> |
33 | </package> | 33 | </package> |
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec index 2474b2ea..d89dbe22 100644 --- a/src/api/burn/balutil/balutil.nuspec +++ b/src/api/burn/balutil/balutil.nuspec | |||
@@ -20,13 +20,8 @@ | |||
20 | <files> | 20 | <files> |
21 | <file src="$projectFolder$\build\$id$.props" target="build\" /> | 21 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
22 | <file src="$projectFolder$\inc\*" target="build\native\include" /> | 22 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
23 | <file src="..\..\v140\x86\balutil.lib" target="build\native\v140\x86" /> | 23 | <file src="..\..\v143\x86\balutil.lib" target="build\native\v14\x86" /> |
24 | <file src="..\..\v140\x64\balutil.lib" target="build\native\v140\x64" /> | 24 | <file src="..\..\v143\x64\balutil.lib" target="build\native\v14\x64" /> |
25 | <file src="..\..\v141\x86\balutil.lib" target="build\native\v141\x86" /> | 25 | <file src="..\..\v143\ARM64\balutil.lib" target="build\native\v14\ARM64" /> |
26 | <file src="..\..\v141\x64\balutil.lib" target="build\native\v141\x64" /> | ||
27 | <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" /> | ||
28 | <file src="..\..\v142\x86\balutil.lib" target="build\native\v142\x86" /> | ||
29 | <file src="..\..\v142\x64\balutil.lib" target="build\native\v142\x64" /> | ||
30 | <file src="..\..\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" /> | ||
31 | </files> | 26 | </files> |
32 | </package> | 27 | </package> |
diff --git a/src/api/burn/balutil/balutil.vcxproj b/src/api/burn/balutil/balutil.vcxproj index 8f763324..42a86fd1 100644 --- a/src/api/burn/balutil/balutil.vcxproj +++ b/src/api/burn/balutil/balutil.vcxproj | |||
@@ -33,7 +33,6 @@ | |||
33 | <ProjectGuid>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</ProjectGuid> | 33 | <ProjectGuid>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</ProjectGuid> |
34 | <ConfigurationType>StaticLibrary</ConfigurationType> | 34 | <ConfigurationType>StaticLibrary</ConfigurationType> |
35 | <TargetName>balutil</TargetName> | 35 | <TargetName>balutil</TargetName> |
36 | <PlatformToolset>v142</PlatformToolset> | ||
37 | <CharacterSet>MultiByte</CharacterSet> | 36 | <CharacterSet>MultiByte</CharacterSet> |
38 | <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description> | 37 | <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description> |
39 | <PackageId>WixToolset.BalUtil</PackageId> | 38 | <PackageId>WixToolset.BalUtil</PackageId> |
diff --git a/src/api/burn/balutil/build/WixToolset.BalUtil.props b/src/api/burn/balutil/build/WixToolset.BalUtil.props index 45b97f6a..b276574d 100644 --- a/src/api/burn/balutil/build/WixToolset.BalUtil.props +++ b/src/api/burn/balutil/build/WixToolset.BalUtil.props | |||
@@ -10,19 +10,9 @@ | |||
10 | <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 10 | <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
11 | </ResourceCompile> | 11 | </ResourceCompile> |
12 | </ItemDefinitionGroup> | 12 | </ItemDefinitionGroup> |
13 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) "> | 13 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v14')) "> |
14 | <Link> | 14 | <Link> |
15 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | 15 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies> |
16 | </Link> | ||
17 | </ItemDefinitionGroup> | ||
18 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) "> | ||
19 | <Link> | ||
20 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
21 | </Link> | ||
22 | </ItemDefinitionGroup> | ||
23 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) "> | ||
24 | <Link> | ||
25 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
26 | </Link> | 16 | </Link> |
27 | </ItemDefinitionGroup> | 17 | </ItemDefinitionGroup> |
28 | </Project> | 18 | </Project> |
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec index e75c4a43..747cb8b1 100644 --- a/src/api/burn/bextutil/bextutil.nuspec +++ b/src/api/burn/bextutil/bextutil.nuspec | |||
@@ -20,13 +20,8 @@ | |||
20 | <files> | 20 | <files> |
21 | <file src="$projectFolder$\build\$id$.props" target="build\" /> | 21 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
22 | <file src="$projectFolder$\inc\*" target="build\native\include" /> | 22 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
23 | <file src="..\..\v140\x86\bextutil.lib" target="build\native\v140\x86" /> | 23 | <file src="..\..\v143\x86\bextutil.lib" target="build\native\v14\x86" /> |
24 | <file src="..\..\v140\x64\bextutil.lib" target="build\native\v140\x64" /> | 24 | <file src="..\..\v143\x64\bextutil.lib" target="build\native\v14\x64" /> |
25 | <file src="..\..\v141\x86\bextutil.lib" target="build\native\v141\x86" /> | 25 | <file src="..\..\v143\ARM64\bextutil.lib" target="build\native\v14\ARM64" /> |
26 | <file src="..\..\v141\x64\bextutil.lib" target="build\native\v141\x64" /> | ||
27 | <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" /> | ||
28 | <file src="..\..\v142\x86\bextutil.lib" target="build\native\v142\x86" /> | ||
29 | <file src="..\..\v142\x64\bextutil.lib" target="build\native\v142\x64" /> | ||
30 | <file src="..\..\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" /> | ||
31 | </files> | 26 | </files> |
32 | </package> | 27 | </package> |
diff --git a/src/api/burn/bextutil/bextutil.vcxproj b/src/api/burn/bextutil/bextutil.vcxproj index cbb83b96..6af9cd56 100644 --- a/src/api/burn/bextutil/bextutil.vcxproj +++ b/src/api/burn/bextutil/bextutil.vcxproj | |||
@@ -33,7 +33,6 @@ | |||
33 | <ProjectGuid>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</ProjectGuid> | 33 | <ProjectGuid>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</ProjectGuid> |
34 | <ConfigurationType>StaticLibrary</ConfigurationType> | 34 | <ConfigurationType>StaticLibrary</ConfigurationType> |
35 | <TargetName>bextutil</TargetName> | 35 | <TargetName>bextutil</TargetName> |
36 | <PlatformToolset>v142</PlatformToolset> | ||
37 | <CharacterSet>MultiByte</CharacterSet> | 36 | <CharacterSet>MultiByte</CharacterSet> |
38 | <Description>WiX Toolset Bundle Extension native utility library</Description> | 37 | <Description>WiX Toolset Bundle Extension native utility library</Description> |
39 | <PackageId>WixToolset.BextUtil</PackageId> | 38 | <PackageId>WixToolset.BextUtil</PackageId> |
diff --git a/src/api/burn/bextutil/build/WixToolset.BextUtil.props b/src/api/burn/bextutil/build/WixToolset.BextUtil.props index 60a2db54..dbaddb70 100644 --- a/src/api/burn/bextutil/build/WixToolset.BextUtil.props +++ b/src/api/burn/bextutil/build/WixToolset.BextUtil.props | |||
@@ -10,19 +10,9 @@ | |||
10 | <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 10 | <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
11 | </ResourceCompile> | 11 | </ResourceCompile> |
12 | </ItemDefinitionGroup> | 12 | </ItemDefinitionGroup> |
13 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) "> | 13 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v14')) "> |
14 | <Link> | 14 | <Link> |
15 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | 15 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies> |
16 | </Link> | ||
17 | </ItemDefinitionGroup> | ||
18 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) "> | ||
19 | <Link> | ||
20 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
21 | </Link> | ||
22 | </ItemDefinitionGroup> | ||
23 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) "> | ||
24 | <Link> | ||
25 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
26 | </Link> | 16 | </Link> |
27 | </ItemDefinitionGroup> | 17 | </ItemDefinitionGroup> |
28 | </Project> | 18 | </Project> |
diff --git a/src/api/burn/burn.proj b/src/api/burn/burn.proj index 0aa838bf..49bd2876 100644 --- a/src/api/burn/burn.proj +++ b/src/api/burn/burn.proj | |||
@@ -1,3 +1,6 @@ | |||
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 | |||
1 | <Project Sdk="Microsoft.Build.Traversal/3.0.23"> | 4 | <Project Sdk="Microsoft.Build.Traversal/3.0.23"> |
2 | <ItemGroup> | 5 | <ItemGroup> |
3 | <!-- Restore: Explicitly restore the test projects, which need some hand-holding. --> | 6 | <!-- Restore: Explicitly restore the test projects, which need some hand-holding. --> |
@@ -6,21 +9,10 @@ | |||
6 | 9 | ||
7 | <!-- Build --> | 10 | <!-- Build --> |
8 | 11 | ||
9 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" /> | ||
10 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" /> | ||
11 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" /> | ||
12 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" /> | ||
13 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" /> | ||
14 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86" /> | 12 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86" /> |
15 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64" /> | 13 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64" /> |
16 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64" /> | 14 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64" /> |
17 | 15 | ||
18 | <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" /> | ||
19 | <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" /> | ||
20 | <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" /> | ||
21 | <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" /> | ||
22 | <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" /> | ||
23 | |||
24 | <!-- Let mbanative build balutil for latest toolset. --> | 16 | <!-- Let mbanative build balutil for latest toolset. --> |
25 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86" /> | 17 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86" /> |
26 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64" /> | 18 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64" /> |
diff --git a/src/api/burn/mbanative/mbanative.vcxproj b/src/api/burn/mbanative/mbanative.vcxproj index af02f34e..e6376ca7 100644 --- a/src/api/burn/mbanative/mbanative.vcxproj +++ b/src/api/burn/mbanative/mbanative.vcxproj | |||
@@ -32,11 +32,9 @@ | |||
32 | <PropertyGroup Label="Globals"> | 32 | <PropertyGroup Label="Globals"> |
33 | <ProjectGuid>{665E0441-17F9-4105-B202-EDF274657F6E}</ProjectGuid> | 33 | <ProjectGuid>{665E0441-17F9-4105-B202-EDF274657F6E}</ProjectGuid> |
34 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
35 | <PlatformToolset>v142</PlatformToolset> | ||
36 | <CharacterSet>Unicode</CharacterSet> | 35 | <CharacterSet>Unicode</CharacterSet> |
37 | <TargetName>mbanative</TargetName> | 36 | <TargetName>mbanative</TargetName> |
38 | <ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile> | 37 | <ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile> |
39 | <EnableSourceLink Condition=" '$(PlatformToolset)'=='v140' ">false</EnableSourceLink> | ||
40 | </PropertyGroup> | 38 | </PropertyGroup> |
41 | 39 | ||
42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 40 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |