浏览代码

Migration VS2017

olivier.massot 7 年之前
父节点
当前提交
553353f61b

+ 6 - 0
CD67.FicheCollege.Factory/CD67.FicheCollege.Factory.csproj

@@ -47,6 +47,9 @@
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
     </Reference>
+    <Reference Include="Npgsql, Version=3.2.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Npgsql.3.2.7\lib\net451\Npgsql.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Core" />
@@ -56,6 +59,9 @@
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data.DataSetExtensions" />

+ 2 - 0
CD67.FicheCollege.Factory/packages.config

@@ -2,5 +2,7 @@
 <packages>
 <packages>
   <package id="dotConnect.Express.for.PostgreSQL" version="7.10.1134" targetFramework="net461" />
   <package id="dotConnect.Express.for.PostgreSQL" version="7.10.1134" targetFramework="net461" />
   <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
   <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
+  <package id="Npgsql" version="3.2.7" targetFramework="net461" />
   <package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net451" />
   <package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net451" />
+  <package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net461" />
 </packages>
 </packages>

+ 0 - 2
CD67.FicheCollege.MVC/Controllers/CollegesController.cs

@@ -3,8 +3,6 @@ using System.Web.Mvc;
 using CD67.FicheCollege.Entity;
 using CD67.FicheCollege.Entity;
 using CD67.FicheCollege.Factory;
 using CD67.FicheCollege.Factory;
 using CD67.FicheCollege.MVC.Models;
 using CD67.FicheCollege.MVC.Models;
-using CD67.FicheCollege.MVC.Internal;
-using System.Collections.Generic;
 
 
 namespace CD67.FicheCollege.MVC.Controllers
 namespace CD67.FicheCollege.MVC.Controllers
 {
 {

+ 2 - 1
CD67.FicheCollege.MVC/Web.config

@@ -82,7 +82,8 @@
   <system.data>
   <system.data>
     <DbProviderFactories>
     <DbProviderFactories>
       <add name="Npgsql Data Provider" invariant="Npgsql" description="Data Provider for PostgreSQL" type="Npgsql.NpgsqlFactory, Npgsql" />
       <add name="Npgsql Data Provider" invariant="Npgsql" description="Data Provider for PostgreSQL" type="Npgsql.NpgsqlFactory, Npgsql" />
-    <add name="dotConnect for PostgreSQL" invariant="Devart.Data.PostgreSql" description="Devart dotConnect for PostgreSQL" type="Devart.Data.PostgreSql.PgSqlProviderFactory, Devart.Data.PostgreSql, Version= 7.10.1134.0, Culture=neutral, PublicKeyToken=09af7300eec23701" /></DbProviderFactories>
+      <!--<add name="dotConnect for PostgreSQL" invariant="Devart.Data.PostgreSql" description="Devart dotConnect for PostgreSQL" type="Devart.Data.PostgreSql.PgSqlProviderFactory, Devart.Data.PostgreSql, Version= 7.10.1134.0, Culture=neutral, PublicKeyToken=09af7300eec23701" />-->
+    </DbProviderFactories>
   </system.data>
   </system.data>
   <entityFramework>
   <entityFramework>
     <!-- Suppression du provider par défaut qui stipule SQL server
     <!-- Suppression du provider par défaut qui stipule SQL server

+ 2 - 1
CD67.FicheCollege.Tests/App.config

@@ -52,4 +52,5 @@
    <DbProviderFactories> 
    <DbProviderFactories> 
      <add name="dotConnect for PostgreSQL" invariant="Devart.Data.PostgreSql" description="Devart dotConnect for PostgreSQL" type="Devart.Data.PostgreSql.PgSqlProviderFactory, Devart.Data.PostgreSql, Version= 7.10.1134.0, Culture=neutral, PublicKeyToken=09af7300eec23701" />
      <add name="dotConnect for PostgreSQL" invariant="Devart.Data.PostgreSql" description="Devart dotConnect for PostgreSQL" type="Devart.Data.PostgreSql.PgSqlProviderFactory, Devart.Data.PostgreSql, Version= 7.10.1134.0, Culture=neutral, PublicKeyToken=09af7300eec23701" />
    </DbProviderFactories> 
    </DbProviderFactories> 
-  </system.data></configuration>
+  </system.data>
+</configuration>

+ 6 - 0
CD67.FicheCollege.Tests/CD67.FicheCollege.Tests.csproj

@@ -56,6 +56,9 @@
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
     </Reference>
+    <Reference Include="Npgsql, Version=3.2.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Npgsql.3.2.7\lib\net451\Npgsql.dll</HintPath>
+    </Reference>
     <Reference Include="SolrTools, Version=1.6.14.0, Culture=neutral, processorArchitecture=MSIL">
     <Reference Include="SolrTools, Version=1.6.14.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Freyd.SolrTools.1.6.14\lib\net40\SolrTools.dll</HintPath>
       <HintPath>..\packages\Freyd.SolrTools.1.6.14\lib\net40\SolrTools.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
@@ -73,6 +76,9 @@
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
     </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Extensions" />

+ 2 - 0
CD67.FicheCollege.Tests/packages.config

@@ -20,5 +20,7 @@
   <package id="Microsoft.Net.Http.fr" version="2.0.20710.0" targetFramework="net451" />
   <package id="Microsoft.Net.Http.fr" version="2.0.20710.0" targetFramework="net451" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net451" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
+  <package id="Npgsql" version="3.2.7" targetFramework="net461" />
   <package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net451" />
   <package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net451" />
+  <package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net461" />
 </packages>
 </packages>