Skip to content

Commit 641c528

Browse files
chester89chester89
committed
merged latest changes
2 parents ff1a7b0 + 75f5c2a commit 641c528

File tree

9 files changed

+28
-27
lines changed

9 files changed

+28
-27
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
7373
</PropertyGroup>
7474
<ItemGroup>
75-
<Reference Include="NHibernate">
76-
<HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>
75+
<Reference Include="NHibernate">
76+
<HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>
7777
</Reference>
7878
<Reference Include="System" />
7979
<Reference Include="System.Core">
@@ -111,7 +111,7 @@
111111
<Install>true</Install>
112112
</BootstrapperPackage>
113113
</ItemGroup>
114-
<ItemGroup>
114+
<ItemGroup>
115115
<ProjectReference Include="..\FluentNHibernate\FluentNHibernate.csproj">
116116
<Project>{529145d5-6cc3-4016-89b5-826563024af1}</Project>
117117
<Name>FluentNHibernate</Name>
@@ -121,7 +121,7 @@
121121
<None Include="app.config" />
122122
<None Include="packages.config">
123123
<SubType>Designer</SubType>
124-
</None>
124+
</None>
125125
</ItemGroup>
126126
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
127127
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Examples.FirstAutomappedProject/app.config

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0"?>
22
<configuration>
3-
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
5-
</startup>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
5+
</startup>
66
</configuration>
7-

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
<RequiredTargetFramework>3.5</RequiredTargetFramework>
8181
</Reference>
8282
<Reference Include="System.Data" />
83-
<Reference Include="System.Data.SQLite, Version=1.0.66.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
84-
<HintPath>..\..\tools\sqlite\System.Data.SQLite.DLL</HintPath>
83+
<Reference Include="System.Data.SQLite, Version=1.0.66.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
84+
<HintPath>..\packages\System.Data.SQLite.1.0.66.1\lib\System.Data.SQLite.DLL</HintPath>
8585
</Reference>
8686
</ItemGroup>
8787
<ItemGroup>
@@ -131,7 +131,10 @@
131131
</BootstrapperPackage>
132132
</ItemGroup>
133133
<ItemGroup>
134-
<None Include="app.config" />
134+
<None Include="app.config" />
135+
<None Include="packages.config">
136+
<SubType>Designer</SubType>
137+
</None>
135138
</ItemGroup>
136139
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
137140
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Examples.FirstProject/app.config

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0"?>
22
<configuration>
3-
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
5-
</startup>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
5+
</startup>
66
</configuration>
7-

‎src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5656
</PropertyGroup>
5757
<ItemGroup>
58-
<Reference Include="Machine.Specifications, Version=0.5.15.0, Culture=neutral, processorArchitecture=MSIL">
58+
<Reference Include="Machine.Specifications, Version=0.5.15.0, Culture=neutral, processorArchitecture=MSIL">
5959
<SpecificVersion>False</SpecificVersion>
6060
<HintPath>..\packages\Machine.Specifications.0.5.15\lib\net40\Machine.Specifications.dll</HintPath>
6161
</Reference>

‎src/FluentNHibernate.Testing/App.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<appSettings>
44
<add key="connectionString" value="a-connection-string"/>
55
</appSettings>
6-
<connectionStrings>
6+
<connectionStrings>
77
<add name="main" connectionString="connection string"/>
88
</connectionStrings>
9-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
10-
</startup>
11-
</configuration>
9+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
10+
</startup>
11+
</configuration>

‎src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<DocumentationFile>
5959
</DocumentationFile>
6060
</PropertyGroup>
61-
<ItemGroup>
61+
<ItemGroup>
6262
<Reference Include="FakeItEasy">
6363
<HintPath>..\packages\FakeItEasy.1.15.0\lib\net35\FakeItEasy.dll</HintPath>
6464
</Reference>
@@ -69,7 +69,7 @@
6969
<SpecificVersion>False</SpecificVersion>
7070
<HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>
7171
</Reference>
72-
<Reference Include="nunit.framework, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
72+
<Reference Include="nunit.framework, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>
7474
<HintPath>..\packages\NUnit.2.5.7.10213\lib\nunit.framework.dll</HintPath>
7575
</Reference>

‎src/FluentNHibernate/FluentNHibernate.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<NoWarn>1591</NoWarn>
6060
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
6161
</PropertyGroup>
62-
<ItemGroup>
62+
<ItemGroup>
6363
<Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
6464
<SpecificVersion>False</SpecificVersion>
6565
<HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>

‎src/FluentNHibernate/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
// associated with an assembly.
88
[assembly: AssemblyTitle("FluentNHibernate")]
99
[assembly: AssemblyDescription("")]
10-
[assembly: CLSCompliant(true)]
11-
[assembly: AssemblyVersionAttribute("1.4.0.0")]
12-
[assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)]
10+
[assembly: CLSCompliant(true)]
11+
[assembly: AssemblyVersionAttribute("1.4.0.0")]
12+
[assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)]

0 commit comments

Comments
 (0)