diff options
Diffstat (limited to 'src/ca')
-rw-r--r-- | src/ca/packages.config | 1 | ||||
-rw-r--r-- | src/ca/precomp.h | 1 | ||||
-rw-r--r-- | src/ca/sqlca.vcxproj | 9 |
3 files changed, 0 insertions, 11 deletions
diff --git a/src/ca/packages.config b/src/ca/packages.config index b74ff5d0..b87f9ab4 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config | |||
@@ -1,6 +1,5 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <packages> | 2 | <packages> |
3 | <package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="1.14.114" targetFramework="native" developmentDependency="true" /> | ||
4 | <package id="WixToolset.DUtil" version="4.0.6" targetFramework="native" /> | 3 | <package id="WixToolset.DUtil" version="4.0.6" targetFramework="native" /> |
5 | <package id="WixToolset.WcaUtil" version="4.0.2" targetFramework="native" /> | 4 | <package id="WixToolset.WcaUtil" version="4.0.2" targetFramework="native" /> |
6 | </packages> \ No newline at end of file | 5 | </packages> \ No newline at end of file |
diff --git a/src/ca/precomp.h b/src/ca/precomp.h index 7a5074b3..08454d3a 100644 --- a/src/ca/precomp.h +++ b/src/ca/precomp.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <strsafe.h> | 12 | #include <strsafe.h> |
13 | 13 | ||
14 | #define MAXUINT USHRT_MAX | 14 | #define MAXUINT USHRT_MAX |
15 | #include <Setup.Configuration.h> | ||
16 | 15 | ||
17 | #include "wcautil.h" | 16 | #include "wcautil.h" |
18 | #include "fileutil.h" | 17 | #include "fileutil.h" |
diff --git a/src/ca/sqlca.vcxproj b/src/ca/sqlca.vcxproj index b1f7dafa..f8292706 100644 --- a/src/ca/sqlca.vcxproj +++ b/src/ca/sqlca.vcxproj | |||
@@ -24,19 +24,11 @@ | |||
24 | <CharacterSet>Unicode</CharacterSet> | 24 | <CharacterSet>Unicode</CharacterSet> |
25 | <ProjectModuleDefinitionFile>sqlca.def</ProjectModuleDefinitionFile> | 25 | <ProjectModuleDefinitionFile>sqlca.def</ProjectModuleDefinitionFile> |
26 | <Description>WiX Toolset Sql CustomAction</Description> | 26 | <Description>WiX Toolset Sql CustomAction</Description> |
27 | <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
28 | </PropertyGroup> | 27 | </PropertyGroup> |
29 | 28 | ||
30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
31 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
32 | 31 | ||
33 | <ImportGroup Label="ExtensionSettings"> | ||
34 | </ImportGroup> | ||
35 | |||
36 | <ImportGroup Label="Shared"> | ||
37 | <Import Project="..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" /> | ||
38 | </ImportGroup> | ||
39 | |||
40 | <PropertyGroup> | 32 | <PropertyGroup> |
41 | <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries> | 33 | <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries> |
42 | </PropertyGroup> | 34 | </PropertyGroup> |
@@ -74,7 +66,6 @@ | |||
74 | <PropertyGroup> | 66 | <PropertyGroup> |
75 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | 67 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> |
76 | </PropertyGroup> | 68 | </PropertyGroup> |
77 | <Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets'))" /> | ||
78 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props'))" /> | 69 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props'))" /> |
79 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props'))" /> | 70 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props'))" /> |
80 | </Target> | 71 | </Target> |