Skip to content

Commit 027398b

Browse files
chester89chester89
committed
changed all projects to .Net 4.0 - some issues remain
1 parent 4d2348d commit 027398b

File tree

17 files changed

+61
-83
lines changed

17 files changed

+61
-83
lines changed

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

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Examples.FirstAutomappedProject</RootNamespace>
1212
<AssemblyName>Examples.FirstAutomappedProject</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<StartupObject>Examples.FirstAutomappedProject.Program</StartupObject>
1616
<FileUpgradeFlags></FileUpgradeFlags>
@@ -31,6 +31,7 @@
3131
<IsWebBootstrapper>false</IsWebBootstrapper>
3232
<UseApplicationTrust>false</UseApplicationTrust>
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
34+
<TargetFrameworkProfile />
3435
</PropertyGroup>
3536
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3637
<DebugSymbols>true</DebugSymbols>
@@ -71,11 +72,8 @@
7172
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
7273
</PropertyGroup>
7374
<ItemGroup>
74-
<Reference Include="NHibernate">
75-
<HintPath>..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll</HintPath>
76-
</Reference>
77-
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
75+
<Reference Include="NHibernate">
76+
<HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>
7977
</Reference>
8078
<Reference Include="System" />
8179
<Reference Include="System.Core">
@@ -96,12 +94,6 @@
9694
<Compile Include="Program.cs" />
9795
<Compile Include="Properties\AssemblyInfo.cs" />
9896
</ItemGroup>
99-
<ItemGroup>
100-
<ProjectReference Include="..\FluentNHibernate\FluentNHibernate.csproj">
101-
<Project>{529145D5-6CC3-4016-89B5-826563024AF1}</Project>
102-
<Name>FluentNHibernate</Name>
103-
</ProjectReference>
104-
</ItemGroup>
10597
<ItemGroup>
10698
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
10799
<Visible>False</Visible>
@@ -119,11 +111,17 @@
119111
<Install>true</Install>
120112
</BootstrapperPackage>
121113
</ItemGroup>
114+
<ItemGroup>
115+
<ProjectReference Include="..\FluentNHibernate\FluentNHibernate.csproj">
116+
<Project>{529145d5-6cc3-4016-89b5-826563024af1}</Project>
117+
<Name>FluentNHibernate</Name>
118+
</ProjectReference>
119+
</ItemGroup>
122120
<ItemGroup>
123121
<None Include="app.config" />
124-
<None Include="packages.config">
122+
<None Include="packages.config">
125123
<SubType>Designer</SubType>
126-
</None>
124+
</None>
127125
</ItemGroup>
128126
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
129127
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Examples.FirstAutomappedProject/app.config

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0"?>
22
<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>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
5+
</startup>
6+
</configuration>
7+

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Examples.FirstProject</RootNamespace>
1212
<AssemblyName>Examples.FirstProject</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<StartupObject>Examples.FirstProject.Program</StartupObject>
1616
<FileUpgradeFlags></FileUpgradeFlags>
@@ -31,6 +31,7 @@
3131
<IsWebBootstrapper>false</IsWebBootstrapper>
3232
<UseApplicationTrust>false</UseApplicationTrust>
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
34+
<TargetFrameworkProfile />
3435
</PropertyGroup>
3536
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3637
<DebugSymbols>true</DebugSymbols>
@@ -72,18 +73,15 @@
7273
</PropertyGroup>
7374
<ItemGroup>
7475
<Reference Include="NHibernate">
75-
<HintPath>..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll</HintPath>
76-
</Reference>
77-
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
76+
<HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>
7977
</Reference>
8078
<Reference Include="System" />
8179
<Reference Include="System.Core">
8280
<RequiredTargetFramework>3.5</RequiredTargetFramework>
8381
</Reference>
8482
<Reference Include="System.Data" />
8583
<Reference Include="System.Data.SQLite, Version=1.0.66.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
86-
<HintPath>..\packages\System.Data.SQLite.1.0.66.1\lib\System.Data.SQLite.DLL</HintPath>
84+
<HintPath>..\..\tools\sqlite\System.Data.SQLite.DLL</HintPath>
8785
</Reference>
8886
</ItemGroup>
8987
<ItemGroup>
@@ -133,8 +131,7 @@
133131
</BootstrapperPackage>
134132
</ItemGroup>
135133
<ItemGroup>
136-
<None Include="app.config" />
137-
<None Include="packages.config" />
134+
<None Include="app.config" />
138135
</ItemGroup>
139136
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
140137
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Examples.FirstProject/app.config

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0"?>
22
<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>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
5+
</startup>
6+
</configuration>
7+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>FluentNHibernate.Specs.ExternalFixtures</RootNamespace>
1212
<AssemblyName>FluentNHibernate.Specs.ExternalFixtures</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
1616
</PropertyGroup>

‎src/FluentNHibernate.Specs/Conventions/Fixtures/SetCollectionEntity.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Iesi.Collections.Generic;
1+
using System.Collections.Generic;
2+
using Iesi.Collections.Generic;
23

34
namespace FluentNHibernate.Specs.Conventions.Fixtures
45
{

‎src/FluentNHibernate.Specs/Conventions/Fixtures/SetCompositeElementCollectionEntity.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Iesi.Collections.Generic;
1+
using System.Collections.Generic;
2+
using Iesi.Collections.Generic;
23

34
namespace FluentNHibernate.Specs.Conventions.Fixtures
45
{

‎src/FluentNHibernate.Specs/Conventions/Fixtures/SetElementCollectionEntity.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Iesi.Collections.Generic;
1+
using System.Collections.Generic;
2+
using Iesi.Collections.Generic;
23

34
namespace FluentNHibernate.Specs.Conventions.Fixtures
45
{

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>FluentNHibernate.Specs</RootNamespace>
1212
<AssemblyName>FluentNHibernate.Specs</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
@@ -31,6 +31,7 @@
3131
<IsWebBootstrapper>false</IsWebBootstrapper>
3232
<UseApplicationTrust>false</UseApplicationTrust>
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
34+
<TargetFrameworkProfile />
3435
</PropertyGroup>
3536
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3637
<DebugSymbols>true</DebugSymbols>

‎src/FluentNHibernate.Testing/App.config

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

0 commit comments

Comments
 (0)