From b1a3d94d2378ff5aacbe29153544a6e5a8e547c4 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 24 Jun 2018 01:30:28 +0200
Subject: [PATCH] starting the migration

---
 Yavsc.Abstract/Yavsc.Abstract.csproj | 124 ++++++++++-----------------
 Yavsc.Server/Yavsc.Server.csproj     |  84 ++++++++++++++++++
 Yavsc/Yavsc.csproj                   |  51 +++++++----
 global.json                          |   4 +-
 4 files changed, 164 insertions(+), 99 deletions(-)
 create mode 100644 Yavsc.Server/Yavsc.Server.csproj

diff --git a/Yavsc.Abstract/Yavsc.Abstract.csproj b/Yavsc.Abstract/Yavsc.Abstract.csproj
index 7e0ad862..9f7c4714 100644
--- a/Yavsc.Abstract/Yavsc.Abstract.csproj
+++ b/Yavsc.Abstract/Yavsc.Abstract.csproj
@@ -1,81 +1,43 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Yavsc</RootNamespace>
-    <AssemblyName>Yavsc.Abstract</AssemblyName>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <EnableDefaultCompileItems>true</EnableDefaultCompileItems>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Lua|AnyCPU'">
-    <OutputPath>bin\Lua\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ZicMoove|AnyCPU'">
-    <OutputPath>bin\ZicMoove\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Yavsc|AnyCPU'">
-    <OutputPath>bin\Yavsc\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WinDev|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\WinDev\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Yavsc Client&amp;Server Api</Description>
+    <AssemblyTitle>Yavsc - l'abstrait</AssemblyTitle>
+    <VersionPrefix>1.0.5</VersionPrefix>
+    <Authors>Paul Schneider &lt;paul@pschneider.fr&gt;</Authors>
+    <TargetFrameworks>dnx451;net46;net451</TargetFrameworks>
+    <AssemblyName>Yavsc.Abstract</AssemblyName>
+    <PackageId>Yavsc.Abstract</PackageId>
+    <PackageTags>Blog;Blog;PoS;Chat</PackageTags>
+    <PackageProjectUrl>http://yavsc.pschneider.fr</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/pazof/yavsc/blob/vnext/LICENSE</PackageLicenseUrl>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/pazof/yavsc</RepositoryUrl>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'dnx451' ">
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/Yavsc.Server/Yavsc.Server.csproj b/Yavsc.Server/Yavsc.Server.csproj
new file mode 100644
index 00000000..96dd2fea
--- /dev/null
+++ b/Yavsc.Server/Yavsc.Server.csproj
@@ -0,0 +1,84 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Yavsc server common library</Description>
+    <VersionPrefix>1.0.5</VersionPrefix>
+    <Authors>Paul Schneider &lt;paul@pschneider.fr&gt;</Authors>
+    <TargetFrameworks>dnx451;net451;net46</TargetFrameworks>
+    <DebugType>full</DebugType>
+    <AssemblyName>Yavsc</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>Yavsc.Server</PackageId>
+    <UserSecretsId>aspnet5-YavscWeb-a0dadd21-2ced-43d3-96f9-7e504345102f</UserSecretsId>
+    <PackageTags>Blog;Blog;PoS;Chat</PackageTags>
+    <PackageProjectUrl>http://yavsc.pschneider.fr</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/pazof/yavsc/blob/vnext/LICENSE</PackageLicenseUrl>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/pazof/yavsc</RepositoryUrl>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="wwwroot;node_modules;bower_components;contrib" />
+    <EmbeddedResource Include="Resources\**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../Yavsc.Abstract/Yavsc.Abstract.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="EntityFramework.Commands" Version="7.0.0-rc1-final" />
+    <PackageReference Include="Microsoft.AspNet.Identity.EntityFramework" Version="3.0.0-rc1-*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileProviderExtensions" Version="1.0.0-rc1-final" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Globalization.CultureInfoCache" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.TraceSource" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="1.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Gapi.net45" Version="1.0.0" />
+    <PackageReference Include="PayPalMerchant-net451" Version="2.7.109" />
+    <PackageReference Include="MailKit" Version="1.12.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'dnx451' ">
+    <Reference Include="System.Json" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Linq" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Json" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Json" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/Yavsc/Yavsc.csproj b/Yavsc/Yavsc.csproj
index 453f5698..d0de6a30 100644
--- a/Yavsc/Yavsc.csproj
+++ b/Yavsc/Yavsc.csproj
@@ -1,8 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Authors>Paul Schneider</Authors>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <Description>encore une très petite entreprise</Description>
+    <VersionPrefix>1.0.5</VersionPrefix>
+    <Authors>Paul Schneider &lt;paul@pschneider.fr&gt;</Authors>
+    <TargetFramework>dnx451</TargetFramework>
     <DebugType>full</DebugType>
     <AssemblyName>Yavsc</AssemblyName>
     <OutputType>Exe</OutputType>
@@ -14,20 +16,10 @@
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/pazof/yavsc</RepositoryUrl>
-    <EnableDefaultCompileItems>true</EnableDefaultCompileItems>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
-  </ItemGroup>
-
-
-  <ItemGroup>
-    <Compile Remove="wwwroot\**\*;node_modules\**\*;bower_components;contrib\**\*" />
+    <Compile Remove="wwwroot\**\*;node_modules\**\*;bower_components\**\*;contrib\**\*" />
     <EmbeddedResource Include="Resources\**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
     <None Update="**.user;**.vspscc;contrib\**\*.*">
       <CopyToPublishDirectory>Never</CopyToPublishDirectory>
@@ -35,7 +27,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="../OAuth.AspNet.Token/OAuth.AspNet.Token.csproj" />
+    <ProjectReference Include="../OAuth.AspNet.AuthServer/OAuth.AspNet.AuthServer.csproj" />
     <ProjectReference Include="../Yavsc.Abstract/Yavsc.Abstract.csproj" />
+    <ProjectReference Include="../Yavsc.Server/Yavsc.Server.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -65,14 +60,38 @@
     <PackageReference Include="Microsoft.AspNet.StaticFiles" Version="1.0.0-rc1-*" />
     <PackageReference Include="Microsoft.AspNet.Tooling.Razor" Version="1.0.0-rc1-*" />
     <PackageReference Include="Microsoft.AspNet.WebSockets.Server" Version="1.0.0-rc1-*" />
+    <PackageReference Include="Microsoft.AspNet.Session" Version="1.0.0-rc1-final" />
+    <PackageReference Include="Microsoft.AspNet.Web.Optimization" Version="1.1.3" />
+    <PackageReference Include="Microsoft.AspNet.Http.Extensions" Version="1.0.0-rc1-final" />
+    <PackageReference Include="Microsoft.AspNet.Authentication.JwtBearer" Version="1.0.0-rc1-final" />
     <PackageReference Include="Microsoft.AspNet.DataProtection" Version="1.0.0-rc1-final" />
     <PackageReference Include="Microsoft.AspNet.DataProtection.SystemWeb" Version="1.0.0-rc1-final" />
     <PackageReference Include="Microsoft.AspNet.Authentication.OAuth" Version="1.0.0-rc1-final" />
     <PackageReference Include="Microsoft.AspNet.Mvc.Formatters.Json" Version="6.0.0-rc1-final" />
     <PackageReference Include="Microsoft.AspNet.OWin" Version="1.0.0-rc1-final" />
+    <PackageReference Include="Microsoft.Framework.ConfigurationModel.Json" Version="1.0.0-beta4" />
+    <PackageReference Include="Microsoft.Framework.Configuration.Abstractions" Version="1.0.0-beta8" />
+    <PackageReference Include="Microsoft.Framework.Configuration.Binder" Version="1.0.0-beta8" />
+    <PackageReference Include="Microsoft.Framework.Configuration.Json" Version="1.0.0-beta8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileProviderExtensions" Version="1.0.0-rc1-final" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.TraceSource" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Globalization.CultureInfoCache" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Extensions.WebEncoders.Core" Version="1.0.0-rc1-final" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.WebEncoders" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.CodeGeneration" Version="1.0.0-rc1-final" />
+    <PackageReference Include="Microsoft.Extensions.CodeGenerators.Mvc" Version="1.0.0-rc1-final" />
     <PackageReference Include="System.Json" Version="4.0.20126.16343" />
-    <PackageReference Include="Microsoft.AspNet.Http.Extensions" Version="1.0.0-rc1-final" />
-    <PackageReference Include="Microsoft.DiaSymReader.Native" Version="1.5.0" />
     <PackageReference Include="PayPalMerchant-net451" Version="2.7.109" />
     <PackageReference Include="Gapi.net45" Version="1.0.0" />
   </ItemGroup>
diff --git a/global.json b/global.json
index 7fe043aa..f6696a3e 100644
--- a/global.json
+++ b/global.json
@@ -9,8 +9,8 @@
         "OAuth.AspNet.Server"
     ],
     "sdk": {
-        "version": "1.0.0-rc1-update2",
-        "runtime": "mono",
+        "version": "2.1.300-preview2-008533",
+        "runtime": "dotnet",
         "architecture": "x64"
     }