Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | More work on per-solution interop DLLs. Simplify MSBuild targets. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | nugetChanges |
Files: | files | file ages | folders |
SHA1: |
490683e92410a7106b2f38677e58a674 |
User & Date: | mistachkin 2014-09-04 00:29:28.521 |
Context
2014-09-04
| ||
00:41 | Remove superfluous property setting from the NuGet install script. Fix typo in the NuGet targets file. check-in: b23659c738 user: mistachkin tags: nugetChanges | |
00:29 | More work on per-solution interop DLLs. Simplify MSBuild targets. check-in: 490683e924 user: mistachkin tags: nugetChanges | |
2014-09-03
| ||
22:49 | More refactoring of shared files. Add MSBuild targets for later use. check-in: 857c4992b2 user: mistachkin tags: nugetChanges | |
Changes
Changes to NuGet/SQLite.Core.Beta.nuspec.
︙ | ︙ | |||
26 27 28 29 30 31 32 | <file src="..\bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" /> <file src="..\bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" /> <file src="..\bin\2010\Release\bin\System.Data.SQLite.xml" target="lib\net40" /> <file src="..\bin\2012\Release\bin\System.Data.SQLite.dll" target="lib\net45" /> <file src="..\bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" /> <file src="..\bin\2013\Release\bin\System.Data.SQLite.dll" target="lib\net451" /> <file src="..\bin\2013\Release\bin\System.Data.SQLite.xml" target="lib\net451" /> | | | | | | | | | > > > > | 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 | <file src="..\bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" /> <file src="..\bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" /> <file src="..\bin\2010\Release\bin\System.Data.SQLite.xml" target="lib\net40" /> <file src="..\bin\2012\Release\bin\System.Data.SQLite.dll" target="lib\net45" /> <file src="..\bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" /> <file src="..\bin\2013\Release\bin\System.Data.SQLite.dll" target="lib\net451" /> <file src="..\bin\2013\Release\bin\System.Data.SQLite.xml" target="lib\net451" /> <file src="..\bin\2008\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net20\x86" /> <file src="..\bin\2008\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net20\x64" /> <file src="..\bin\2010\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net40\x86" /> <file src="..\bin\2010\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net40\x64" /> <file src="..\bin\2012\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x86" /> <file src="..\bin\2012\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x64" /> <file src="..\bin\2013\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x86" /> <file src="..\bin\2013\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x64" /> <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net20\System.Data.SQLite.Core.targets" /> <file src="shared\Core\tools\install.ps1" target="tools\net20\install.ps1" /> <file src="shared\Core\tools\uninstall.ps1" target="tools\net20\uninstall.ps1" /> <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net40\System.Data.SQLite.Core.targets" /> <file src="shared\Core\tools\install.ps1" target="tools\net40\install.ps1" /> <file src="shared\Core\tools\uninstall.ps1" target="tools\net40\uninstall.ps1" /> <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net45\System.Data.SQLite.Core.targets" /> <file src="shared\Core\tools\install.ps1" target="tools\net45\install.ps1" /> <file src="shared\Core\tools\uninstall.ps1" target="tools\net45\uninstall.ps1" /> <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net451\System.Data.SQLite.Core.targets" /> <file src="shared\Core\tools\install.ps1" target="tools\net451\install.ps1" /> <file src="shared\Core\tools\uninstall.ps1" target="tools\net451\uninstall.ps1" /> </files> </package> |
Changes to NuGet/SQLite.Core.Test.nuspec.
︙ | ︙ | |||
26 27 28 29 30 31 32 | <file src="..\bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" /> <file src="..\bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" /> <file src="..\bin\2010\Release\bin\System.Data.SQLite.xml" target="lib\net40" /> <file src="..\bin\2012\Release\bin\System.Data.SQLite.dll" target="lib\net45" /> <file src="..\bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" /> <file src="..\bin\2013\Release\bin\System.Data.SQLite.dll" target="lib\net451" /> <file src="..\bin\2013\Release\bin\System.Data.SQLite.xml" target="lib\net451" /> | | | | | | | | | > > > > | 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 | <file src="..\bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" /> <file src="..\bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" /> <file src="..\bin\2010\Release\bin\System.Data.SQLite.xml" target="lib\net40" /> <file src="..\bin\2012\Release\bin\System.Data.SQLite.dll" target="lib\net45" /> <file src="..\bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" /> <file src="..\bin\2013\Release\bin\System.Data.SQLite.dll" target="lib\net451" /> <file src="..\bin\2013\Release\bin\System.Data.SQLite.xml" target="lib\net451" /> <file src="..\bin\2008\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net20\x86" /> <file src="..\bin\2008\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net20\x64" /> <file src="..\bin\2010\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net40\x86" /> <file src="..\bin\2010\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net40\x64" /> <file src="..\bin\2012\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x86" /> <file src="..\bin\2012\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x64" /> <file src="..\bin\2013\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x86" /> <file src="..\bin\2013\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x64" /> <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net20\System.Data.SQLite.Core.targets" /> <file src="shared\Core\tools\install.ps1" target="tools\net20\install.ps1" /> <file src="shared\Core\tools\uninstall.ps1" target="tools\net20\uninstall.ps1" /> <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net40\System.Data.SQLite.Core.targets" /> <file src="shared\Core\tools\install.ps1" target="tools\net40\install.ps1" /> <file src="shared\Core\tools\uninstall.ps1" target="tools\net40\uninstall.ps1" /> <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net45\System.Data.SQLite.Core.targets" /> <file src="shared\Core\tools\install.ps1" target="tools\net45\install.ps1" /> <file src="shared\Core\tools\uninstall.ps1" target="tools\net45\uninstall.ps1" /> <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net451\System.Data.SQLite.Core.targets" /> <file src="shared\Core\tools\install.ps1" target="tools\net451\install.ps1" /> <file src="shared\Core\tools\uninstall.ps1" target="tools\net451\uninstall.ps1" /> </files> </package> |
Changes to NuGet/SQLite.Core.nuspec.
︙ | ︙ | |||
26 27 28 29 30 31 32 | <file src="..\bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" /> <file src="..\bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" /> <file src="..\bin\2010\Release\bin\System.Data.SQLite.xml" target="lib\net40" /> <file src="..\bin\2012\Release\bin\System.Data.SQLite.dll" target="lib\net45" /> <file src="..\bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" /> <file src="..\bin\2013\Release\bin\System.Data.SQLite.dll" target="lib\net451" /> <file src="..\bin\2013\Release\bin\System.Data.SQLite.xml" target="lib\net451" /> | | | | | | | | | > > > > | 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 | <file src="..\bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" /> <file src="..\bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" /> <file src="..\bin\2010\Release\bin\System.Data.SQLite.xml" target="lib\net40" /> <file src="..\bin\2012\Release\bin\System.Data.SQLite.dll" target="lib\net45" /> <file src="..\bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" /> <file src="..\bin\2013\Release\bin\System.Data.SQLite.dll" target="lib\net451" /> <file src="..\bin\2013\Release\bin\System.Data.SQLite.xml" target="lib\net451" /> <file src="..\bin\2008\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net20\x86" /> <file src="..\bin\2008\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net20\x64" /> <file src="..\bin\2010\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net40\x86" /> <file src="..\bin\2010\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net40\x64" /> <file src="..\bin\2012\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x86" /> <file src="..\bin\2012\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x64" /> <file src="..\bin\2013\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x86" /> <file src="..\bin\2013\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x64" /> <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net20\System.Data.SQLite.Core.targets" /> <file src="shared\Core\tools\install.ps1" target="tools\net20\install.ps1" /> <file src="shared\Core\tools\uninstall.ps1" target="tools\net20\uninstall.ps1" /> <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net40\System.Data.SQLite.Core.targets" /> <file src="shared\Core\tools\install.ps1" target="tools\net40\install.ps1" /> <file src="shared\Core\tools\uninstall.ps1" target="tools\net40\uninstall.ps1" /> <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net45\System.Data.SQLite.Core.targets" /> <file src="shared\Core\tools\install.ps1" target="tools\net45\install.ps1" /> <file src="shared\Core\tools\uninstall.ps1" target="tools\net45\uninstall.ps1" /> <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net451\System.Data.SQLite.Core.targets" /> <file src="shared\Core\tools\install.ps1" target="tools\net451\install.ps1" /> <file src="shared\Core\tools\uninstall.ps1" target="tools\net451\uninstall.ps1" /> </files> </package> |
Changes to NuGet/shared/Core/build/System.Data.SQLite.Core.targets.
︙ | ︙ | |||
9 10 11 12 13 14 15 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <!-- ****************************************************************************** ** SQLite Interop Library Build Targets ** ****************************************************************************** --> | | | | | < | > > | | < < < < | | < < < < < < < < < < < < < < < < < < < < < < | 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 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <!-- ****************************************************************************** ** SQLite Interop Library Build Targets ** ****************************************************************************** --> <Target Name="CopySQLiteInteropFiles" Condition="'$(CopySQLiteInteropFiles)' != 'false' And '$(MSBuildThisFileDirectory)' != '' And HasTrailingSlash('$(MSBuildThisFileDirectory)') And '$(OutputPath)' != '' And HasTrailingSlash('$(OutputPath)') And Exists('$(OutputPath)')" Inputs="$(TargetPath)" Outputs="$(TargetPath).CopySQLiteInteropFiles.done"> <CreateItem Include="$(MSBuildThisFileDirectory)x86\SQLite.Interop.*"> <Output ItemName="SQLiteInteropX86Files" TaskParameter="Include" /> </CreateItem> <CreateItem Include="$(MSBuildThisFileDirectory)x64\SQLite.Interop.*"> <Output ItemName="SQLiteInteropX64Files" TaskParameter="Include" /> </CreateItem> <Copy SourceFiles="@(SQLiteInteropX86Files)" DestinationFolder="$(OutputPath)x86" /> <Copy SourceFiles="@(SQLiteInteropX64Files)" DestinationFolder="$(OutputPath)x64" /> <Touch AlwaysCreate="true" Files="$(TargetPath).CopySQLiteInteropFiles.done" /> </Target> <!-- ****************************************************************************** --> <Target Name="CleanSQLiteInteropFiles" |
︙ | ︙ | |||
87 88 89 90 91 92 93 | <Delete Condition="'@(SQLiteInteropX86Files)' != ''" Files="@(SQLiteInteropX86Files)" /> <Delete Condition="'@(SQLiteInteropX64Files)' != ''" Files="@(SQLiteInteropX86Files)" /> </Target> | < < < < < < < < < < < < < < < < < < < | < < | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | <Delete Condition="'@(SQLiteInteropX86Files)' != ''" Files="@(SQLiteInteropX86Files)" /> <Delete Condition="'@(SQLiteInteropX64Files)' != ''" Files="@(SQLiteInteropX86Files)" /> </Target> <!-- ****************************************************************************** ** Per-Solution Packages Support ** ****************************************************************************** --> <PropertyGroup> <BuildDependsOn> $(BuildDependsOn); CopySQLiteInteropFiles; </BuildDependsOn> <CleanDependsOn> $(CleanDependsOn); CleanSQLiteInteropFiles; </CleanDependsOn> </PropertyGroup> </Project> |
Changes to NuGet/shared/Core/tools/install.ps1.
︙ | ︙ | |||
9 10 11 12 13 14 15 16 17 18 19 20 21 22 | param($installPath, $toolsPath, $package, $project) $platformNames = "x86", "x64" $fileName = "SQLite.Interop.dll" $copyToOutputDirectoryPropertyName = "CopyToOutputDirectory" foreach($platformName in $platformNames) { $folder = $project.ProjectItems | where { $_.Name -eq $platformName } if ($folder -eq $null) { $projectPath = Split-Path $project.FullName | > > > > > > | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | param($installPath, $toolsPath, $package, $project) $platformNames = "x86", "x64" $fileName = "SQLite.Interop.dll" $copyToOutputDirectoryPropertyName = "CopyToOutputDirectory" $netFxPath = Split-Path $toolsPath -Leaf $buildPath = Join-Path $toolsPath ".." -Resolve $buildPath = Join-Path $buildPath ".." -Resolve $buildPath = Join-Path $buildPath "build" -Resolve $buildPath = Join-Path $buildPath $netFxPath -Resolve foreach($platformName in $platformNames) { $folder = $project.ProjectItems | where { $_.Name -eq $platformName } if ($folder -eq $null) { $projectPath = Split-Path $project.FullName |
︙ | ︙ | |||
51 52 53 54 55 56 57 | $_.Name -eq $fileName } if ($item -ne $null) { continue } | | | 57 58 59 60 61 62 63 64 65 66 67 68 69 | $_.Name -eq $fileName } if ($item -ne $null) { continue } $itemSourceDirectory = Join-Path $buildPath $platformName $itemSourceFileName = Join-Path $itemSourceDirectory $fileName $item = $folder.ProjectItems.AddFromFile($itemSourceFileName) $item.Properties.Item($copyToOutputDirectoryPropertyName).Value = 1 } |