Skip to content

Commit 492e706

Browse files
committed
adding nuget to examples projects
2 parents 5a0c099 + 3154141 commit 492e706

File tree

6 files changed

+29
-4
lines changed

6 files changed

+29
-4
lines changed

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ build
2121
*.cache
2222

2323
*~
24-
24+
src/packages
25+
*.ncrunchsolution
26+
*.ncrunchproject
2527
*.swp
2628
TestResult.xml
2729
src/packages/
2830
TestResult.xml
29-
build/
31+
build/

src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,12 @@
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>
78+
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
79+
<HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
7780
</Reference>
7881
<Reference Include="System" />
7982
<Reference Include="System.Core">
@@ -118,6 +121,9 @@
118121
<Install>true</Install>
119122
</BootstrapperPackage>
120123
</ItemGroup>
124+
<ItemGroup>
125+
<None Include="packages.config" />
126+
</ItemGroup>
121127
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
122128
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
123129
Other similar extension points exist, see Microsoft.Common.targets.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
4+
<<<<<<< HEAD
45
<package id="NHibernate" version="3.0.0.4000" targetFramework="net35" />
6+
=======
7+
<package id="NHibernate" version="3.3.3.4000" targetFramework="net35" />
8+
>>>>>>> examplesToNuget
59
</packages>

src/Examples.FirstProject/Examples.FirstProject.csproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,12 @@
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>
78+
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
79+
<HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
7780
</Reference>
7881
<Reference Include="System" />
7982
<Reference Include="System.Core">
@@ -131,6 +134,9 @@
131134
<Install>true</Install>
132135
</BootstrapperPackage>
133136
</ItemGroup>
137+
<ItemGroup>
138+
<None Include="packages.config" />
139+
</ItemGroup>
134140
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
135141
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
136142
Other similar extension points exist, see Microsoft.Common.targets.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
4+
<<<<<<< HEAD
45
<package id="NHibernate" version="3.0.0.4000" targetFramework="net35" />
6+
=======
7+
<package id="NHibernate" version="3.3.3.4000" targetFramework="net35" />
8+
>>>>>>> examplesToNuget
59
</packages>

src/packages/repositories.config

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

0 commit comments

Comments
 (0)