diff options
Diffstat (limited to 'src')
59 files changed, 118 insertions, 188 deletions
diff --git a/src/Directory.vcxproj.props b/src/Directory.vcxproj.props index 95f828ec..3cd406e4 100644 --- a/src/Directory.vcxproj.props +++ b/src/Directory.vcxproj.props | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | <PlatformFolder Condition=" '$(PlatformFolder)' == '' ">$(Platform)</PlatformFolder> | 8 | <PlatformFolder Condition=" '$(PlatformFolder)' == '' ">$(Platform)</PlatformFolder> |
| 9 | <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformFolder)\</IntDir> | 9 | <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformFolder)\</IntDir> |
| 10 | <OutDir>$(OutputPath)$(PlatformFolder)\</OutDir> | 10 | <OutDir>$(OutputPath)$(PlatformFolder)\</OutDir> |
| 11 | <PlatformToolset>v143</PlatformToolset> | ||
| 11 | </PropertyGroup> | 12 | </PropertyGroup> |
| 12 | 13 | ||
| 13 | <PropertyGroup Condition=" '$(CLRSupport)'!='true' "> | 14 | <PropertyGroup Condition=" '$(CLRSupport)'!='true' "> |
| @@ -15,10 +16,6 @@ | |||
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | 16 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> |
| 16 | </PropertyGroup> | 17 | </PropertyGroup> |
| 17 | 18 | ||
| 18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 19 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 20 | </PropertyGroup> | ||
| 21 | |||
| 22 | <PropertyGroup> | 19 | <PropertyGroup> |
| 23 | <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet> | 20 | <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet> |
| 24 | </PropertyGroup> | 21 | </PropertyGroup> |
| @@ -35,8 +32,7 @@ | |||
| 35 | <TreatWarningAsError>true</TreatWarningAsError> | 32 | <TreatWarningAsError>true</TreatWarningAsError> |
| 36 | <ExceptionHandling>false</ExceptionHandling> | 33 | <ExceptionHandling>false</ExceptionHandling> |
| 37 | <ControlFlowGuard>Guard</ControlFlowGuard> | 34 | <ControlFlowGuard>Guard</ControlFlowGuard> |
| 38 | <AdditionalOptions>-YlprecompDefine /w44263</AdditionalOptions> | 35 | <AdditionalOptions>/Zc:threadSafeInit- -YlprecompDefine /w44263</AdditionalOptions> |
| 39 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 40 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | 36 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> |
| 41 | </ClCompile> | 37 | </ClCompile> |
| 42 | <ResourceCompile> | 38 | <ResourceCompile> |
| @@ -53,7 +49,7 @@ | |||
| 53 | <GenerateDebugInformation>true</GenerateDebugInformation> | 49 | <GenerateDebugInformation>true</GenerateDebugInformation> |
| 54 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | 50 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 55 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 51 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| 56 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | 52 | <AdditionalOptions>/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> |
| 57 | </Link> | 53 | </Link> |
| 58 | </ItemDefinitionGroup> | 54 | </ItemDefinitionGroup> |
| 59 | 55 | ||
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" /> |
diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj index 0062df8c..ae28d728 100644 --- a/src/burn/engine/engine.vcxproj +++ b/src/burn/engine/engine.vcxproj | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | <ProjectGuid>{8119537D-E1D9-6591-D51A-49768A2F9C37}</ProjectGuid> | 33 | <ProjectGuid>{8119537D-E1D9-6591-D51A-49768A2F9C37}</ProjectGuid> |
| 34 | <ConfigurationType>StaticLibrary</ConfigurationType> | 34 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 35 | <TargetName>engine</TargetName> | 35 | <TargetName>engine</TargetName> |
| 36 | <PlatformToolset>v142</PlatformToolset> | ||
| 37 | <CharacterSet>Unicode</CharacterSet> | 36 | <CharacterSet>Unicode</CharacterSet> |
| 38 | <Description>Native component of WixToolset.Burn</Description> | 37 | <Description>Native component of WixToolset.Burn</Description> |
| 39 | </PropertyGroup> | 38 | </PropertyGroup> |
diff --git a/src/burn/stub/stub.vcxproj b/src/burn/stub/stub.vcxproj index e7bdf6e3..d73b9f49 100644 --- a/src/burn/stub/stub.vcxproj +++ b/src/burn/stub/stub.vcxproj | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | <ConfigurationType>Application</ConfigurationType> | 34 | <ConfigurationType>Application</ConfigurationType> |
| 35 | <ProjectSubSystem>Windows</ProjectSubSystem> | 35 | <ProjectSubSystem>Windows</ProjectSubSystem> |
| 36 | <TargetName>burn</TargetName> | 36 | <TargetName>burn</TargetName> |
| 37 | <PlatformToolset>v142</PlatformToolset> | ||
| 38 | <CharacterSet>Unicode</CharacterSet> | 37 | <CharacterSet>Unicode</CharacterSet> |
| 39 | <GenerateManifest>false</GenerateManifest> | 38 | <GenerateManifest>false</GenerateManifest> |
| 40 | <Description>Native component of WixToolset.Burn</Description> | 39 | <Description>Native component of WixToolset.Burn</Description> |
diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj index 85481821..33e75da6 100644 --- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj +++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | <RootNamespace>UnitTest</RootNamespace> | 29 | <RootNamespace>UnitTest</RootNamespace> |
| 30 | <Keyword>ManagedCProj</Keyword> | 30 | <Keyword>ManagedCProj</Keyword> |
| 31 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 31 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 32 | <PlatformToolset>v142</PlatformToolset> | ||
| 33 | <CharacterSet>Unicode</CharacterSet> | 32 | <CharacterSet>Unicode</CharacterSet> |
| 34 | <CLRSupport>true</CLRSupport> | 33 | <CLRSupport>true</CLRSupport> |
| 35 | <SignOutput>false</SignOutput> | 34 | <SignOutput>false</SignOutput> |
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj index 08a88b30..bacfd90c 100644 --- a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj +++ b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj | |||
| @@ -18,4 +18,8 @@ | |||
| 18 | <ItemGroup> | 18 | <ItemGroup> |
| 19 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> | 19 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | |||
| 22 | <ItemGroup> | ||
| 23 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 24 | </ItemGroup> | ||
| 21 | </Project> | 25 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj index aa97019d..476b63b0 100644 --- a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj +++ b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj | |||
| @@ -13,4 +13,8 @@ | |||
| 13 | <ItemGroup> | 13 | <ItemGroup> |
| 14 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> | 14 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | |||
| 17 | <ItemGroup> | ||
| 18 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 19 | </ItemGroup> | ||
| 16 | </Project> | 20 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj index 907e7a04..c3d36d29 100644 --- a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj +++ b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj | |||
| @@ -13,4 +13,8 @@ | |||
| 13 | <ItemGroup> | 13 | <ItemGroup> |
| 14 | <None Include="Compression.cd" /> | 14 | <None Include="Compression.cd" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | |||
| 17 | <ItemGroup> | ||
| 18 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 19 | </ItemGroup> | ||
| 16 | </Project> | 20 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj index 89bff841..411457a6 100644 --- a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj +++ b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj | |||
| @@ -9,4 +9,8 @@ | |||
| 9 | <Description>Classes for reading and writing resource data in executable files</Description> | 9 | <Description>Classes for reading and writing resource data in executable files</Description> |
| 10 | <CreateDocumentationFile>true</CreateDocumentationFile> | 10 | <CreateDocumentationFile>true</CreateDocumentationFile> |
| 11 | </PropertyGroup> | 11 | </PropertyGroup> |
| 12 | |||
| 13 | <ItemGroup> | ||
| 14 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 15 | </ItemGroup> | ||
| 12 | </Project> | 16 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj index fbc85880..7aa376bb 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj | |||
| @@ -13,4 +13,8 @@ | |||
| 13 | <ItemGroup> | 13 | <ItemGroup> |
| 14 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" /> | 14 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | |||
| 17 | <ItemGroup> | ||
| 18 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 19 | </ItemGroup> | ||
| 16 | </Project> | 20 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj index b3952177..9e0b1a40 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj | |||
| @@ -15,4 +15,8 @@ | |||
| 15 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> | 15 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> |
| 16 | <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" /> | 16 | <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | |||
| 19 | <ItemGroup> | ||
| 20 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 21 | </ItemGroup> | ||
| 18 | </Project> | 22 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj index 117a4114..324a7eed 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj | |||
| @@ -22,4 +22,8 @@ | |||
| 22 | <ItemGroup Condition=" '$(TargetFramework)'=='net20' "> | 22 | <ItemGroup Condition=" '$(TargetFramework)'=='net20' "> |
| 23 | <Reference Include="System.Configuration" /> | 23 | <Reference Include="System.Configuration" /> |
| 24 | </ItemGroup> | 24 | </ItemGroup> |
| 25 | |||
| 26 | <ItemGroup> | ||
| 27 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 28 | </ItemGroup> | ||
| 25 | </Project> | 29 | </Project> |
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj index ddcf68ac..9cd09e12 100644 --- a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj +++ b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj | |||
| @@ -11,18 +11,18 @@ | |||
| 11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
| 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <Compile Include="CabTest.cs" /> | 16 | <Compile Include="CabTest.cs" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <Reference Include="System" /> | 20 | <Reference Include="System" /> |
| 21 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | 21 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> |
| 22 | <Reference Include="System.Data" /> | 22 | <Reference Include="System.Data" /> |
| 23 | <Reference Include="System.Xml" /> | 23 | <Reference Include="System.Xml" /> |
| 24 | </ItemGroup> | 24 | </ItemGroup> |
| 25 | 25 | ||
| 26 | <ItemGroup> | 26 | <ItemGroup> |
| 27 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> | 27 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> |
| 28 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> | 28 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> |
| @@ -38,5 +38,9 @@ | |||
| 38 | </ProjectReference> | 38 | </ProjectReference> |
| 39 | </ItemGroup> | 39 | </ItemGroup> |
| 40 | 40 | ||
| 41 | <ItemGroup> | ||
| 42 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 43 | </ItemGroup> | ||
| 44 | |||
| 41 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 45 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 42 | </Project> | 46 | </Project> \ No newline at end of file |
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj index 3e7fcb7e..4c7e48dc 100644 --- a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj +++ b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj | |||
| @@ -11,16 +11,16 @@ | |||
| 11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
| 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <Compile Include="ZipTest.cs" /> | 16 | <Compile Include="ZipTest.cs" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | 20 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> |
| 21 | <Reference Include="System" /> | 21 | <Reference Include="System" /> |
| 22 | </ItemGroup> | 22 | </ItemGroup> |
| 23 | 23 | ||
| 24 | <ItemGroup> | 24 | <ItemGroup> |
| 25 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> | 25 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> |
| 26 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> | 26 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> |
| @@ -36,5 +36,9 @@ | |||
| 36 | </ProjectReference> | 36 | </ProjectReference> |
| 37 | </ItemGroup> | 37 | </ItemGroup> |
| 38 | 38 | ||
| 39 | <ItemGroup> | ||
| 40 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 41 | </ItemGroup> | ||
| 42 | |||
| 39 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 43 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 40 | </Project> | 44 | </Project> \ No newline at end of file |
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj index 83040938..9ca24363 100644 --- a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj +++ b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj | |||
| @@ -10,20 +10,20 @@ | |||
| 10 | <SignOutput>false</SignOutput> | 10 | <SignOutput>false</SignOutput> |
| 11 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 11 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | 13 | ||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <Compile Include="CompressionTestUtil.cs" /> | 15 | <Compile Include="CompressionTestUtil.cs" /> |
| 16 | <Compile Include="MisbehavingStreamContext.cs" /> | 16 | <Compile Include="MisbehavingStreamContext.cs" /> |
| 17 | <Compile Include="OptionStreamContext.cs" /> | 17 | <Compile Include="OptionStreamContext.cs" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | 19 | ||
| 20 | <ItemGroup> | 20 | <ItemGroup> |
| 21 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | 21 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> |
| 22 | <Reference Include="System" /> | 22 | <Reference Include="System" /> |
| 23 | <Reference Include="System.Data" /> | 23 | <Reference Include="System.Data" /> |
| 24 | <Reference Include="System.Xml" /> | 24 | <Reference Include="System.Xml" /> |
| 25 | </ItemGroup> | 25 | </ItemGroup> |
| 26 | 26 | ||
| 27 | <ItemGroup> | 27 | <ItemGroup> |
| 28 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> | 28 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> |
| 29 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> | 29 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> |
| @@ -31,5 +31,9 @@ | |||
| 31 | </ProjectReference> | 31 | </ProjectReference> |
| 32 | </ItemGroup> | 32 | </ItemGroup> |
| 33 | 33 | ||
| 34 | <ItemGroup> | ||
| 35 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 36 | </ItemGroup> | ||
| 37 | |||
| 34 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 38 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 35 | </Project> | 39 | </Project> \ No newline at end of file |
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj index 6a053026..aa3389d9 100644 --- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj +++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
| 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <Compile Include="CustomActionTest.cs" /> | 16 | <Compile Include="CustomActionTest.cs" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| @@ -26,6 +26,10 @@ | |||
| 26 | <Name>WixToolsetTests.Dtf.WindowsInstaller</Name> | 26 | <Name>WixToolsetTests.Dtf.WindowsInstaller</Name> |
| 27 | </ProjectReference> | 27 | </ProjectReference> |
| 28 | </ItemGroup> | 28 | </ItemGroup> |
| 29 | |||
| 30 | <ItemGroup> | ||
| 31 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 32 | </ItemGroup> | ||
| 29 | 33 | ||
| 30 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 34 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 31 | </Project> | 35 | </Project> \ No newline at end of file |
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj index e7fbf28d..db3923aa 100644 --- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj +++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj | |||
| @@ -11,17 +11,17 @@ | |||
| 11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
| 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <Compile Include="LinqTest.cs" /> | 16 | <Compile Include="LinqTest.cs" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | 20 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> |
| 21 | <Reference Include="System" /> | 21 | <Reference Include="System" /> |
| 22 | <Reference Include="System.Core" /> | 22 | <Reference Include="System.Core" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | 24 | ||
| 25 | <ItemGroup> | 25 | <ItemGroup> |
| 26 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj"> | 26 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj"> |
| 27 | <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project> | 27 | <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project> |
| @@ -37,5 +37,9 @@ | |||
| 37 | </ProjectReference> | 37 | </ProjectReference> |
| 38 | </ItemGroup> | 38 | </ItemGroup> |
| 39 | 39 | ||
| 40 | <ItemGroup> | ||
| 41 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 42 | </ItemGroup> | ||
| 43 | |||
| 40 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 44 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 41 | </Project> | 45 | </Project> \ No newline at end of file |
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj index 1fedfe4e..d9aeae3b 100644 --- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj +++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
| 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <Compile Include="EmbeddedExternalUI.cs" /> | 16 | <Compile Include="EmbeddedExternalUI.cs" /> |
| 17 | <Compile Include="Schema.cs" /> | 17 | <Compile Include="Schema.cs" /> |
| @@ -19,14 +19,14 @@ | |||
| 19 | <Compile Include="WindowsInstallerTransactions.cs" /> | 19 | <Compile Include="WindowsInstallerTransactions.cs" /> |
| 20 | <Compile Include="WindowsInstallerUtils.cs" /> | 20 | <Compile Include="WindowsInstallerUtils.cs" /> |
| 21 | </ItemGroup> | 21 | </ItemGroup> |
| 22 | 22 | ||
| 23 | <ItemGroup> | 23 | <ItemGroup> |
| 24 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | 24 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> |
| 25 | <Reference Include="System" /> | 25 | <Reference Include="System" /> |
| 26 | <Reference Include="System.Windows.Forms" /> | 26 | <Reference Include="System.Windows.Forms" /> |
| 27 | <Reference Include="System.Xml" /> | 27 | <Reference Include="System.Xml" /> |
| 28 | </ItemGroup> | 28 | </ItemGroup> |
| 29 | 29 | ||
| 30 | <ItemGroup> | 30 | <ItemGroup> |
| 31 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj"> | 31 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj"> |
| 32 | <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project> | 32 | <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project> |
| @@ -34,5 +34,9 @@ | |||
| 34 | </ProjectReference> | 34 | </ProjectReference> |
| 35 | </ItemGroup> | 35 | </ItemGroup> |
| 36 | 36 | ||
| 37 | <ItemGroup> | ||
| 38 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 39 | </ItemGroup> | ||
| 40 | |||
| 37 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 41 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 38 | </Project> | 42 | </Project> \ No newline at end of file |
diff --git a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj index 6aac6943..6d6f78c8 100644 --- a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj +++ b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | <PropertyGroup Label="Globals"> | 32 | <PropertyGroup Label="Globals"> |
| 33 | <ProjectGuid>{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}</ProjectGuid> | 33 | <ProjectGuid>{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}</ProjectGuid> |
| 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 35 | <PlatformToolset>v142</PlatformToolset> | ||
| 36 | <CharacterSet>Unicode</CharacterSet> | 35 | <CharacterSet>Unicode</CharacterSet> |
| 37 | <TargetName>BAFunctions</TargetName> | 36 | <TargetName>BAFunctions</TargetName> |
| 38 | <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile> | 37 | <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile> |
diff --git a/src/ext/Bal/dnchost/dnchost.vcxproj b/src/ext/Bal/dnchost/dnchost.vcxproj index 6bc89427..66c1f8d1 100644 --- a/src/ext/Bal/dnchost/dnchost.vcxproj +++ b/src/ext/Bal/dnchost/dnchost.vcxproj | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | <PropertyGroup Label="Globals"> | 31 | <PropertyGroup Label="Globals"> |
| 32 | <ProjectGuid>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</ProjectGuid> | 32 | <ProjectGuid>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</ProjectGuid> |
| 33 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 33 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 34 | <PlatformToolset>v142</PlatformToolset> | ||
| 35 | <CharacterSet>Unicode</CharacterSet> | 34 | <CharacterSet>Unicode</CharacterSet> |
| 36 | <TargetName>dnchost</TargetName> | 35 | <TargetName>dnchost</TargetName> |
| 37 | <ProjectModuleDefinitionFile>dnchost.def</ProjectModuleDefinitionFile> | 36 | <ProjectModuleDefinitionFile>dnchost.def</ProjectModuleDefinitionFile> |
diff --git a/src/ext/Bal/mbahost/mbahost.vcxproj b/src/ext/Bal/mbahost/mbahost.vcxproj index 5edb2562..ababf19c 100644 --- a/src/ext/Bal/mbahost/mbahost.vcxproj +++ b/src/ext/Bal/mbahost/mbahost.vcxproj | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | <PropertyGroup Label="Globals"> | 32 | <PropertyGroup Label="Globals"> |
| 33 | <ProjectGuid>{12C87C77-3547-44F8-8134-29BC915CB19D}</ProjectGuid> | 33 | <ProjectGuid>{12C87C77-3547-44F8-8134-29BC915CB19D}</ProjectGuid> |
| 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 35 | <PlatformToolset>v142</PlatformToolset> | ||
| 36 | <CharacterSet>Unicode</CharacterSet> | 35 | <CharacterSet>Unicode</CharacterSet> |
| 37 | <TargetName>mbahost</TargetName> | 36 | <TargetName>mbahost</TargetName> |
| 38 | <ProjectModuleDefinitionFile>mbahost.def</ProjectModuleDefinitionFile> | 37 | <ProjectModuleDefinitionFile>mbahost.def</ProjectModuleDefinitionFile> |
diff --git a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj index 39207d77..12abe976 100644 --- a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj | |||
| @@ -34,9 +34,7 @@ | |||
| 34 | <ConfigurationType>Application</ConfigurationType> | 34 | <ConfigurationType>Application</ConfigurationType> |
| 35 | <ProjectSubSystem>Console</ProjectSubSystem> | 35 | <ProjectSubSystem>Console</ProjectSubSystem> |
| 36 | <TargetName>Example.TestEngine</TargetName> | 36 | <TargetName>Example.TestEngine</TargetName> |
| 37 | <PlatformToolset>v142</PlatformToolset> | ||
| 38 | <CharacterSet>Unicode</CharacterSet> | 37 | <CharacterSet>Unicode</CharacterSet> |
| 39 | <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||
| 40 | </PropertyGroup> | 38 | </PropertyGroup> |
| 41 | 39 | ||
| 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 40 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
diff --git a/src/ext/Bal/wixstdba/wixstdba.vcxproj b/src/ext/Bal/wixstdba/wixstdba.vcxproj index fba3e885..85d90e77 100644 --- a/src/ext/Bal/wixstdba/wixstdba.vcxproj +++ b/src/ext/Bal/wixstdba/wixstdba.vcxproj | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | <PropertyGroup Label="Globals"> | 32 | <PropertyGroup Label="Globals"> |
| 33 | <ProjectGuid>{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}</ProjectGuid> | 33 | <ProjectGuid>{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}</ProjectGuid> |
| 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 35 | <PlatformToolset>v142</PlatformToolset> | ||
| 36 | <CharacterSet>Unicode</CharacterSet> | 35 | <CharacterSet>Unicode</CharacterSet> |
| 37 | <TargetName>WixStdBA</TargetName> | 36 | <TargetName>WixStdBA</TargetName> |
| 38 | <ProjectModuleDefinitionFile>wixstdba.def</ProjectModuleDefinitionFile> | 37 | <ProjectModuleDefinitionFile>wixstdba.def</ProjectModuleDefinitionFile> |
diff --git a/src/ext/ComPlus/ca/complusca.vcxproj b/src/ext/ComPlus/ca/complusca.vcxproj index 5a8b23cd..0bd490b1 100644 --- a/src/ext/ComPlus/ca/complusca.vcxproj +++ b/src/ext/ComPlus/ca/complusca.vcxproj | |||
| @@ -24,12 +24,10 @@ | |||
| 24 | <PropertyGroup Label="Globals"> | 24 | <PropertyGroup Label="Globals"> |
| 25 | <ProjectGuid>{BDEF51ED-E242-4FA2-801A-01B127DF851A}</ProjectGuid> | 25 | <ProjectGuid>{BDEF51ED-E242-4FA2-801A-01B127DF851A}</ProjectGuid> |
| 26 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 26 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 27 | <PlatformToolset>v142</PlatformToolset> | ||
| 28 | <CharacterSet>Unicode</CharacterSet> | 27 | <CharacterSet>Unicode</CharacterSet> |
| 29 | <TargetName>complusca</TargetName> | 28 | <TargetName>complusca</TargetName> |
| 30 | <ProjectModuleDefinitionFile>complusca.def</ProjectModuleDefinitionFile> | 29 | <ProjectModuleDefinitionFile>complusca.def</ProjectModuleDefinitionFile> |
| 31 | <Description>WiX Toolset ComPlus CustomAction</Description> | 30 | <Description>WiX Toolset ComPlus CustomAction</Description> |
| 32 | <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||
| 33 | </PropertyGroup> | 31 | </PropertyGroup> |
| 34 | 32 | ||
| 35 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 33 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
diff --git a/src/ext/Dependency/ca/dependencyca.vcxproj b/src/ext/Dependency/ca/dependencyca.vcxproj index 9e31994b..b84321df 100644 --- a/src/ext/Dependency/ca/dependencyca.vcxproj +++ b/src/ext/Dependency/ca/dependencyca.vcxproj | |||
| @@ -32,12 +32,10 @@ | |||
| 32 | <PropertyGroup Label="Globals"> | 32 | <PropertyGroup Label="Globals"> |
| 33 | <ProjectGuid>{B86AF46C-0F90-49CC-923F-A800B088D015}</ProjectGuid> | 33 | <ProjectGuid>{B86AF46C-0F90-49CC-923F-A800B088D015}</ProjectGuid> |
| 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 35 | <PlatformToolset>v142</PlatformToolset> | ||
| 36 | <CharacterSet>Unicode</CharacterSet> | 35 | <CharacterSet>Unicode</CharacterSet> |
| 37 | <TargetName>dependencyca</TargetName> | 36 | <TargetName>dependencyca</TargetName> |
| 38 | <ProjectModuleDefinitionFile>wixdepca.def</ProjectModuleDefinitionFile> | 37 | <ProjectModuleDefinitionFile>wixdepca.def</ProjectModuleDefinitionFile> |
| 39 | <Description>WiX Toolset Dependency CustomAction</Description> | 38 | <Description>WiX Toolset Dependency CustomAction</Description> |
| 40 | <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||
| 41 | </PropertyGroup> | 39 | </PropertyGroup> |
| 42 | 40 | ||
| 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 41 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
diff --git a/src/ext/DirectX/ca/directxca.vcxproj b/src/ext/DirectX/ca/directxca.vcxproj index 85ce0828..e2baa46a 100644 --- a/src/ext/DirectX/ca/directxca.vcxproj +++ b/src/ext/DirectX/ca/directxca.vcxproj | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | <PropertyGroup Label="Globals"> | 32 | <PropertyGroup Label="Globals"> |
| 33 | <ProjectGuid>{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}</ProjectGuid> | 33 | <ProjectGuid>{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}</ProjectGuid> |
| 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 35 | <PlatformToolset>v142</PlatformToolset> | ||
| 36 | <CharacterSet>Unicode</CharacterSet> | 35 | <CharacterSet>Unicode</CharacterSet> |
| 37 | <TargetName>directxca</TargetName> | 36 | <TargetName>directxca</TargetName> |
| 38 | <ProjectModuleDefinitionFile>directx.def</ProjectModuleDefinitionFile> | 37 | <ProjectModuleDefinitionFile>directx.def</ProjectModuleDefinitionFile> |
diff --git a/src/ext/Firewall/ca/fwca.vcxproj b/src/ext/Firewall/ca/fwca.vcxproj index 38497d97..11170675 100644 --- a/src/ext/Firewall/ca/fwca.vcxproj +++ b/src/ext/Firewall/ca/fwca.vcxproj | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid> | 35 | <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid> |
| 36 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 36 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 37 | <TargetName>fwca</TargetName> | 37 | <TargetName>fwca</TargetName> |
| 38 | <PlatformToolset>v142</PlatformToolset> | ||
| 39 | <CharacterSet>Unicode</CharacterSet> | 38 | <CharacterSet>Unicode</CharacterSet> |
| 40 | <ProjectModuleDefinitionFile>fwca.def</ProjectModuleDefinitionFile> | 39 | <ProjectModuleDefinitionFile>fwca.def</ProjectModuleDefinitionFile> |
| 41 | <Description>WiX Toolset Firewall CustomAction</Description> | 40 | <Description>WiX Toolset Firewall CustomAction</Description> |
diff --git a/src/ext/Http/ca/httpca.vcxproj b/src/ext/Http/ca/httpca.vcxproj index 3a17b3b0..2614275f 100644 --- a/src/ext/Http/ca/httpca.vcxproj +++ b/src/ext/Http/ca/httpca.vcxproj | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | <PropertyGroup Label="Globals"> | 32 | <PropertyGroup Label="Globals"> |
| 33 | <ProjectGuid>{90743805-C043-47C7-B5FF-8F5EE5C8A2DE}</ProjectGuid> | 33 | <ProjectGuid>{90743805-C043-47C7-B5FF-8F5EE5C8A2DE}</ProjectGuid> |
| 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 35 | <PlatformToolset>v142</PlatformToolset> | ||
| 36 | <CharacterSet>Unicode</CharacterSet> | 35 | <CharacterSet>Unicode</CharacterSet> |
| 37 | <TargetName>httpca</TargetName> | 36 | <TargetName>httpca</TargetName> |
| 38 | <ProjectModuleDefinitionFile>wixhttpca.def</ProjectModuleDefinitionFile> | 37 | <ProjectModuleDefinitionFile>wixhttpca.def</ProjectModuleDefinitionFile> |
diff --git a/src/ext/Iis/ca/iisca.vcxproj b/src/ext/Iis/ca/iisca.vcxproj index d99ef4ab..de3ef83e 100644 --- a/src/ext/Iis/ca/iisca.vcxproj +++ b/src/ext/Iis/ca/iisca.vcxproj | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | <ProjectGuid>{CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}</ProjectGuid> | 35 | <ProjectGuid>{CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}</ProjectGuid> |
| 36 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 36 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 37 | <TargetName>iisca</TargetName> | 37 | <TargetName>iisca</TargetName> |
| 38 | <PlatformToolset>v142</PlatformToolset> | ||
| 39 | <CharacterSet>Unicode</CharacterSet> | 38 | <CharacterSet>Unicode</CharacterSet> |
| 40 | <ProjectModuleDefinitionFile>iisca.def</ProjectModuleDefinitionFile> | 39 | <ProjectModuleDefinitionFile>iisca.def</ProjectModuleDefinitionFile> |
| 41 | <Description>WiX Toolset Iis CustomAction</Description> | 40 | <Description>WiX Toolset Iis CustomAction</Description> |
diff --git a/src/ext/Msmq/ca/msmqca.vcxproj b/src/ext/Msmq/ca/msmqca.vcxproj index 473624b4..b00cd88e 100644 --- a/src/ext/Msmq/ca/msmqca.vcxproj +++ b/src/ext/Msmq/ca/msmqca.vcxproj | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | <ProjectGuid>{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}</ProjectGuid> | 20 | <ProjectGuid>{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}</ProjectGuid> |
| 21 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 21 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 22 | <TargetName>msmqca</TargetName> | 22 | <TargetName>msmqca</TargetName> |
| 23 | <PlatformToolset>v142</PlatformToolset> | ||
| 24 | <CharacterSet>Unicode</CharacterSet> | 23 | <CharacterSet>Unicode</CharacterSet> |
| 25 | <ProjectModuleDefinitionFile>msmqca.def</ProjectModuleDefinitionFile> | 24 | <ProjectModuleDefinitionFile>msmqca.def</ProjectModuleDefinitionFile> |
| 26 | <Description>WiX Toolset MSMQ CustomAction</Description> | 25 | <Description>WiX Toolset MSMQ CustomAction</Description> |
diff --git a/src/ext/NetFx/ca/netfxca.vcxproj b/src/ext/NetFx/ca/netfxca.vcxproj index 34332180..7b0f731a 100644 --- a/src/ext/NetFx/ca/netfxca.vcxproj +++ b/src/ext/NetFx/ca/netfxca.vcxproj | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid> | 33 | <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid> |
| 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 35 | <TargetName>netfxca</TargetName> | 35 | <TargetName>netfxca</TargetName> |
| 36 | <PlatformToolset>v142</PlatformToolset> | ||
| 37 | <CharacterSet>Unicode</CharacterSet> | 36 | <CharacterSet>Unicode</CharacterSet> |
| 38 | <ProjectModuleDefinitionFile>netfxca.def</ProjectModuleDefinitionFile> | 37 | <ProjectModuleDefinitionFile>netfxca.def</ProjectModuleDefinitionFile> |
| 39 | <Description>WiX Toolset .NET Framework CustomAction</Description> | 38 | <Description>WiX Toolset .NET Framework CustomAction</Description> |
diff --git a/src/ext/Sql/ca/sqlca.vcxproj b/src/ext/Sql/ca/sqlca.vcxproj index 01eae1fb..9a5df8cf 100644 --- a/src/ext/Sql/ca/sqlca.vcxproj +++ b/src/ext/Sql/ca/sqlca.vcxproj | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | <ProjectGuid>{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}</ProjectGuid> | 33 | <ProjectGuid>{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}</ProjectGuid> |
| 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 35 | <TargetName>sqlca</TargetName> | 35 | <TargetName>sqlca</TargetName> |
| 36 | <PlatformToolset>v142</PlatformToolset> | ||
| 37 | <CharacterSet>Unicode</CharacterSet> | 36 | <CharacterSet>Unicode</CharacterSet> |
| 38 | <ProjectModuleDefinitionFile>sqlca.def</ProjectModuleDefinitionFile> | 37 | <ProjectModuleDefinitionFile>sqlca.def</ProjectModuleDefinitionFile> |
| 39 | <Description>WiX Toolset Sql CustomAction</Description> | 38 | <Description>WiX Toolset Sql CustomAction</Description> |
diff --git a/src/ext/UI/ca/uica.vcxproj b/src/ext/UI/ca/uica.vcxproj index 1b145192..e06b7572 100644 --- a/src/ext/UI/ca/uica.vcxproj +++ b/src/ext/UI/ca/uica.vcxproj | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid> | 17 | <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid> |
| 18 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 18 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 19 | <TargetName>uica</TargetName> | 19 | <TargetName>uica</TargetName> |
| 20 | <PlatformToolset>v142</PlatformToolset> | ||
| 21 | <CharacterSet>MultiByte</CharacterSet> | 20 | <CharacterSet>MultiByte</CharacterSet> |
| 22 | <ProjectModuleDefinitionFile>uica.def</ProjectModuleDefinitionFile> | 21 | <ProjectModuleDefinitionFile>uica.def</ProjectModuleDefinitionFile> |
| 23 | <Description>WiX Toolset UI CustomAction</Description> | 22 | <Description>WiX Toolset UI CustomAction</Description> |
diff --git a/src/ext/Util/be/utilbe.vcxproj b/src/ext/Util/be/utilbe.vcxproj index 5e5a44d3..8e139812 100644 --- a/src/ext/Util/be/utilbe.vcxproj +++ b/src/ext/Util/be/utilbe.vcxproj | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | <ProjectGuid>{630C1EE7-2517-4A8C-83E3-DA1150308B58}</ProjectGuid> | 33 | <ProjectGuid>{630C1EE7-2517-4A8C-83E3-DA1150308B58}</ProjectGuid> |
| 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 35 | <TargetName>utilbe</TargetName> | 35 | <TargetName>utilbe</TargetName> |
| 36 | <PlatformToolset>v142</PlatformToolset> | ||
| 37 | <CharacterSet>Unicode</CharacterSet> | 36 | <CharacterSet>Unicode</CharacterSet> |
| 38 | <ProjectModuleDefinitionFile>utilbe.def</ProjectModuleDefinitionFile> | 37 | <ProjectModuleDefinitionFile>utilbe.def</ProjectModuleDefinitionFile> |
| 39 | <Description>WiX Toolset Util BundleExtension</Description> | 38 | <Description>WiX Toolset Util BundleExtension</Description> |
diff --git a/src/ext/Util/ca/utilca.vcxproj b/src/ext/Util/ca/utilca.vcxproj index f090181b..b3998b6e 100644 --- a/src/ext/Util/ca/utilca.vcxproj +++ b/src/ext/Util/ca/utilca.vcxproj | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | <ProjectGuid>{076018F7-19BD-423A-ABBF-229273DA08D8}</ProjectGuid> | 33 | <ProjectGuid>{076018F7-19BD-423A-ABBF-229273DA08D8}</ProjectGuid> |
| 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 35 | <TargetName>utilca</TargetName> | 35 | <TargetName>utilca</TargetName> |
| 36 | <PlatformToolset>v142</PlatformToolset> | ||
| 37 | <CharacterSet>Unicode</CharacterSet> | 36 | <CharacterSet>Unicode</CharacterSet> |
| 38 | <ProjectModuleDefinitionFile>utilca.def</ProjectModuleDefinitionFile> | 37 | <ProjectModuleDefinitionFile>utilca.def</ProjectModuleDefinitionFile> |
| 39 | <Description>WiX Toolset Util CustomAction</Description> | 38 | <Description>WiX Toolset Util CustomAction</Description> |
diff --git a/src/ext/VisualStudio/ca/vsca.vcxproj b/src/ext/VisualStudio/ca/vsca.vcxproj index 0b838b82..4636204f 100644 --- a/src/ext/VisualStudio/ca/vsca.vcxproj +++ b/src/ext/VisualStudio/ca/vsca.vcxproj | |||
| @@ -25,11 +25,9 @@ | |||
| 25 | <ProjectGuid>{45308B85-0628-4978-8FC8-6AD9E1AD5949}</ProjectGuid> | 25 | <ProjectGuid>{45308B85-0628-4978-8FC8-6AD9E1AD5949}</ProjectGuid> |
| 26 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 26 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 27 | <TargetName>vsca</TargetName> | 27 | <TargetName>vsca</TargetName> |
| 28 | <PlatformToolset>v142</PlatformToolset> | ||
| 29 | <CharacterSet>Unicode</CharacterSet> | 28 | <CharacterSet>Unicode</CharacterSet> |
| 30 | <ProjectModuleDefinitionFile>vsca.def</ProjectModuleDefinitionFile> | 29 | <ProjectModuleDefinitionFile>vsca.def</ProjectModuleDefinitionFile> |
| 31 | <Description>WiX Toolset VS CustomAction</Description> | 30 | <Description>WiX Toolset VS CustomAction</Description> |
| 32 | <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||
| 33 | </PropertyGroup> | 31 | </PropertyGroup> |
| 34 | 32 | ||
| 35 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 33 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp index 37b2d398..65496a36 100644 --- a/src/internal/SetBuildNumber/Directory.Packages.props.pp +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp | |||
| @@ -42,7 +42,8 @@ | |||
| 42 | <PackageVersion Include="System.Text.Encoding.CodePages" Version="4.6.0" /> | 42 | <PackageVersion Include="System.Text.Encoding.CodePages" Version="4.6.0" /> |
| 43 | 43 | ||
| 44 | <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" /> | 44 | <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" /> |
| 45 | <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="3.0.4492" /> | 45 | <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" /> |
| 46 | <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.14.114" /> | ||
| 46 | <PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" /> | 47 | <PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" /> |
| 47 | 48 | ||
| 48 | <PackageVersion Include="NuGet.Credentials" Version="5.6.0" /> | 49 | <PackageVersion Include="NuGet.Credentials" Version="5.6.0" /> |
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props index e6b5997f..c4e7b7b3 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props +++ b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props')" /> | 8 | <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props')" /> |
| 9 | <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" /> | 9 | <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" /> |
| 10 | <PropertyGroup> | 10 | <PropertyGroup> |
| 11 | <PlatformToolset>v142</PlatformToolset> | ||
| 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 11 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 13 | </PropertyGroup> | 12 | </PropertyGroup> |
| 14 | </Project> | 13 | </Project> |
diff --git a/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props b/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props index 35749be8..4e773137 100644 --- a/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props +++ b/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.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)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | 15 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 16 | </Link> | ||
| 17 | </ItemDefinitionGroup> | ||
| 18 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) "> | ||
| 19 | <Link> | ||
| 20 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 21 | </Link> | ||
| 22 | </ItemDefinitionGroup> | ||
| 23 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) "> | ||
| 24 | <Link> | ||
| 25 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 26 | </Link> | 16 | </Link> |
| 27 | </ItemDefinitionGroup> | 17 | </ItemDefinitionGroup> |
| 28 | </Project> | 18 | </Project> |
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec index fef60013..3c44dfd2 100644 --- a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec +++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec | |||
| @@ -16,13 +16,8 @@ | |||
| 16 | <files> | 16 | <files> |
| 17 | <file src="$projectFolder$\build\$id$.props" target="build\" /> | 17 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
| 18 | <file src="$projectFolder$\inc\*" target="build\native\include" /> | 18 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
| 19 | <file src="..\..\v140\x64\dutil.lib" target="build\native\v140\x64" /> | 19 | <file src="..\..\v143\x64\dutil.lib" target="build\native\v14\x64" /> |
| 20 | <file src="..\..\v140\x86\dutil.lib" target="build\native\v140\x86" /> | 20 | <file src="..\..\v143\x86\dutil.lib" target="build\native\v14\x86" /> |
| 21 | <file src="..\..\v141\x64\dutil.lib" target="build\native\v141\x64" /> | 21 | <file src="..\..\v143\ARM64\dutil.lib" target="build\native\v14\ARM64" /> |
| 22 | <file src="..\..\v141\x86\dutil.lib" target="build\native\v141\x86" /> | ||
| 23 | <file src="..\..\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" /> | ||
| 24 | <file src="..\..\v142\x64\dutil.lib" target="build\native\v142\x64" /> | ||
| 25 | <file src="..\..\v142\x86\dutil.lib" target="build\native\v142\x86" /> | ||
| 26 | <file src="..\..\v142\ARM64\dutil.lib" target="build\native\v142\ARM64" /> | ||
| 27 | </files> | 22 | </files> |
| 28 | </package> | 23 | </package> |
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj index 3ab8285f..cf38e8ae 100644 --- a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj +++ b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | <ConfigurationType>StaticLibrary</ConfigurationType> | 34 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 35 | <TargetName>dutil</TargetName> | 35 | <TargetName>dutil</TargetName> |
| 36 | <MultiTargetLibrary>true</MultiTargetLibrary> | 36 | <MultiTargetLibrary>true</MultiTargetLibrary> |
| 37 | <PlatformToolset>v142</PlatformToolset> | ||
| 38 | <CharacterSet>MultiByte</CharacterSet> | 37 | <CharacterSet>MultiByte</CharacterSet> |
| 39 | <Description>WiX Toolset native library foundation</Description> | 38 | <Description>WiX Toolset native library foundation</Description> |
| 40 | <PackageId>WixToolset.DUtil</PackageId> | 39 | <PackageId>WixToolset.DUtil</PackageId> |
diff --git a/src/libs/dutil/dutil.proj b/src/libs/dutil/dutil.proj index 9f4d884d..90d66440 100644 --- a/src/libs/dutil/dutil.proj +++ b/src/libs/dutil/dutil.proj | |||
| @@ -1,15 +1,8 @@ | |||
| 1 | <Project Sdk="Microsoft.Build.Traversal"> | 1 | <Project Sdk="Microsoft.Build.Traversal"> |
| 2 | <ItemGroup> | 2 | <ItemGroup> |
| 3 | <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" /> | 3 | <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86" /> |
| 4 | <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" /> | 4 | <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64" /> |
| 5 | 5 | <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64" /> | |
| 6 | <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" /> | ||
| 7 | <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" /> | ||
| 8 | <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" /> | ||
| 9 | |||
| 10 | <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v142" /> | ||
| 11 | <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v142" /> | ||
| 12 | <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v142" /> | ||
| 13 | 6 | ||
| 14 | <ProjectReference Include="test\DUtilUnitTest\DUtilUnitTest.vcxproj" Targets="Test" /> | 7 | <ProjectReference Include="test\DUtilUnitTest\DUtilUnitTest.vcxproj" Targets="Test" /> |
| 15 | 8 | ||
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/build/WixToolset.WcaUtil.props b/src/libs/wcautil/WixToolset.WcaUtil/build/WixToolset.WcaUtil.props index fb73a680..e0147b5d 100644 --- a/src/libs/wcautil/WixToolset.WcaUtil/build/WixToolset.WcaUtil.props +++ b/src/libs/wcautil/WixToolset.WcaUtil/build/WixToolset.WcaUtil.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)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies> | 15 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 16 | </Link> | ||
| 17 | </ItemDefinitionGroup> | ||
| 18 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) "> | ||
| 19 | <Link> | ||
| 20 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 21 | </Link> | ||
| 22 | </ItemDefinitionGroup> | ||
| 23 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) "> | ||
| 24 | <Link> | ||
| 25 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 26 | </Link> | 16 | </Link> |
| 27 | </ItemDefinitionGroup> | 17 | </ItemDefinitionGroup> |
| 28 | </Project> | 18 | </Project> |
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec index b9547a8b..2a03f879 100644 --- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec +++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec | |||
| @@ -19,13 +19,8 @@ | |||
| 19 | <files> | 19 | <files> |
| 20 | <file src="$projectFolder$\build\$id$.props" target="build\" /> | 20 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
| 21 | <file src="$projectFolder$\inc\*" target="build\native\include" /> | 21 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
| 22 | <file src="..\..\v140\x64\wcautil.lib" target="build\native\v140\x64" /> | 22 | <file src="..\..\v143\x64\wcautil.lib" target="build\native\v14\x64" /> |
| 23 | <file src="..\..\v140\x86\wcautil.lib" target="build\native\v140\x86" /> | 23 | <file src="..\..\v143\x86\wcautil.lib" target="build\native\v14\x86" /> |
| 24 | <file src="..\..\v141\x64\wcautil.lib" target="build\native\v141\x64" /> | 24 | <file src="..\..\v143\ARM64\wcautil.lib" target="build\native\v14\ARM64" /> |
| 25 | <file src="..\..\v141\x86\wcautil.lib" target="build\native\v141\x86" /> | ||
| 26 | <file src="..\..\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" /> | ||
| 27 | <file src="..\..\v142\x64\wcautil.lib" target="build\native\v142\x64" /> | ||
| 28 | <file src="..\..\v142\x86\wcautil.lib" target="build\native\v142\x86" /> | ||
| 29 | <file src="..\..\v142\ARM64\wcautil.lib" target="build\native\v142\ARM64" /> | ||
| 30 | </files> | 25 | </files> |
| 31 | </package> | 26 | </package> |
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj index 377358ef..234020bc 100644 --- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj +++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | <ConfigurationType>StaticLibrary</ConfigurationType> | 34 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 35 | <TargetName>wcautil</TargetName> | 35 | <TargetName>wcautil</TargetName> |
| 36 | <MultiTargetLibrary>true</MultiTargetLibrary> | 36 | <MultiTargetLibrary>true</MultiTargetLibrary> |
| 37 | <PlatformToolset>v142</PlatformToolset> | ||
| 38 | <CharacterSet>MultiByte</CharacterSet> | 37 | <CharacterSet>MultiByte</CharacterSet> |
| 39 | <Description>WiX Toolset Custom Action native utility library</Description> | 38 | <Description>WiX Toolset Custom Action native utility library</Description> |
| 40 | <PackageId>WixToolset.WcaUtil</PackageId> | 39 | <PackageId>WixToolset.WcaUtil</PackageId> |
diff --git a/src/libs/wcautil/wcautil.proj b/src/libs/wcautil/wcautil.proj index 839c63a4..ae0ebc08 100644 --- a/src/libs/wcautil/wcautil.proj +++ b/src/libs/wcautil/wcautil.proj | |||
| @@ -1,15 +1,8 @@ | |||
| 1 | <Project Sdk="Microsoft.Build.Traversal"> | 1 | <Project Sdk="Microsoft.Build.Traversal"> |
| 2 | <ItemGroup> | 2 | <ItemGroup> |
| 3 | <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" /> | 3 | <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86" /> |
| 4 | <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" /> | 4 | <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64" /> |
| 5 | 5 | <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64" /> | |
| 6 | <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" /> | ||
| 7 | <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" /> | ||
| 8 | <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" /> | ||
| 9 | |||
| 10 | <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v142" /> | ||
| 11 | <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v142" /> | ||
| 12 | <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v142" /> | ||
| 13 | 6 | ||
| 14 | <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Targets="PackNative" /> | 7 | <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Targets="PackNative" /> |
| 15 | </ItemGroup> | 8 | </ItemGroup> |
diff --git a/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj b/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj index aeaaa776..4684d6e0 100644 --- a/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj +++ b/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | <ProjectGuid>{55D5BA28-D427-4F53-80C2-FE9EF23C1553}</ProjectGuid> | 24 | <ProjectGuid>{55D5BA28-D427-4F53-80C2-FE9EF23C1553}</ProjectGuid> |
| 25 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 25 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 26 | <TargetName>SfxCA</TargetName> | 26 | <TargetName>SfxCA</TargetName> |
| 27 | <PlatformToolset>v142</PlatformToolset> | ||
| 28 | <CharacterSet>Unicode</CharacterSet> | 27 | <CharacterSet>Unicode</CharacterSet> |
| 29 | <ProjectModuleDefinitionFile>EntryPoints.def</ProjectModuleDefinitionFile> | 28 | <ProjectModuleDefinitionFile>EntryPoints.def</ProjectModuleDefinitionFile> |
| 30 | </PropertyGroup> | 29 | </PropertyGroup> |
diff --git a/src/samples/thmviewer/thmviewer.vcxproj b/src/samples/thmviewer/thmviewer.vcxproj index 41cd9dc5..180a18c6 100644 --- a/src/samples/thmviewer/thmviewer.vcxproj +++ b/src/samples/thmviewer/thmviewer.vcxproj | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | <ProjectGuid>{95228C13-97F5-484A-B4A2-ECF4618B0881}</ProjectGuid> | 17 | <ProjectGuid>{95228C13-97F5-484A-B4A2-ECF4618B0881}</ProjectGuid> |
| 18 | <Keyword>Win32Proj</Keyword> | 18 | <Keyword>Win32Proj</Keyword> |
| 19 | <ConfigurationType>Application</ConfigurationType> | 19 | <ConfigurationType>Application</ConfigurationType> |
| 20 | <PlatformToolset>v142</PlatformToolset> | ||
| 21 | <CharacterSet>Unicode</CharacterSet> | 20 | <CharacterSet>Unicode</CharacterSet> |
| 22 | <Description>WiX Toolset Theme Viewer</Description> | 21 | <Description>WiX Toolset Theme Viewer</Description> |
| 23 | </PropertyGroup> | 22 | </PropertyGroup> |
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj index 8e7e9bd9..d938b0c9 100644 --- a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj +++ b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | <PropertyGroup Label="Globals"> | 30 | <PropertyGroup Label="Globals"> |
| 31 | <ProjectGuid>{565E99AE-975F-4F26-8A6E-852603386A80}</ProjectGuid> | 31 | <ProjectGuid>{565E99AE-975F-4F26-8A6E-852603386A80}</ProjectGuid> |
| 32 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 32 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 33 | <PlatformToolset>v142</PlatformToolset> | ||
| 34 | <CharacterSet>Unicode</CharacterSet> | 33 | <CharacterSet>Unicode</CharacterSet> |
| 35 | <TargetName>BafThmUtilTesting</TargetName> | 34 | <TargetName>BafThmUtilTesting</TargetName> |
| 36 | <ProjectModuleDefinitionFile>BafThmUtilTesting.def</ProjectModuleDefinitionFile> | 35 | <ProjectModuleDefinitionFile>BafThmUtilTesting.def</ProjectModuleDefinitionFile> |
diff --git a/src/wix/wixnative/wixnative.vcxproj b/src/wix/wixnative/wixnative.vcxproj index abe9a38e..1dac36e2 100644 --- a/src/wix/wixnative/wixnative.vcxproj +++ b/src/wix/wixnative/wixnative.vcxproj | |||
| @@ -32,12 +32,10 @@ | |||
| 32 | <PropertyGroup Label="Globals"> | 32 | <PropertyGroup Label="Globals"> |
| 33 | <ProjectGuid>{8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}</ProjectGuid> | 33 | <ProjectGuid>{8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}</ProjectGuid> |
| 34 | <ConfigurationType>Application</ConfigurationType> | 34 | <ConfigurationType>Application</ConfigurationType> |
| 35 | <PlatformToolset>v142</PlatformToolset> | ||
| 36 | <CharacterSet>Unicode</CharacterSet> | 35 | <CharacterSet>Unicode</CharacterSet> |
| 37 | <ProjectSubSystem>Console</ProjectSubSystem> | 36 | <ProjectSubSystem>Console</ProjectSubSystem> |
| 38 | <TargetName>wixnative</TargetName> | 37 | <TargetName>wixnative</TargetName> |
| 39 | <Description>WiX Native Processing</Description> | 38 | <Description>WiX Native Processing</Description> |
| 40 | <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||
| 41 | </PropertyGroup> | 39 | </PropertyGroup> |
| 42 | 40 | ||
| 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 41 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |