changed all projects to .Net 4.0 - some issues remain

chester89 · chester89 · commit 6abbbd165f9e · 2013-08-14T23:04:12.000+04:00
diff --git a/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj b/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Examples.FirstAutomappedProject</RootNamespace>
     <AssemblyName>Examples.FirstAutomappedProject</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject>Examples.FirstAutomappedProject.Program</StartupObject>
     <FileUpgradeFlags>
@@ -32,6 +32,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,8 +73,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NHibernate, Version=2.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="NHibernate">
       <HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -96,12 +96,6 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\FluentNHibernate\FluentNHibernate.csproj">
-      <Project>{529145D5-6CC3-4016-89B5-826563024AF1}</Project>
-      <Name>FluentNHibernate</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>
@@ -119,6 +113,15 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FluentNHibernate\FluentNHibernate.csproj">
+      <Project>{529145d5-6cc3-4016-89b5-826563024af1}</Project>
+      <Name>FluentNHibernate</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Examples.FirstAutomappedProject/app.config b/src/Examples.FirstAutomappedProject/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/src/Examples.FirstProject/Examples.FirstProject.csproj b/src/Examples.FirstProject/Examples.FirstProject.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Examples.FirstProject</RootNamespace>
     <AssemblyName>Examples.FirstProject</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject>Examples.FirstProject.Program</StartupObject>
     <FileUpgradeFlags>
@@ -32,6 +32,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -132,6 +133,9 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Examples.FirstProject/Examples.FirstProject.csproj.user b/src/Examples.FirstProject/Examples.FirstProject.csproj.user
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
     <PublishUrlHistory />
     <InstallUrlHistory />
     <SupportUrlHistory />
diff --git a/src/Examples.FirstProject/app.config b/src/Examples.FirstProject/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj b/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FluentNHibernate.Specs.ExternalFixtures</RootNamespace>
     <AssemblyName>FluentNHibernate.Specs.ExternalFixtures</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/src/FluentNHibernate.Specs/Conventions/Fixtures/SetCollectionEntity.cs b/src/FluentNHibernate.Specs/Conventions/Fixtures/SetCollectionEntity.cs
@@ -1,4 +1,5 @@
-﻿using Iesi.Collections.Generic;
+﻿using System.Collections.Generic;
+using Iesi.Collections.Generic;
 
 namespace FluentNHibernate.Specs.Conventions.Fixtures
 {
diff --git a/src/FluentNHibernate.Specs/Conventions/Fixtures/SetCompositeElementCollectionEntity.cs b/src/FluentNHibernate.Specs/Conventions/Fixtures/SetCompositeElementCollectionEntity.cs
@@ -1,4 +1,5 @@
-﻿using Iesi.Collections.Generic;
+﻿using System.Collections.Generic;
+using Iesi.Collections.Generic;
 
 namespace FluentNHibernate.Specs.Conventions.Fixtures
 {
diff --git a/src/FluentNHibernate.Specs/Conventions/Fixtures/SetElementCollectionEntity.cs b/src/FluentNHibernate.Specs/Conventions/Fixtures/SetElementCollectionEntity.cs
@@ -1,4 +1,5 @@
-﻿using Iesi.Collections.Generic;
+﻿using System.Collections.Generic;
+using Iesi.Collections.Generic;
 
 namespace FluentNHibernate.Specs.Conventions.Fixtures
 {
diff --git a/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj b/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FluentNHibernate.Specs</RootNamespace>
     <AssemblyName>FluentNHibernate.Specs</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -31,6 +31,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/FluentNHibernate.Testing/App.config b/src/FluentNHibernate.Testing/App.config
@@ -1,9 +1,9 @@
-﻿<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
   <appSettings>
-    <add key="connectionString" value="a-connection-string" />
+    <add key="connectionString" value="a-connection-string"/>
   </appSettings>
   <connectionStrings>
-    <add name="main" connectionString="connection string" />
+    <add name="main" connectionString="connection string"/>
   </connectionStrings>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/src/FluentNHibernate.Testing/AutoMapping/ManyToMany.cs b/src/FluentNHibernate.Testing/AutoMapping/ManyToMany.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Iesi.Collections.Generic;
 
 namespace FluentNHibernate.Testing.Automapping
diff --git a/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj b/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FluentNHibernate.Testing</RootNamespace>
     <AssemblyName>FluentNHibernate.Testing</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>..\FluentKey.snk</AssemblyOriginatorKeyFile>
@@ -33,6 +33,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/FluentNHibernate.Testing/Testing/Values/Entities.cs b/src/FluentNHibernate.Testing/Testing/Values/Entities.cs
@@ -16,8 +16,8 @@ public ListEntity()
             GetterAndSetter = new List<string>();
             GetterAndPrivateSetter = new List<string>();
 
-            TypedSet = new HashedSet<string>();
-            Set = new HashedSet();
+            TypedSet = new LinkedHashSet<string>();
+            //Set = new HashedSet();
             Collection = new StringCollection();
             List = new List<string>();
         }
@@ -30,7 +30,7 @@ public IEnumerable<string> BackingField
         }
 
         public ISet<string> TypedSet { get; set; }
-        public ISet Set { get; set; }
+        //public ISet Set { get; set; }
         public ICollection Collection { get; set; }
         public string[] Array { get; set; }
         public IList<string> List { get; set; }
diff --git a/src/FluentNHibernate/FluentNHibernate.csproj b/src/FluentNHibernate/FluentNHibernate.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FluentNHibernate</RootNamespace>
     <AssemblyName>FluentNHibernate</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\FluentKey.snk</AssemblyOriginatorKeyFile>
@@ -33,6 +33,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -63,7 +64,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\tools\NHibernate\Iesi.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="NHibernate, Version=2.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+    <Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>
     </Reference>
diff --git a/src/FluentNHibernate/Testing/Values/List.cs b/src/FluentNHibernate/Testing/Values/List.cs
@@ -38,12 +38,12 @@ public override Action<T, Accessor, IEnumerable<TListElement>> ValueSetter
                     // infallible.
                     if (propertyAccessor.PropertyType.IsAssignableFrom(typeof(ISet<TListElement>)))
                     {
-                        collection = new HashedSet<TListElement>(Expected.ToList());
-                    }
-                    else if (propertyAccessor.PropertyType.IsAssignableFrom(typeof(ISet)))
-                    {
-                        collection = new HashedSet((ICollection)Expected);
+                        collection = new LinkedHashSet<TListElement>(Expected.ToList());
                     }
+                    //else if (propertyAccessor.PropertyType.IsAssignableFrom(typeof(ISet)))
+                    //{
+                    //    collection = new HashedSet((ICollection)Expected);
+                    //}
                     else if (propertyAccessor.PropertyType.IsArray)
                     {
                         collection = Array.CreateInstance(typeof(TListElement), Expected.Count());
diff --git a/tools/NHibernate/Antlr3.Runtime.dll b/tools/NHibernate/Antlr3.Runtime.dll
diff --git a/tools/NHibernate/Iesi.Collections.dll b/tools/NHibernate/Iesi.Collections.dll
diff --git a/tools/NHibernate/NHibernate.dll b/tools/NHibernate/NHibernate.dll
diff --git a/tools/NHibernate/Remotion.Linq.dll b/tools/NHibernate/Remotion.Linq.dll

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?xml version="1.0"?>`
	`2`	`+<configuration>`
	`3`	`+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using Iesi.Collections.Generic;`
	`1`	`+using System.Collections.Generic;`
	`2`	`+using Iesi.Collections.Generic;`
`2`	`3`
`3`	`4`	`namespace FluentNHibernate.Specs.Conventions.Fixtures`
`4`	`5`	`{`