System.Data.SQLite
Check-in [b23659c738]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove superfluous property setting from the NuGet install script. Fix typo in the NuGet targets file.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | nugetChanges
Files: files | file ages | folders
SHA1: b23659c73846664396d459f65f0b68e43db83893
User & Date: mistachkin 2014-09-04 00:41:57
Context
2014-09-04
00:52
All uses of the Join-Path cmdlet should probably use the -Resolve option. check-in: 5fafa3aa6e user: mistachkin tags: nugetChanges
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
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to NuGet/shared/Core/build/System.Data.SQLite.Core.targets.

59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
      <Output ItemName="SQLiteInteropX64Files" TaskParameter="Include" />
    </CreateItem>

    <Delete Condition="'@(SQLiteInteropX86Files)' != ''"
            Files="@(SQLiteInteropX86Files)" />

    <Delete Condition="'@(SQLiteInteropX64Files)' != ''"
            Files="@(SQLiteInteropX86Files)" />
  </Target>

  <!--
  ******************************************************************************
  **                      Per-Solution Packages Support                       **
  ******************************************************************************
  -->







|







59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
      <Output ItemName="SQLiteInteropX64Files" TaskParameter="Include" />
    </CreateItem>

    <Delete Condition="'@(SQLiteInteropX86Files)' != ''"
            Files="@(SQLiteInteropX86Files)" />

    <Delete Condition="'@(SQLiteInteropX64Files)' != ''"
            Files="@(SQLiteInteropX64Files)" />
  </Target>

  <!--
  ******************************************************************************
  **                      Per-Solution Packages Support                       **
  ******************************************************************************
  -->

Changes to NuGet/shared/Core/tools/install.ps1.

7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
..
61
62
63
64
65
66
67
68
69
#
###############################################################################

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

................................................................................
    continue
  }

  $itemSourceDirectory = Join-Path $buildPath $platformName
  $itemSourceFileName = Join-Path $itemSourceDirectory $fileName

  $item = $folder.ProjectItems.AddFromFile($itemSourceFileName)
  $item.Properties.Item($copyToOutputDirectoryPropertyName).Value = 1
}







<







 







<

7
8
9
10
11
12
13

14
15
16
17
18
19
20
..
60
61
62
63
64
65
66

67
#
###############################################################################

param($installPath, $toolsPath, $package, $project)

$platformNames = "x86", "x64"
$fileName = "SQLite.Interop.dll"


$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

................................................................................
    continue
  }

  $itemSourceDirectory = Join-Path $buildPath $platformName
  $itemSourceFileName = Join-Path $itemSourceDirectory $fileName

  $item = $folder.ProjectItems.AddFromFile($itemSourceFileName)

}