Skip to content

Commit b80ef04

Browse files
chester89chester89
committed
changed SQLite from local assembly to Nuget in examples
1 parent 3abe8d6 commit b80ef04

File tree

7 files changed

+46
-17
lines changed

7 files changed

+46
-17
lines changed

‎src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,10 @@
8282
<Reference Include="System.Core">
8383
<RequiredTargetFramework>3.5</RequiredTargetFramework>
8484
</Reference>
85-
<Reference Include="System.Data.SQLite, Version=1.0.51.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
86-
<SpecificVersion>False</SpecificVersion>
87-
<HintPath>..\..\tools\sqlite\System.Data.SQLite.dll</HintPath>
88-
</Reference>
8985
<Reference Include="System.Data" />
86+
<Reference Include="System.Data.SQLite, Version=1.0.66.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
87+
<HintPath>..\packages\System.Data.SQLite.1.0.66.1\lib\System.Data.SQLite.DLL</HintPath>
88+
</Reference>
9089
</ItemGroup>
9190
<ItemGroup>
9291
<Compile Include="CascadeConvention.cs" />
@@ -122,6 +121,7 @@
122121
</BootstrapperPackage>
123122
</ItemGroup>
124123
<ItemGroup>
124+
<None Include="app.config" />
125125
<None Include="packages.config">
126126
<SubType>Designer</SubType>
127127
</None>

‎src/Examples.FirstAutomappedProject/app.config

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<connectionStrings>
4+
<add name="Sqlite_InMemory" providerName="System.Data.SQLite" connectionString="Data Source=:memory:;Version=3;New=True" />
5+
</connectionStrings>
6+
<system.data>
7+
<DbProviderFactories>
8+
<remove invariant="System.Data.SQLite" />
9+
<add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
10+
</DbProviderFactories>
11+
</system.data>
12+
<startup useLegacyV2RuntimeActivationPolicy="true">
13+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
14+
</startup>
15+
</configuration>

‎src/Examples.FirstAutomappedProject/packages.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
4-
<package id="NHibernate" version="3.3.1.4000" targetFramework="net35" />
3+
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
4+
<package id="NHibernate" version="3.3.1.4000" targetFramework="net35" />
5+
<package id="System.Data.SQLite" version="1.0.66.1" targetFramework="net35" />
56
</packages>

‎src/Examples.FirstProject/Examples.FirstProject.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,21 @@
7171
<ErrorReport>prompt</ErrorReport>
7272
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
7373
</PropertyGroup>
74-
<ItemGroup>
74+
<ItemGroup>
7575
<Reference Include="NHibernate">
7676
<HintPath>..\packages\NHibernate.3.3.1.4000\lib\Net35\NHibernate.dll</HintPath>
77-
</Reference>
77+
</Reference>
7878
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
7979
<HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
8080
</Reference>
8181
<Reference Include="System" />
8282
<Reference Include="System.Core">
8383
<RequiredTargetFramework>3.5</RequiredTargetFramework>
8484
</Reference>
85-
<Reference Include="System.Data.SQLite, Version=1.0.51.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
86-
<SpecificVersion>False</SpecificVersion>
87-
<HintPath>..\..\tools\sqlite\System.Data.SQLite.dll</HintPath>
88-
</Reference>
8985
<Reference Include="System.Data" />
86+
<Reference Include="System.Data.SQLite, Version=1.0.66.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
87+
<HintPath>..\packages\System.Data.SQLite.1.0.66.1\lib\System.Data.SQLite.DLL</HintPath>
88+
</Reference>
9089
</ItemGroup>
9190
<ItemGroup>
9291
<Compile Include="Entities\Employee.cs">
@@ -135,6 +134,7 @@
135134
</BootstrapperPackage>
136135
</ItemGroup>
137136
<ItemGroup>
137+
<None Include="app.config" />
138138
<None Include="packages.config" />
139139
</ItemGroup>
140140
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎src/Examples.FirstProject/app.config

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<connectionStrings>
4+
<add name="Sqlite_InMemory" providerName="System.Data.SQLite" connectionString="Data Source=:memory:;Version=3;New=True" />
5+
</connectionStrings>
6+
<system.data>
7+
<DbProviderFactories>
8+
<remove invariant="System.Data.SQLite" />
9+
<add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
10+
</DbProviderFactories>
11+
</system.data>
12+
<startup useLegacyV2RuntimeActivationPolicy="true">
13+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
14+
</startup>
15+
</configuration>

‎src/Examples.FirstProject/packages.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
4-
<package id="NHibernate" version="3.3.1.4000" targetFramework="net35" />
3+
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
4+
<package id="NHibernate" version="3.3.1.4000" targetFramework="net35" />
5+
<package id="System.Data.SQLite" version="1.0.66.1" targetFramework="net35" />
56
</packages>

‎src/packages/repositories.config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
<repositories>
33
<repository path="..\Examples.FirstAutomappedProject\packages.config" />
44
<repository path="..\Examples.FirstProject\packages.config" />
5-
<<<<<<< HEAD
65
<repository path="..\FluentNHibernate.Specs.ExternalFixtures\packages.config" />
7-
=======
8-
>>>>>>> examplesToNuget
96
<repository path="..\FluentNHibernate.Specs\packages.config" />
107
<repository path="..\FluentNHibernate.Testing\packages.config" />
118
<repository path="..\FluentNHibernate\packages.config" />

0 commit comments

Comments
 (0)