Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix strong name signing with embedded manifests and add the VS 2010 project file for the interop assembly. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
6660802dd02e3f7ef2ed13f06827a196 |
User & Date: | mistachkin 2011-02-26 12:03:55.232 |
Context
2011-02-26
| ||
12:11 | Fix issue with the INTEROP_ASSEMBLY_RESOURCES build macro. check-in: 9ffa2eeb33 user: mistachkin tags: trunk | |
12:03 | Fix strong name signing with embedded manifests and add the VS 2010 project file for the interop assembly. check-in: 6660802dd0 user: mistachkin tags: trunk | |
10:24 | Move RC file (missed in previous commit). check-in: 0e372ed8f9 user: mistachkin tags: trunk | |
Changes
Changes to SQLite.Interop/SQLite.Interop.2008.vcproj.
︙ | ︙ | |||
86 87 88 89 90 91 92 93 94 95 96 97 98 99 | SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" LinkTimeCodeGeneration="1" TargetMachine="1" CLRUnmanagedCodeCheck="true" KeyFile="$(INTEROP_KEY_FILE)" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" VerboseOutput="true" | > | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" LinkTimeCodeGeneration="1" TargetMachine="1" CLRUnmanagedCodeCheck="true" KeyFile="$(INTEROP_KEY_FILE)" DelaySign="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" VerboseOutput="true" |
︙ | ︙ | |||
110 111 112 113 114 115 116 117 118 119 120 121 122 123 | Name="VCFxCopTool" /> <Tool Name="VCAppVerifierTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="..\obj\$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" | > | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | Name="VCFxCopTool" /> <Tool Name="VCAppVerifierTool" /> <Tool Name="VCPostBuildEventTool" CommandLine=""$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)"" /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="..\obj\$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" |
︙ | ︙ | |||
180 181 182 183 184 185 186 187 188 189 190 191 192 193 | LargeAddressAware="0" OptimizeReferences="2" EnableCOMDATFolding="2" LinkTimeCodeGeneration="1" TargetMachine="1" CLRUnmanagedCodeCheck="true" KeyFile="$(INTEROP_KEY_FILE)" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" VerboseOutput="true" | > | 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 | LargeAddressAware="0" OptimizeReferences="2" EnableCOMDATFolding="2" LinkTimeCodeGeneration="1" TargetMachine="1" CLRUnmanagedCodeCheck="true" KeyFile="$(INTEROP_KEY_FILE)" DelaySign="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" VerboseOutput="true" |
︙ | ︙ | |||
204 205 206 207 208 209 210 211 212 213 214 215 216 217 | Name="VCFxCopTool" /> <Tool Name="VCAppVerifierTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> </Configurations> <References> </References> <Files> <Filter | > | 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 | Name="VCFxCopTool" /> <Tool Name="VCAppVerifierTool" /> <Tool Name="VCPostBuildEventTool" CommandLine=""$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)"" /> </Configuration> </Configurations> <References> </References> <Files> <Filter |
︙ | ︙ |
Added SQLite.Interop/SQLite.Interop.2010.vcxproj.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | <?xml version="1.0" encoding="utf-8"?> <!-- * * SQLite.Interop.2010.vcxproj - * * Written by Joe Mistachkin. * Released to the public domain, use at your own risk! * --> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectName>SQLite.Interop</ProjectName> <ProjectGuid>{53784BC1-A8BC-4AC8-8A3E-158D6807345A}</ProjectGuid> <RootNamespace>SQLite.Interop</RootNamespace> <Keyword>Win32Proj</Keyword> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="props\sqlite3.props" /> <Import Project="props\SQLite.Interop.props" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <OutDir>$(ProjectDir)..\bin\$(Platform)\$(Configuration)\</OutDir> <IntDir>..\obj\$(Platform)\$(Configuration)\</IntDir> <LinkIncremental>false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_DEBUG_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <BrowseInformation>true</BrowseInformation> <WarningLevel>Level4</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>$(SQLITE_DISABLE_WARNINGS);%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_UNICODE;UNICODE;INTEROP_RC_VERSION=$(INTEROP_RC_VERSION);%(PreprocessorDefinitions)</PreprocessorDefinitions> </ResourceCompile> <Link> <AdditionalOptions>/ASSEMBLYRESOURCE:$(INTEROP_ASSEMBLY_RESOURCES) %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>$(ProjectDir)..\bin\$(Configuration)Module\bin\System.Data.SQLite.netmodule;%(AdditionalDependencies)</AdditionalDependencies> <Version>$(INTEROP_MANIFEST_VERSION)</Version> <ModuleDefinitionFile>src\core\sqlite3.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <AssemblyDebug>true</AssemblyDebug> <GenerateMapFile>true</GenerateMapFile> <MapExports>true</MapExports> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX86</TargetMachine> <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck> <KeyFile>$(INTEROP_KEY_FILE)</KeyFile> <DelaySign>true</DelaySign> </Link> <Manifest> <VerboseOutput>true</VerboseOutput> <AssemblyIdentity>$(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32</AssemblyIdentity> <UpdateFileHashes>true</UpdateFileHashes> </Manifest> <PostBuildEvent> <Command>"$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <Optimization>Full</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <BrowseInformation>true</BrowseInformation> <WarningLevel>Level4</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>$(SQLITE_DISABLE_WARNINGS);%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_UNICODE;UNICODE;INTEROP_RC_VERSION=$(INTEROP_RC_VERSION);%(PreprocessorDefinitions)</PreprocessorDefinitions> </ResourceCompile> <Link> <AdditionalOptions>/ASSEMBLYRESOURCE:$(INTEROP_ASSEMBLY_RESOURCES) %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>$(ProjectDir)..\bin\$(Configuration)Module\bin\System.Data.SQLite.netmodule;%(AdditionalDependencies)</AdditionalDependencies> <Version>$(INTEROP_MANIFEST_VERSION)</Version> <ModuleDefinitionFile>src\core\sqlite3.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <GenerateMapFile>true</GenerateMapFile> <MapExports>true</MapExports> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX86</TargetMachine> <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck> <KeyFile>$(INTEROP_KEY_FILE)</KeyFile> <DelaySign>true</DelaySign> </Link> <Manifest> <VerboseOutput>true</VerboseOutput> <AssemblyIdentity>$(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32</AssemblyIdentity> <UpdateFileHashes>true</UpdateFileHashes> </Manifest> <PostBuildEvent> <Command>"$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="src\win\AssemblyInfo.cpp"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\win\crypt.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\contrib\extension-functions.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\win\interop.c" /> <ClCompile Include="src\core\sqlite3.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> </ItemGroup> <ItemGroup> <None Include="src\core\sqlite3.def" /> </ItemGroup> <ItemGroup> <ClInclude Include="src\core\sqlite3.h" /> <ClInclude Include="src\core\sqlite3ext.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="..\System.Data.SQLite\SR.resx"> <LogicalName>$(IntDir)System.Data.SQLite.%(Filename).resources</LogicalName> <SubType>Designer</SubType> </EmbeddedResource> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> </Project> |
Changes to SQLite.Interop/SQLite.Interop.2010.vcxproj.filters.
︙ | ︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 | </Filter> <Filter Include="Resource Files"> <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions> </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="src\core\sqlite3.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> <None Include="src\core\sqlite3.def"> <Filter>Source Files</Filter> | > > > > > > > > > > > > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | </Filter> <Filter Include="Resource Files"> <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions> </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="src\win\AssemblyInfo.cpp"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\win\crypt.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\contrib\extension-functions.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\win\interop.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\core\sqlite3.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> <None Include="src\core\sqlite3.def"> <Filter>Source Files</Filter> |
︙ | ︙ | |||
40 41 42 43 44 45 46 47 48 | <Filter>Header Files</Filter> </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc"> <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> </Project> | > > > | 52 53 54 55 56 57 58 59 60 61 62 63 | <Filter>Header Files</Filter> </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc"> <Filter>Resource Files</Filter> </ResourceCompile> <EmbeddedResource Include="..\System.Data.SQLite\SR.resx"> <Filter>Resource Files</Filter> </EmbeddedResource> </ItemGroup> </Project> |
Changes to SQLite.Interop/props/SQLite.Interop.props.
︙ | ︙ | |||
8 9 10 11 12 13 14 | * --> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup Label="UserMacros"> <INTEROP_MANIFEST_VERSION>1.0.67.0</INTEROP_MANIFEST_VERSION> <INTEROP_RC_VERSION>1,0,67,0</INTEROP_RC_VERSION> <INTEROP_ASSEMBLY_RESOURCES>..\System.Data.SQLite\SQLiteCommand.bmp,System.Data.SQLite.SQLiteCommand.bmp
/ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteConnection.bmp,System.Data.SQLite.SQLiteConnection.bmp
/ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteDataAdapter.bmp,System.Data.SQLite.SQLiteDataAdapter.bmp</INTEROP_ASSEMBLY_RESOURCES> | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | * --> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup Label="UserMacros"> <INTEROP_MANIFEST_VERSION>1.0.67.0</INTEROP_MANIFEST_VERSION> <INTEROP_RC_VERSION>1,0,67,0</INTEROP_RC_VERSION> <INTEROP_ASSEMBLY_RESOURCES>..\System.Data.SQLite\SQLiteCommand.bmp,System.Data.SQLite.SQLiteCommand.bmp
/ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteConnection.bmp,System.Data.SQLite.SQLiteConnection.bmp
/ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteDataAdapter.bmp,System.Data.SQLite.SQLiteDataAdapter.bmp</INTEROP_ASSEMBLY_RESOURCES> <INTEROP_KEY_FILE>$(ProjectDir)..\System.Data.SQLite\System.Data.SQLite.snk</INTEROP_KEY_FILE> </PropertyGroup> <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> </PropertyGroup> <ItemGroup> <BuildMacro Include="INTEROP_MANIFEST_VERSION"> <Value>$(INTEROP_MANIFEST_VERSION)</Value> |
︙ | ︙ |
Changes to SQLite.Interop/props/SQLite.Interop.vsprops.
︙ | ︙ | |||
25 26 27 28 29 30 31 | <UserMacro Name="INTEROP_ASSEMBLY_RESOURCES" Value="..\System.Data.SQLite\SQLiteCommand.bmp,System.Data.SQLite.SQLiteCommand.bmp
/ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteConnection.bmp,System.Data.SQLite.SQLiteConnection.bmp
/ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteDataAdapter.bmp,System.Data.SQLite.SQLiteDataAdapter.bmp" PerformEnvironmentSet="true" /> <UserMacro Name="INTEROP_KEY_FILE" | | | 25 26 27 28 29 30 31 32 33 34 35 | <UserMacro Name="INTEROP_ASSEMBLY_RESOURCES" Value="..\System.Data.SQLite\SQLiteCommand.bmp,System.Data.SQLite.SQLiteCommand.bmp
/ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteConnection.bmp,System.Data.SQLite.SQLiteConnection.bmp
/ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteDataAdapter.bmp,System.Data.SQLite.SQLiteDataAdapter.bmp" PerformEnvironmentSet="true" /> <UserMacro Name="INTEROP_KEY_FILE" Value="$(ProjectDir)..\System.Data.SQLite\System.Data.SQLite.snk" PerformEnvironmentSet="true" /> </VisualStudioPropertySheet> |