Update project archi

Sources/API/API.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFlib\EFlib.csproj" />
+    <ProjectReference Include="..\EntityFramework\EFlib\EFlib.csproj" />
     <ProjectReference Include="..\Model\Model.csproj" />
     <ProjectReference Include="..\Stubs\StubLib\StubLib.csproj" />
   </ItemGroup>

Sources/API/Controllers/RuneController.cs

@@ -2,5 +2,6 @@
 {
     public class RuneController
     {
+        // TODO
     }
 }

Sources/API/Controllers/RunePageController.cs

@@ -2,5 +2,6 @@
 {
     public class RunePageController
     {
+        // TODO
     }
 }

Sources/API/Dto/ChampionDto.cs

@@ -13,8 +13,8 @@ namespace API.Dto
         public string Icon { get; set; }
         
         // Obliger de split un dictionnaire pour le Json
-        public IEnumerable<string> Keydic { get; set; }
+        public IEnumerable<string> NameCharac { get; set; }
-        public IEnumerable<int> Valuedic { get; set; }
+        public IEnumerable<int> ValueCharac { get; set; }
         
         public ChampionClass Class { get; set; }
         public ReadOnlyCollection<SkinDto> Skins { get; set; }

Sources/API/Dto/RuneDto.cs

@@ -2,5 +2,6 @@
 {
     public class RuneDto
     {
+        // TODO
     }
 }

Sources/API/Dto/RunePageDto.cs

@@ -2,5 +2,6 @@
 {
     public class RunePageDto
     {
+        // TODO
     }
 }

Sources/API/Mapping/ChampionMapper.cs

@@ -13,32 +13,34 @@ namespace API.Mapping
         {
             if (champion == null)
             {
-                throw new ArgumentNullException("champion null");
+                throw new ArgumentNullException("Champion null");
             }
 
             return new ChampionDto
             {
-                Name = champion.Name,  // je peux décider de mettre le nom en minuscule pour que le json est des noms en minuscule
+                Name = champion.Name,
                 Bio = champion.Bio,
                 Icon = champion.Icon,
 
-                Keydic = champion.Characteristics.Keys,
+                NameCharac = champion.Characteristics.Keys,
-                Valuedic = champion.Characteristics.Values,
+                ValueCharac = champion.Characteristics.Values,
 
                 Class = champion.Class,
-               // Skins = champion.Skins,
+                Skins = champion.Skins,
-                //Skills = champion.Skills,
+                Skills = champion.Skills,
                 Image = champion.Image
             };
         }
-        public static Champion ToModel(this ChampionDto champion)
+        public static Champion ToModel(this ChampionDto DtoChamp)
         {
-            if (champion == null)
+            if (DtoChamp == null)
             {
-                throw new ArgumentNullException("championDto null");
+                throw new ArgumentNullException("DtoChampion null");
             }
-
+            var champion = new Champion(DtoChamp.Name, DtoChamp.Class, DtoChamp.Icon, DtoChamp.Image.Base64, DtoChamp.Bio);
-            return new Champion(champion.Name, champion.Class, champion.Icon, champion.Image.Base64, champion.Bio);
+            if (DtoChamp.Skills != null) foreach (var skill in DtoChamp.Skills) { champion.AddSkill(skill.toModel()); }
+            if (DtoChamp.Characteristics != null) foreach (var charac in DtoChamp.Characteristics) { champion.AddCharacteristics(charac.toModel()); }
+            return champion;
         }
     }
 }

Sources/API/Mapping/SkillMapper.cs

@@ -20,11 +20,11 @@ namespace API.Mapping
             };
         }
 
-        public static Skill ToSkill(this SkillDto skillDto)
+        public static Skill toModel(this SkillDto skillDto)
         {
             if (skillDto == null)
             {
-                throw new ArgumentNullException("SkinDto null");
+                throw new ArgumentNullException("DtoSkill null");
             }
 
             return new Skill(skillDto.Name, skillDto.Type, skillDto.Description);

Sources/API/Mapping/SkinMapper.cs

@@ -24,13 +24,12 @@ namespace API.Mapping
             };
         }
 
-        public static Skin ToSkin(this SkinDto skinDto)
+        public static Skin ToModel(this SkinDto skinDto)
         {
             if (skinDto == null)
             {
-                throw new ArgumentNullException("SkinDto null");
+                throw new ArgumentNullException("DtoSkin null");
             }
-
             return new Skin(skinDto.Name, skinDto.Champion.ToModel(), skinDto.Price, skinDto.Icon, skinDto.Image.Base64, skinDto.Description);
         }
     }

Sources/ConsoleApi/ConsoleApi.csproj

@@ -8,7 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\API\API.csproj" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\API\API.csproj" />
   </ItemGroup>
 
 </Project>

Sources/ConsoleApi/Program.cs

@@ -3,6 +3,7 @@ using API.Dto;
 using Newtonsoft.Json;
 using System.Net.Http.Headers;
 
+Console.WriteLine("Hello, World!");
 Console.WriteLine("Hello, World!");
 
 using (var client = new HttpClient())
@@ -10,7 +11,6 @@ using (var client = new HttpClient())
     var response = await client.GetAsync("https://www.example.com");
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
-
 static async Task GetJsonData()
 {
     using var client = new HttpClient();

Sources/ConsoleTests/ConsoleTests.csproj

@@ -6,11 +6,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Model\Model.csproj" />
-    <ProjectReference Include="..\..\Stubs\StubLib\StubLib.csproj" />
-  </ItemGroup>
   <ItemGroup>
     <None Remove="Microsoft.Extensions.DependencyInjection" />
   </ItemGroup>
@@ -23,4 +18,8 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Model\Model.csproj" />
+    <ProjectReference Include="..\Stubs\StubLib\StubLib.csproj" />
+  </ItemGroup>
 </Project>

Sources/Consoles/ConsoleDB/Program.cs

@@ -1,68 +0,0 @@
-// See https://aka.ms/new-console-template for more information
-// Console.WriteLine("Hello, World!");
-
-using EFlib;
-
-//StubData stub = new StubData();
-//stub.ChampionsMgr.GetItems(0, 5);
-
-
-EFChampion boss1 = new EFChampion { Name = "bigBoss", Bio = "KingOfMetal", Icon = "vide" };
-EFChampion boss2 = new EFChampion { Name = "Soon", Bio = "Indomptable", Icon = "vide" };
-EFChampion boss3 = new EFChampion { Name = "doctorWho", Bio = "Le silence", Icon="vide" };
-
-// Clear la base
-using (var context = new SQLiteContext())
-{
-    foreach (var n in context.Champions)
-    {
-        context.Remove(n);
-        Console.WriteLine($"La base est clear");
-    }
-    context.SaveChanges();
-}
-
-// Create
-using (var context = new SQLiteContext())
-{
-    // Crée des EFChampion et les insère dans la base
-    Console.WriteLine("Creates and inserts new EFChampion");
-    context.Add(boss1);
-    context.Add(boss2);
-    context.Add(boss3);
-    context.SaveChanges();
-    
-    foreach (var n in context.Champions)
-    {
-        Console.WriteLine($"{n.Name}");
-    }
-}
-
-// Delete
-using (var context = new SQLiteContext())
-{
-    foreach (var n in context.Champions)
-    {
-       if (n.Name == "Soon")
-        {
-            Console.WriteLine($"Viens d'être supprimer - {n.Name}");
-            context.Remove(n);
-        }
-    }
-    context.SaveChanges();
-}
-
-// Update
-using (var context = new SQLiteContext())
-{
-    foreach (var n in context.Champions)
-    {
-        if (n.Name == "bigBoss")
-        {
-            n.Name = "miniBoss";
-            Console.WriteLine($"Viens d'être changer - {n.Name}");
-        }
-    }
-    context.SaveChanges();
-}
-

Sources/EntityFramework/ConsoleDB/ConsoleEF.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\EFlib\EFlib.csproj" />
+    <ProjectReference Include="..\EFlib\EFlib.csproj" />
   </ItemGroup>
 
 </Project>

Sources/EntityFramework/ConsoleDB/Program.cs

@@ -0,0 +1,70 @@
+using EFlib;
+
+//StubData stub = new StubData();
+//stub.ChampionsMgr.GetItems(0, 5);
+
+
+static class Program
+{
+    private static void Main(string[] args)
+    {
+        EFChampion boss1 = new EFChampion { Name = "bigBoss", Bio = "KingOfMetal", Icon = "vide" };
+        EFChampion boss2 = new EFChampion { Name = "Soon", Bio = "Indomptable", Icon = "vide" };
+        EFChampion boss3 = new EFChampion { Name = "doctorWho", Bio = "Le silence", Icon = "vide" };
+
+        // Clear la base
+        using (var context = new SQLiteContext())
+        {
+            foreach (var n in context.Champions)
+            {
+                context.Remove(n);
+                Console.WriteLine($"La base est clear");
+            }
+            context.SaveChanges();
+        }
+
+        // Create
+        using (var context = new SQLiteContext())
+        {
+            // Crée des EFChampion et les insère dans la base
+            Console.WriteLine("Creates and inserts new EFChampion");
+            context.Add(boss1);
+            context.Add(boss2);
+            context.Add(boss3);
+            context.SaveChanges();
+
+            foreach (var n in context.Champions)
+            {
+                Console.WriteLine($"{n.Name}");
+            }
+        }
+
+        // Delete
+        using (var context = new SQLiteContext())
+        {
+            foreach (var n in context.Champions)
+            {
+                if (n.Name == "Soon")
+                {
+                    Console.WriteLine($"Viens d'être supprimer - {n.Name}");
+                    context.Remove(n);
+                }
+            }
+            context.SaveChanges();
+        }
+
+        // Update
+        using (var context = new SQLiteContext())
+        {
+            foreach (var n in context.Champions)
+            {
+                if (n.Name == "bigBoss")
+                {
+                    n.Name = "miniBoss";
+                    Console.WriteLine($"Viens d'être changer - {n.Name}");
+                }
+            }
+            context.SaveChanges();
+        }
+    }
+}

Sources/EntityFramework/EFManager/EFManager.csproj

@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Consoles\ConsoleTests\ConsoleTests.csproj" />
+    <ProjectReference Include="..\..\ConsoleTests\ConsoleTests.csproj" />
     <ProjectReference Include="..\EFlib\EFlib.csproj" />
     <ProjectReference Include="..\EFMapping\EFMapping.csproj" />
-    <ProjectReference Include="..\Model\Model.csproj" />
+	<ProjectReference Include="..\..\Model\Model.csproj" />
   </ItemGroup>
 
 </Project>

Sources/EntityFramework/EFManager/ManagerChampion.cs

@@ -18,7 +18,7 @@ namespace EFManager
             {
                 try
                 {
-                    await parent.DbContext.Champions.AddAsync(item.toEF(parent.DbContext));
+                    await parent.DbContext.Champions.AddAsync(item.ToEF(parent.DbContext));
                     parent.DbContext.SaveChangesAsync();
                 }
                 catch (OperationCanceledException){}
@@ -51,16 +51,16 @@ namespace EFManager
                 {
                     if (descending)
                     {
-                        return await Task.FromResult(parent.DbContext.Champions.OrderByDescending(champ => typeof(EFChampion).GetProperty(orderingPropertyName)).Skip(index * count).Take(count).Select(efChampion => efChampion.toModel()));
+                        return await Task.FromResult(parent.DbContext.Champions.OrderByDescending(champ => typeof(EFChampion).GetProperty(orderingPropertyName)).Skip(index * count).Take(count).Select(efChampion => efChampion.ToModel()));
                     }
                     else
                     {
-                        return await Task.FromResult(parent.DbContext.Champions.OrderBy(champ => typeof(EFChampion).GetProperty(orderingPropertyName)).Skip(index * count).Take(count).Select(efChampion => efChampion.toModel()));
+                        return await Task.FromResult(parent.DbContext.Champions.OrderBy(champ => typeof(EFChampion).GetProperty(orderingPropertyName)).Skip(index * count).Take(count).Select(efChampion => efChampion.ToModel()));
                     }
                 }
                 else
                 {
-                    return await Task.FromResult(parent.DbContext.Champions.Skip(index * count).Take(count).Select(efChampion => efChampion.toModel()));
+                    return await Task.FromResult(parent.DbContext.Champions.Skip(index * count).Take(count).Select(efChampion => efChampion.ToModel()));
                 }
             }
 
@@ -83,17 +83,17 @@ namespace EFManager
                 {
                     if (descending)
                     {
-                        return await Task.FromResult(EfChampion.OrderByDescending(champ => typeof(EFChampion).GetProperty(orderingPropertyName)).Skip(index * count).Take(count).Select(efChampion => efChampion.toModel()));
+                        return await Task.FromResult(EfChampion.OrderByDescending(champ => typeof(EFChampion).GetProperty(orderingPropertyName)).Skip(index * count).Take(count).Select(efChampion => efChampion.ToModel()));
                     }
                     else
                     {
-                        return await Task.FromResult(EfChampion.OrderBy(champ => typeof(EFChampion).GetProperty(orderingPropertyName)).Skip(index * count).Take(count).Select(efChampion => efChampion.toModel()));
+                        return await Task.FromResult(EfChampion.OrderBy(champ => typeof(EFChampion).GetProperty(orderingPropertyName)).Skip(index * count).Take(count).Select(efChampion => efChampion.ToModel()));
                         
                     }
                 }
                 else
                 {
-                   return await Task.FromResult(EfChampion.Skip(index * count).Take(count).Select(efChampion => efChampion.toModel()));
+                   return await Task.FromResult(EfChampion.Skip(index * count).Take(count).Select(efChampion => efChampion.ToModel()));
                 }
             }
 
@@ -153,7 +153,7 @@ namespace EFManager
                 var toUpdate = parent.DbContext.Champions.Find(oldItem.Name);
                 try
                 {
-                    toUpdate = newItem.toEF(parent.DbContext);
+                    toUpdate = newItem.ToEF(parent.DbContext);
                     parent.DbContext.SaveChanges();
                 }
                 catch(DbUpdateException) { }

Sources/EntityFramework/EFManager/ManagerSkin.cs

@@ -21,7 +21,7 @@ namespace EFManager
             {
                 try
                 {
-                    await parent.DbContext.Skins.AddAsync(item.toEF(parent.DbContext));
+                    await parent.DbContext.Skins.AddAsync(item.ToEF(parent.DbContext));
                     parent.DbContext.SaveChangesAsync();
                 }
                 catch (OperationCanceledException) { }
@@ -54,16 +54,16 @@ namespace EFManager
                 {
                     if (descending)
                     {
-                        return await Task.FromResult(parent.DbContext.Skins.OrderByDescending(skin => typeof(EFSkin).GetProperty(orderingPropertyName)).Skip(index * count).Take(count).Select(efSkin => efSkin.toModel()));
+                        return await Task.FromResult(parent.DbContext.Skins.OrderByDescending(skin => typeof(EFSkin).GetProperty(orderingPropertyName)).Skip(index * count).Take(count).Select(efSkin => efSkin.ToModel()));
                     }
                     else
                     {
-                        return await Task.FromResult(parent.DbContext.Skins.OrderBy(skin => typeof(EFSkin).GetProperty(orderingPropertyName)).Skip(index * count).Take(count).Select(efSkin => efSkin.toModel()));
+                        return await Task.FromResult(parent.DbContext.Skins.OrderBy(skin => typeof(EFSkin).GetProperty(orderingPropertyName)).Skip(index * count).Take(count).Select(efSkin => efSkin.ToModel()));
                     }
                 }
                 else
                 {
-                    return await Task.FromResult(parent.DbContext.Skins.Skip(index * count).Take(count).Select(efSkin => efSkin.toModel()));
+                    return await Task.FromResult(parent.DbContext.Skins.Skip(index * count).Take(count).Select(efSkin => efSkin.ToModel()));
                 }
             }
 

Sources/EntityFramework/EFMapping/EFChampionMapper.cs

@@ -8,7 +8,7 @@ namespace EFMapping
     public static class EFChampionMapper
     {
 
-        public static EFChampion toEF(this Champion Champ, SQLiteContext context)
+        public static EFChampion ToEF(this Champion Champ, SQLiteContext context)
         {
 
             EFChampion? EfChampion = context.Champions.Find(Champ.Name);
@@ -24,18 +24,18 @@ namespace EFMapping
 
 
                 };
-                EfChampion.Skills = Champ.Skills.Select(skill => skill.toEF(EfChampion, context)).ToList();
+                EfChampion.Skills = Champ.Skills.Select(skill => skill.ToEF(EfChampion, context)).ToList();
-                EfChampion.Characteristics = Champ.Characteristics.Select(Charac => Charac.toEF(EfChampion, context)).ToList();
+                EfChampion.Characteristics = Champ.Characteristics.Select(Charac => Charac.ToEF(EfChampion, context)).ToList();
             }
             return EfChampion;
 
         }
 
-        public static Champion toModel(this EFChampion EFChamp)
+        public static Champion ToModel(this EFChampion EFChamp)
         {
             var champion = new Champion(EFChamp.Name, EFChamp.Class, EFChamp.Icon, EFChamp.Image.Base64, EFChamp.Bio);
-            if (EFChamp.Skills != null) foreach (var skill in EFChamp.Skills) { champion.AddSkill(skill.toModel()); }
+            if (EFChamp.Skills != null) foreach (var skill in EFChamp.Skills) { champion.AddSkill(skill.ToModel()); }
-            if (EFChamp.Characteristics != null) foreach (var charac in EFChamp.Characteristics) { champion.AddCharacteristics(charac.toModel()); }
+            if (EFChamp.Characteristics != null) foreach (var charac in EFChamp.Characteristics) { champion.AddCharacteristics(charac.ToModel()); }
             return champion;
         }
     }

Sources/EntityFramework/EFMapping/EFCharacteristicsMapper.cs

@@ -11,7 +11,7 @@ namespace EFMapping
 {
     public static class EFCharacteristicsMapper
     {
-        public static EFCharacteristics toEF(this KeyValuePair<string, int> item, EFChampion champion, SQLiteContext context)
+        public static EFCharacteristics ToEF(this KeyValuePair<string, int> item, EFChampion champion, SQLiteContext context)
         {
             var EfCharacteristics = context.Characteristics.Find(item.Key, champion.Name);
             if (EfCharacteristics == null)
@@ -26,7 +26,7 @@ namespace EFMapping
             return EfCharacteristics;
         }
 
-        public static Tuple<string, int> toModel(this EFCharacteristics Charac)=> new(Charac.Name, Charac.Value);
+        public static Tuple<string, int> ToModel(this EFCharacteristics Charac)=> new(Charac.Name, Charac.Value);
 
     }
 }

Sources/EntityFramework/EFMapping/EFLargeImageMapper.cs

@@ -10,7 +10,7 @@ namespace EFMapping
 {
     public static class EFLargeImageMapper
     {
-        public static EFLargeImage toEF(this LargeImage LargeImage, SQLiteContext context)
+        public static EFLargeImage ToEF(this LargeImage LargeImage, SQLiteContext context)
         {
             var EfLargeImage = context.LargeImages.Find(LargeImage.Base64);
             if (EfLargeImage == null)
@@ -23,6 +23,6 @@ namespace EFMapping
             }
             return EfLargeImage;
         }
-        public static LargeImage toModel(this EFLargeImage EFlargeImage) => new LargeImage(EFlargeImage.Base64);
+        public static LargeImage ToModel(this EFLargeImage EFlargeImage) => new LargeImage(EFlargeImage.Base64);
     }
 }

Sources/EntityFramework/EFMapping/EFMapping.csproj

@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Model\Model.csproj" />
     <ProjectReference Include="..\EFlib\EFlib.csproj" />
-    <ProjectReference Include="..\Model\Model.csproj" />
   </ItemGroup>
 
 </Project>

Sources/EntityFramework/EFMapping/EFSkillMapper.cs

@@ -10,7 +10,7 @@ namespace EFMapping
 {
     public static class EFSkillMapper
     {
-        public static EFSkill toEF(this Skill skill, EFChampion champ, SQLiteContext context)
+        public static EFSkill ToEF(this Skill skill, EFChampion champ, SQLiteContext context)
         {
             var EfSkill = context.Skills.Find(skill.Name);
             if (EfSkill == null)
@@ -26,6 +26,6 @@ namespace EFMapping
             EfSkill!.Champions?.Add(champ);
             return EfSkill;
         }
-        public static Skill toModel(this EFSkill skill)=> new(skill.Name, skill.Type, skill.Description);
+        public static Skill ToModel(this EFSkill skill)=> new(skill.Name, skill.Type, skill.Description);
     }
 }

Sources/EntityFramework/EFMapping/EFSkinMapper.cs

@@ -10,7 +10,7 @@ namespace EFMapping
 {
     public static class EFSkinMapper
     {
-        public static EFSkin toEF(this Skin skin, SQLiteContext context)
+        public static EFSkin ToEF(this Skin skin, SQLiteContext context)
         {
             var EfSkin = context.Skins.Find(skin.Name);
             if (EfSkin == null)
@@ -23,12 +23,12 @@ namespace EFMapping
                     Price = skin.Price,
                     Image = new() { Id = Guid.NewGuid(), Base64 = skin.Image.Base64 },
                     NameChampion = skin.Champion.Name,
-                    Champion = context?.Champions.Find(skin.Champion.Name) ?? skin.Champion.toEF(context)
+                    Champion = context?.Champions.Find(skin.Champion.Name) ?? skin.Champion.ToEF(context)
                 };
             }
             return EfSkin;
         }
 
-        public static Skin toModel(this EFSkin Skin)=> new(Skin.Name, Skin.Champion.toModel(), Skin.Price, Skin.Icon, Skin.Image.Base64, Skin.Description);
+        public static Skin ToModel(this EFSkin Skin)=> new(Skin.Name, Skin.Champion.ToModel(), Skin.Price, Skin.Icon, Skin.Image.Base64, Skin.Description);
     }
 }

Sources/EntityFramework/EFlib/EFlib.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -18,10 +18,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.ObjectModel" Version="4.3.0" />
-  </ItemGroup>
+	<ProjectReference Include="..\..\Model\Model.csproj" />
-
-  <ItemGroup>
-    <ProjectReference Include="..\Model\Model.csproj" />
   </ItemGroup>
 
 </Project>

Sources/LeagueOfLegends.sln

@@ -7,16 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model", "Model\Model.csproj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "Shared\Shared.csproj", "{3B720C0C-53FE-4642-A2DB-87FD8634CD74}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFlib", "EFlib\EFlib.csproj", "{1364BFA7-D1A3-460B-8AEB-7E3A9AA6084A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "API", "API\API.csproj", "{37E43647-A760-467F-A3C3-71E25149D1BF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleEF", "Consoles\ConsoleDB\ConsoleEF.csproj", "{624EB7DB-BC07-4A21-93DD-DF8D5FDD3F39}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleTests", "Consoles\ConsoleTests\ConsoleTests.csproj", "{B3886790-6FA8-48C2-949D-BEA83DFBD8B7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Consoles", "Consoles", "{135EB5EA-FA24-4E1D-BA0B-510E567D9E41}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3EADD82A-15CF-40CC-BF4F-82F5385676A5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestEF", "Tests\TestEF\TestEF.csproj", "{5DEC05D8-59AA-4DD9-AD53-07A08C1EC0EC}"
@@ -27,15 +19,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StubLib", "Stubs\StubLib\St
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StubEF", "Stubs\StubEF\StubEF.csproj", "{17BA906E-798E-4E75-9D8F-D4CD8EDD7FAE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFManager", "EFManager\EFManager.csproj", "{BD56921C-2868-4754-84A5-6A88D7710CA2}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestManagerEF", "Tests\TestManagerEF\TestManagerEF.csproj", "{ECD6BA04-7338-4AFA-AC4B-D5C60C440D4D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFMapping", "EFMapping\EFMapping.csproj", "{0952BCD7-09D2-4D24-BD8C-1F88BA8D66EC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAPI", "Tests\TestAPI\TestAPI.csproj", "{3DA08E90-C5E3-4856-95FD-3143DBB88B07}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EntityFramework", "EntityFramework", "{F4F96EC7-B46D-438C-8AFA-6B26451960F2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFlib", "EntityFramework\EFlib\EFlib.csproj", "{4DA29685-5544-4250-A5D4-53C9D8FD679A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFManager", "EntityFramework\EFManager\EFManager.csproj", "{CA787C5A-1535-48A4-9B9A-26A1258289E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFMapping", "EntityFramework\EFMapping\EFMapping.csproj", "{CA4448C4-9FDA-4FA1-BB28-9B09B8F0301E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleEF", "EntityFramework\ConsoleDB\ConsoleEF.csproj", "{5804A9DC-DEF3-41EB-A49E-642BCFEB4523}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAPI", "Tests\TestAPI\TestAPI.csproj", "{3DA08E90-C5E3-4856-95FD-3143DBB88B07}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleTests", "ConsoleTests\ConsoleTests.csproj", "{2421A321-D552-421B-94A5-92B9C34678CA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleAPI", "Consoles\ConsoleAPI\ConsoleAPI.csproj", "{F10C1360-3224-44CD-9C3D-FFA428024825}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApi", "ConsoleApi\ConsoleApi.csproj", "{B30F9603-22B5-46EE-B617-44C25C4A207E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,22 +51,10 @@ Global
 		{3B720C0C-53FE-4642-A2DB-87FD8634CD74}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3B720C0C-53FE-4642-A2DB-87FD8634CD74}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3B720C0C-53FE-4642-A2DB-87FD8634CD74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1364BFA7-D1A3-460B-8AEB-7E3A9AA6084A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1364BFA7-D1A3-460B-8AEB-7E3A9AA6084A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1364BFA7-D1A3-460B-8AEB-7E3A9AA6084A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1364BFA7-D1A3-460B-8AEB-7E3A9AA6084A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{37E43647-A760-467F-A3C3-71E25149D1BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{37E43647-A760-467F-A3C3-71E25149D1BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{37E43647-A760-467F-A3C3-71E25149D1BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37E43647-A760-467F-A3C3-71E25149D1BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{624EB7DB-BC07-4A21-93DD-DF8D5FDD3F39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{624EB7DB-BC07-4A21-93DD-DF8D5FDD3F39}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{624EB7DB-BC07-4A21-93DD-DF8D5FDD3F39}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{624EB7DB-BC07-4A21-93DD-DF8D5FDD3F39}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B3886790-6FA8-48C2-949D-BEA83DFBD8B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B3886790-6FA8-48C2-949D-BEA83DFBD8B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B3886790-6FA8-48C2-949D-BEA83DFBD8B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B3886790-6FA8-48C2-949D-BEA83DFBD8B7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5DEC05D8-59AA-4DD9-AD53-07A08C1EC0EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5DEC05D8-59AA-4DD9-AD53-07A08C1EC0EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5DEC05D8-59AA-4DD9-AD53-07A08C1EC0EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -79,39 +67,52 @@ Global
 		{17BA906E-798E-4E75-9D8F-D4CD8EDD7FAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17BA906E-798E-4E75-9D8F-D4CD8EDD7FAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17BA906E-798E-4E75-9D8F-D4CD8EDD7FAE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD56921C-2868-4754-84A5-6A88D7710CA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD56921C-2868-4754-84A5-6A88D7710CA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD56921C-2868-4754-84A5-6A88D7710CA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD56921C-2868-4754-84A5-6A88D7710CA2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ECD6BA04-7338-4AFA-AC4B-D5C60C440D4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ECD6BA04-7338-4AFA-AC4B-D5C60C440D4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ECD6BA04-7338-4AFA-AC4B-D5C60C440D4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ECD6BA04-7338-4AFA-AC4B-D5C60C440D4D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0952BCD7-09D2-4D24-BD8C-1F88BA8D66EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0952BCD7-09D2-4D24-BD8C-1F88BA8D66EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0952BCD7-09D2-4D24-BD8C-1F88BA8D66EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0952BCD7-09D2-4D24-BD8C-1F88BA8D66EC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3DA08E90-C5E3-4856-95FD-3143DBB88B07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3DA08E90-C5E3-4856-95FD-3143DBB88B07}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3DA08E90-C5E3-4856-95FD-3143DBB88B07}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3DA08E90-C5E3-4856-95FD-3143DBB88B07}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F10C1360-3224-44CD-9C3D-FFA428024825}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DA29685-5544-4250-A5D4-53C9D8FD679A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F10C1360-3224-44CD-9C3D-FFA428024825}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DA29685-5544-4250-A5D4-53C9D8FD679A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F10C1360-3224-44CD-9C3D-FFA428024825}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DA29685-5544-4250-A5D4-53C9D8FD679A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F10C1360-3224-44CD-9C3D-FFA428024825}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DA29685-5544-4250-A5D4-53C9D8FD679A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA787C5A-1535-48A4-9B9A-26A1258289E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA787C5A-1535-48A4-9B9A-26A1258289E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA787C5A-1535-48A4-9B9A-26A1258289E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA787C5A-1535-48A4-9B9A-26A1258289E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA4448C4-9FDA-4FA1-BB28-9B09B8F0301E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA4448C4-9FDA-4FA1-BB28-9B09B8F0301E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA4448C4-9FDA-4FA1-BB28-9B09B8F0301E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA4448C4-9FDA-4FA1-BB28-9B09B8F0301E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5804A9DC-DEF3-41EB-A49E-642BCFEB4523}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5804A9DC-DEF3-41EB-A49E-642BCFEB4523}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5804A9DC-DEF3-41EB-A49E-642BCFEB4523}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5804A9DC-DEF3-41EB-A49E-642BCFEB4523}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2421A321-D552-421B-94A5-92B9C34678CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2421A321-D552-421B-94A5-92B9C34678CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2421A321-D552-421B-94A5-92B9C34678CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2421A321-D552-421B-94A5-92B9C34678CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B30F9603-22B5-46EE-B617-44C25C4A207E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B30F9603-22B5-46EE-B617-44C25C4A207E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B30F9603-22B5-46EE-B617-44C25C4A207E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B30F9603-22B5-46EE-B617-44C25C4A207E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{624EB7DB-BC07-4A21-93DD-DF8D5FDD3F39} = {135EB5EA-FA24-4E1D-BA0B-510E567D9E41}
-		{B3886790-6FA8-48C2-949D-BEA83DFBD8B7} = {135EB5EA-FA24-4E1D-BA0B-510E567D9E41}
 		{5DEC05D8-59AA-4DD9-AD53-07A08C1EC0EC} = {3EADD82A-15CF-40CC-BF4F-82F5385676A5}
 		{9807CE1D-F1CF-4CAE-9D03-CDCE14BC36F2} = {F4404CFB-A33D-448E-891C-2C8113B014E4}
 		{17BA906E-798E-4E75-9D8F-D4CD8EDD7FAE} = {F4404CFB-A33D-448E-891C-2C8113B014E4}
 		{ECD6BA04-7338-4AFA-AC4B-D5C60C440D4D} = {3EADD82A-15CF-40CC-BF4F-82F5385676A5}
 		{3DA08E90-C5E3-4856-95FD-3143DBB88B07} = {3EADD82A-15CF-40CC-BF4F-82F5385676A5}
-		{F10C1360-3224-44CD-9C3D-FFA428024825} = {135EB5EA-FA24-4E1D-BA0B-510E567D9E41}
+		{4DA29685-5544-4250-A5D4-53C9D8FD679A} = {F4F96EC7-B46D-438C-8AFA-6B26451960F2}
+		{CA787C5A-1535-48A4-9B9A-26A1258289E8} = {F4F96EC7-B46D-438C-8AFA-6B26451960F2}
+		{CA4448C4-9FDA-4FA1-BB28-9B09B8F0301E} = {F4F96EC7-B46D-438C-8AFA-6B26451960F2}
+		{5804A9DC-DEF3-41EB-A49E-642BCFEB4523} = {F4F96EC7-B46D-438C-8AFA-6B26451960F2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {92F3083D-793F-4552-8A9A-0AD6534159C9}

Sources/Stubs/StubEF/StubEF.csproj

@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\EFlib\EFlib.csproj" />
+    <ProjectReference Include="..\..\EntityFramework\EFlib\EFlib.csproj" />
     <ProjectReference Include="..\StubLib\StubLib.csproj" />
   </ItemGroup>
 

Sources/Tests/TestEF/TestEF.csproj

@@ -22,7 +22,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\EFlib\EFlib.csproj" />
 	  <ProjectReference Include="..\..\Stubs\StubEF\StubEF.csproj" />
 	</ItemGroup>