|
112 | 112 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
113 | 113 | <ClCompile>
|
114 | 114 | <Optimization>Disabled</Optimization>
|
115 |
| - <AdditionalIncludeDirectories>$(WixSdkDir)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| 115 | + <AdditionalIncludeDirectories>$(PkgWixToolset_WcaUtil)\build\native\include;$(PkgWixToolset_DUtil)\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
116 | 116 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
117 | 117 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
118 | 118 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
|
122 | 122 | </ClCompile>
|
123 | 123 | <Link>
|
124 | 124 | <AdditionalDependencies>msi.lib;dutil.lib;wcautil.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
125 |
| - <AdditionalLibraryDirectories>$(WixSdkDir)\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| 125 | + <AdditionalLibraryDirectories>$(PkgWixToolset_WcaUtil)\build\native\v14\x86;$(PkgWixToolset_DUtil)\build\native\v14\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
126 | 126 | <ModuleDefinitionFile>custom_actions.def</ModuleDefinitionFile>
|
127 | 127 | <GenerateDebugInformation>true</GenerateDebugInformation>
|
128 | 128 | <SubSystem>Windows</SubSystem>
|
|
131 | 131 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
132 | 132 | <ClCompile>
|
133 | 133 | <Optimization>Disabled</Optimization>
|
134 |
| - <AdditionalIncludeDirectories>$(WixSdkDir)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| 134 | + <AdditionalIncludeDirectories>$(PkgWixToolset_WcaUtil)\build\native\include;$(PkgWixToolset_DUtil)\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
135 | 135 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
136 | 136 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
137 | 137 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
|
141 | 141 | </ClCompile>
|
142 | 142 | <Link>
|
143 | 143 | <AdditionalDependencies>msi.lib;dutil.lib;wcautil.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
144 |
| - <AdditionalLibraryDirectories>$(WixSdkDir)\lib\ARM64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| 144 | + <AdditionalLibraryDirectories>$(PkgWixToolset_WcaUtil)\build\native\v14\ARM64;$(PkgWixToolset_DUtil)\build\native\v14\ARM64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
145 | 145 | <ModuleDefinitionFile>custom_actions.def</ModuleDefinitionFile>
|
146 | 146 | <GenerateDebugInformation>true</GenerateDebugInformation>
|
147 | 147 | <SubSystem>Windows</SubSystem>
|
|
150 | 150 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
151 | 151 | <ClCompile>
|
152 | 152 | <Optimization>Disabled</Optimization>
|
153 |
| - <AdditionalIncludeDirectories>$(WixSdkDir)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| 153 | + <AdditionalIncludeDirectories>$(PkgWixToolset_WcaUtil)\build\native\include;$(PkgWixToolset_DUtil)\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
154 | 154 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
155 | 155 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
156 | 156 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
|
160 | 160 | </ClCompile>
|
161 | 161 | <Link>
|
162 | 162 | <AdditionalDependencies>msi.lib;dutil.lib;wcautil.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
163 |
| - <AdditionalLibraryDirectories>$(WixSdkDir)\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| 163 | + <AdditionalLibraryDirectories>$(PkgWixToolset_WcaUtil)\build\native\v14\x64;$(PkgWixToolset_DUtil)\build\native\v14\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
164 | 164 | <ModuleDefinitionFile>custom_actions.def</ModuleDefinitionFile>
|
165 | 165 | <GenerateDebugInformation>true</GenerateDebugInformation>
|
166 | 166 | <SubSystem>Windows</SubSystem>
|
|
170 | 170 | <ClCompile>
|
171 | 171 | <Optimization>MaxSpeed</Optimization>
|
172 | 172 | <IntrinsicFunctions>true</IntrinsicFunctions>
|
173 |
| - <AdditionalIncludeDirectories>$(WixSdkDir)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| 173 | + <AdditionalIncludeDirectories>$(PkgWixToolset_WcaUtil)\build\native\include;$(PkgWixToolset_DUtil)\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
174 | 174 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
175 | 175 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
176 | 176 | <FunctionLevelLinking>true</FunctionLevelLinking>
|
|
184 | 184 | </ClCompile>
|
185 | 185 | <Link>
|
186 | 186 | <AdditionalDependencies>msi.lib;dutil.lib;wcautil.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
187 |
| - <AdditionalLibraryDirectories>$(WixSdkDir)\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| 187 | + <AdditionalLibraryDirectories>$(PkgWixToolset_WcaUtil)\build\native\v14\x86;$(PkgWixToolset_DUtil)\build\native\v14\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
188 | 188 | <ModuleDefinitionFile>custom_actions.def</ModuleDefinitionFile>
|
189 | 189 | <GenerateDebugInformation>true</GenerateDebugInformation>
|
190 | 190 | <SubSystem>Windows</SubSystem>
|
|
196 | 196 | <ClCompile>
|
197 | 197 | <Optimization>MaxSpeed</Optimization>
|
198 | 198 | <IntrinsicFunctions>true</IntrinsicFunctions>
|
199 |
| - <AdditionalIncludeDirectories>$(WixSdkDir)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| 199 | + <AdditionalIncludeDirectories>$(PkgWixToolset_WcaUtil)\build\native\include;$(PkgWixToolset_DUtil)\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
200 | 200 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
201 | 201 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
202 | 202 | <FunctionLevelLinking>true</FunctionLevelLinking>
|
|
210 | 210 | </ClCompile>
|
211 | 211 | <Link>
|
212 | 212 | <AdditionalDependencies>msi.lib;dutil.lib;wcautil.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
213 |
| - <AdditionalLibraryDirectories>$(WixSdkDir)\lib\ARM64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| 213 | + <AdditionalLibraryDirectories>$(PkgWixToolset_WcaUtil)\build\native\v14\ARM64;$(PkgWixToolset_DUtil)\build\native\v14\ARM64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
214 | 214 | <ModuleDefinitionFile>custom_actions.def</ModuleDefinitionFile>
|
215 | 215 | <GenerateDebugInformation>true</GenerateDebugInformation>
|
216 | 216 | <SubSystem>Windows</SubSystem>
|
|
222 | 222 | <ClCompile>
|
223 | 223 | <Optimization>MaxSpeed</Optimization>
|
224 | 224 | <IntrinsicFunctions>true</IntrinsicFunctions>
|
225 |
| - <AdditionalIncludeDirectories>$(WixSdkDir)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| 225 | + <AdditionalIncludeDirectories>$(PkgWixToolset_WcaUtil)\build\native\include;$(PkgWixToolset_DUtil)\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
226 | 226 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
227 | 227 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
228 | 228 | <FunctionLevelLinking>true</FunctionLevelLinking>
|
|
236 | 236 | </ClCompile>
|
237 | 237 | <Link>
|
238 | 238 | <AdditionalDependencies>msi.lib;dutil.lib;wcautil.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
239 |
| - <AdditionalLibraryDirectories>$(WixSdkDir)\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| 239 | + <AdditionalLibraryDirectories>$(PkgWixToolset_WcaUtil)\build\native\v14\x64;$(PkgWixToolset_DUtil)\build\native\v14\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
240 | 240 | <ModuleDefinitionFile>custom_actions.def</ModuleDefinitionFile>
|
241 | 241 | <GenerateDebugInformation>true</GenerateDebugInformation>
|
242 | 242 | <SubSystem>Windows</SubSystem>
|
|
254 | 254 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
255 | 255 | <ImportGroup Label="ExtensionTargets">
|
256 | 256 | </ImportGroup>
|
| 257 | + <ItemGroup> |
| 258 | + <PackageReference Include="WixToolset.WcaUtil" Version="4.0.0-rc.1" GeneratePathProperty="true" /> |
| 259 | + <PackageReference Include="WixToolset.DUtil" Version="4.0.0-rc.1" GeneratePathProperty="true" /> |
| 260 | + </ItemGroup> |
| 261 | + <PropertyGroup> |
| 262 | + <_NuGetTargetFallbackMoniker>$(_NuGetTargetFallbackMoniker);native,Version=v0.0</_NuGetTargetFallbackMoniker> |
| 263 | + <RuntimeIdentifiers>$(RuntimeIdentifiers);win-arm64</RuntimeIdentifiers> |
| 264 | + </PropertyGroup> |
257 | 265 | </Project>
|
0 commit comments