aboutsummaryrefslogtreecommitdiff
path: root/src/libs
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props14
-rw-r--r--src/libs/dutil/WixToolset.DUtil/dutil.nuspec11
-rw-r--r--src/libs/dutil/WixToolset.DUtil/dutil.vcxproj1
-rw-r--r--src/libs/dutil/dutil.proj13
-rw-r--r--src/libs/wcautil/WixToolset.WcaUtil/build/WixToolset.WcaUtil.props14
-rw-r--r--src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec11
-rw-r--r--src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj1
-rw-r--r--src/libs/wcautil/wcautil.proj13
8 files changed, 16 insertions, 62 deletions
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>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 18:55:26 +0000