diff --git a/Sources/API/API.csproj b/Sources/API/API.csproj
index 867ee62..c4c81f2 100644
--- a/Sources/API/API.csproj
+++ b/Sources/API/API.csproj
@@ -1,4 +1,4 @@
-
+
net6.0
@@ -13,7 +13,7 @@
-
+
diff --git a/Sources/API/Controllers/RuneController.cs b/Sources/API/Controllers/RuneController.cs
index 9c3b717..4ce5959 100644
--- a/Sources/API/Controllers/RuneController.cs
+++ b/Sources/API/Controllers/RuneController.cs
@@ -2,5 +2,6 @@
{
public class RuneController
{
+ // TODO
}
}
diff --git a/Sources/API/Controllers/RunePageController.cs b/Sources/API/Controllers/RunePageController.cs
index 34dde7d..2476bbd 100644
--- a/Sources/API/Controllers/RunePageController.cs
+++ b/Sources/API/Controllers/RunePageController.cs
@@ -2,5 +2,6 @@
{
public class RunePageController
{
+ // TODO
}
}
diff --git a/Sources/API/Dto/ChampionDto.cs b/Sources/API/Dto/ChampionDto.cs
index e09dfa5..ae39ad6 100644
--- a/Sources/API/Dto/ChampionDto.cs
+++ b/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 Keydic { get; set; }
- public IEnumerable Valuedic { get; set; }
+ public IEnumerable NameCharac { get; set; }
+ public IEnumerable ValueCharac { get; set; }
public ChampionClass Class { get; set; }
public ReadOnlyCollection Skins { get; set; }
diff --git a/Sources/API/Dto/RuneDto.cs b/Sources/API/Dto/RuneDto.cs
index b1cefc5..83ddb4e 100644
--- a/Sources/API/Dto/RuneDto.cs
+++ b/Sources/API/Dto/RuneDto.cs
@@ -2,5 +2,6 @@
{
public class RuneDto
{
+ // TODO
}
}
diff --git a/Sources/API/Dto/RunePageDto.cs b/Sources/API/Dto/RunePageDto.cs
index daf20cb..3adb361 100644
--- a/Sources/API/Dto/RunePageDto.cs
+++ b/Sources/API/Dto/RunePageDto.cs
@@ -2,5 +2,6 @@
{
public class RunePageDto
{
+ // TODO
}
}
diff --git a/Sources/API/Mapping/ChampionMapper.cs b/Sources/API/Mapping/ChampionMapper.cs
index 52eb123..0ea0c6c 100644
--- a/Sources/API/Mapping/ChampionMapper.cs
+++ b/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,
- Valuedic = champion.Characteristics.Values,
+ NameCharac = champion.Characteristics.Keys,
+ ValueCharac = champion.Characteristics.Values,
Class = champion.Class,
- // Skins = champion.Skins,
- //Skills = champion.Skills,
+ Skins = champion.Skins,
+ 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");
}
-
- return new Champion(champion.Name, champion.Class, champion.Icon, champion.Image.Base64, champion.Bio);
+ var champion = new Champion(DtoChamp.Name, DtoChamp.Class, DtoChamp.Icon, DtoChamp.Image.Base64, DtoChamp.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;
}
}
}
diff --git a/Sources/API/Mapping/SkillMapper.cs b/Sources/API/Mapping/SkillMapper.cs
index 06be263..df5982c 100644
--- a/Sources/API/Mapping/SkillMapper.cs
+++ b/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);
diff --git a/Sources/API/Mapping/SkinMapper.cs b/Sources/API/Mapping/SkinMapper.cs
index 7066a64..e8889d2 100644
--- a/Sources/API/Mapping/SkinMapper.cs
+++ b/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);
}
}
diff --git a/Sources/Consoles/ConsoleAPI/ConsoleAPI.csproj b/Sources/ConsoleApi/ConsoleApi.csproj
similarity index 64%
rename from Sources/Consoles/ConsoleAPI/ConsoleAPI.csproj
rename to Sources/ConsoleApi/ConsoleApi.csproj
index ba3f378..ecbcd59 100644
--- a/Sources/Consoles/ConsoleAPI/ConsoleAPI.csproj
+++ b/Sources/ConsoleApi/ConsoleApi.csproj
@@ -8,7 +8,11 @@
-
+
+
+
+
+
diff --git a/Sources/Consoles/ConsoleAPI/Program.cs b/Sources/ConsoleApi/Program.cs
similarity index 97%
rename from Sources/Consoles/ConsoleAPI/Program.cs
rename to Sources/ConsoleApi/Program.cs
index 20db3e4..012e8cc 100644
--- a/Sources/Consoles/ConsoleAPI/Program.cs
+++ b/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();
diff --git a/Sources/Consoles/ConsoleTests/ConsoleTests.csproj b/Sources/ConsoleTests/ConsoleTests.csproj
similarity index 87%
rename from Sources/Consoles/ConsoleTests/ConsoleTests.csproj
rename to Sources/ConsoleTests/ConsoleTests.csproj
index e753e2d..3d774a6 100644
--- a/Sources/Consoles/ConsoleTests/ConsoleTests.csproj
+++ b/Sources/ConsoleTests/ConsoleTests.csproj
@@ -6,11 +6,6 @@
enable
enable
-
-
-
-
-
@@ -23,4 +18,8 @@
+
+
+
+
diff --git a/Sources/Consoles/ConsoleTests/Program.cs b/Sources/ConsoleTests/Program.cs
similarity index 100%
rename from Sources/Consoles/ConsoleTests/Program.cs
rename to Sources/ConsoleTests/Program.cs
diff --git a/Sources/Consoles/ConsoleTests/Properties/launchSettings.json b/Sources/ConsoleTests/Properties/launchSettings.json
similarity index 100%
rename from Sources/Consoles/ConsoleTests/Properties/launchSettings.json
rename to Sources/ConsoleTests/Properties/launchSettings.json
diff --git a/Sources/Consoles/ConsoleDB/Program.cs b/Sources/Consoles/ConsoleDB/Program.cs
deleted file mode 100644
index 8b994be..0000000
--- a/Sources/Consoles/ConsoleDB/Program.cs
+++ /dev/null
@@ -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();
-}
-
diff --git a/Sources/Consoles/ConsoleDB/ConsoleEF.csproj b/Sources/EntityFramework/ConsoleDB/ConsoleEF.csproj
similarity index 86%
rename from Sources/Consoles/ConsoleDB/ConsoleEF.csproj
rename to Sources/EntityFramework/ConsoleDB/ConsoleEF.csproj
index 2368270..4cc804b 100644
--- a/Sources/Consoles/ConsoleDB/ConsoleEF.csproj
+++ b/Sources/EntityFramework/ConsoleDB/ConsoleEF.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -16,7 +16,7 @@
-
+
diff --git a/Sources/EntityFramework/ConsoleDB/Program.cs b/Sources/EntityFramework/ConsoleDB/Program.cs
new file mode 100644
index 0000000..e27f761
--- /dev/null
+++ b/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();
+ }
+ }
+}
\ No newline at end of file
diff --git a/Sources/EFManager/EFManager.csproj b/Sources/EntityFramework/EFManager/EFManager.csproj
similarity index 72%
rename from Sources/EFManager/EFManager.csproj
rename to Sources/EntityFramework/EFManager/EFManager.csproj
index 9b550c2..70da556 100644
--- a/Sources/EFManager/EFManager.csproj
+++ b/Sources/EntityFramework/EFManager/EFManager.csproj
@@ -7,10 +7,10 @@
-
+
-
+
diff --git a/Sources/EFManager/ManagerChampion.cs b/Sources/EntityFramework/EFManager/ManagerChampion.cs
similarity index 95%
rename from Sources/EFManager/ManagerChampion.cs
rename to Sources/EntityFramework/EFManager/ManagerChampion.cs
index 9c96722..fca8154 100644
--- a/Sources/EFManager/ManagerChampion.cs
+++ b/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) { }
diff --git a/Sources/EFManager/ManagerData.cs b/Sources/EntityFramework/EFManager/ManagerData.cs
similarity index 100%
rename from Sources/EFManager/ManagerData.cs
rename to Sources/EntityFramework/EFManager/ManagerData.cs
diff --git a/Sources/EFManager/ManagerRune.cs b/Sources/EntityFramework/EFManager/ManagerRune.cs
similarity index 100%
rename from Sources/EFManager/ManagerRune.cs
rename to Sources/EntityFramework/EFManager/ManagerRune.cs
diff --git a/Sources/EFManager/ManagerRunePage.cs b/Sources/EntityFramework/EFManager/ManagerRunePage.cs
similarity index 100%
rename from Sources/EFManager/ManagerRunePage.cs
rename to Sources/EntityFramework/EFManager/ManagerRunePage.cs
diff --git a/Sources/EFManager/ManagerSkin.cs b/Sources/EntityFramework/EFManager/ManagerSkin.cs
similarity index 96%
rename from Sources/EFManager/ManagerSkin.cs
rename to Sources/EntityFramework/EFManager/ManagerSkin.cs
index a1fc3e4..ec672c9 100644
--- a/Sources/EFManager/ManagerSkin.cs
+++ b/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()));
}
}
diff --git a/Sources/EFMapping/EFChampionMapper.cs b/Sources/EntityFramework/EFMapping/EFChampionMapper.cs
similarity index 77%
rename from Sources/EFMapping/EFChampionMapper.cs
rename to Sources/EntityFramework/EFMapping/EFChampionMapper.cs
index beb6d02..b8a467a 100644
--- a/Sources/EFMapping/EFChampionMapper.cs
+++ b/Sources/EntityFramework/EFMapping/EFChampionMapper.cs
@@ -1,42 +1,42 @@
-using EFlib;
-using Model;
-using System.Collections.Immutable;
-using System.Reflection.PortableExecutable;
-
-namespace EFMapping
-{
- public static class EFChampionMapper
- {
-
- public static EFChampion toEF(this Champion Champ, SQLiteContext context)
- {
-
- EFChampion? EfChampion = context.Champions.Find(Champ.Name);
- if (EfChampion == null)
- {
- EfChampion = new()
- {
- Name = Champ.Name,
- Bio = Champ.Bio,
- Icon = Champ.Icon,
- Class = Champ.Class,
- Image = new() { Id = Guid.NewGuid(), Base64 = Champ.Image.Base64 },
-
-
- };
- EfChampion.Skills = Champ.Skills.Select(skill => skill.toEF(EfChampion, context)).ToList();
- EfChampion.Characteristics = Champ.Characteristics.Select(Charac => Charac.toEF(EfChampion, context)).ToList();
- }
- return EfChampion;
-
- }
-
- 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.Characteristics != null) foreach (var charac in EFChamp.Characteristics) { champion.AddCharacteristics(charac.toModel()); }
- return champion;
- }
- }
+using EFlib;
+using Model;
+using System.Collections.Immutable;
+using System.Reflection.PortableExecutable;
+
+namespace EFMapping
+{
+ public static class EFChampionMapper
+ {
+
+ public static EFChampion ToEF(this Champion Champ, SQLiteContext context)
+ {
+
+ EFChampion? EfChampion = context.Champions.Find(Champ.Name);
+ if (EfChampion == null)
+ {
+ EfChampion = new()
+ {
+ Name = Champ.Name,
+ Bio = Champ.Bio,
+ Icon = Champ.Icon,
+ Class = Champ.Class,
+ Image = new() { Id = Guid.NewGuid(), Base64 = Champ.Image.Base64 },
+
+
+ };
+ EfChampion.Skills = Champ.Skills.Select(skill => skill.ToEF(EfChampion, context)).ToList();
+ EfChampion.Characteristics = Champ.Characteristics.Select(Charac => Charac.ToEF(EfChampion, context)).ToList();
+ }
+ return EfChampion;
+
+ }
+
+ 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.Characteristics != null) foreach (var charac in EFChamp.Characteristics) { champion.AddCharacteristics(charac.ToModel()); }
+ return champion;
+ }
+ }
}
\ No newline at end of file
diff --git a/Sources/EFMapping/EFCharacteristicsMapper.cs b/Sources/EntityFramework/EFMapping/EFCharacteristicsMapper.cs
similarity index 86%
rename from Sources/EFMapping/EFCharacteristicsMapper.cs
rename to Sources/EntityFramework/EFMapping/EFCharacteristicsMapper.cs
index 779d95e..be58cb1 100644
--- a/Sources/EFMapping/EFCharacteristicsMapper.cs
+++ b/Sources/EntityFramework/EFMapping/EFCharacteristicsMapper.cs
@@ -11,7 +11,7 @@ namespace EFMapping
{
public static class EFCharacteristicsMapper
{
- public static EFCharacteristics toEF(this KeyValuePair item, EFChampion champion, SQLiteContext context)
+ public static EFCharacteristics ToEF(this KeyValuePair 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 toModel(this EFCharacteristics Charac)=> new(Charac.Name, Charac.Value);
+ public static Tuple ToModel(this EFCharacteristics Charac)=> new(Charac.Name, Charac.Value);
}
}
diff --git a/Sources/EFMapping/EFLargeImageMapper.cs b/Sources/EntityFramework/EFMapping/EFLargeImageMapper.cs
similarity index 83%
rename from Sources/EFMapping/EFLargeImageMapper.cs
rename to Sources/EntityFramework/EFMapping/EFLargeImageMapper.cs
index 0d41920..2fde433 100644
--- a/Sources/EFMapping/EFLargeImageMapper.cs
+++ b/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);
}
}
diff --git a/Sources/EFMapping/EFMapping.csproj b/Sources/EntityFramework/EFMapping/EFMapping.csproj
similarity index 80%
rename from Sources/EFMapping/EFMapping.csproj
rename to Sources/EntityFramework/EFMapping/EFMapping.csproj
index 6791075..728d104 100644
--- a/Sources/EFMapping/EFMapping.csproj
+++ b/Sources/EntityFramework/EFMapping/EFMapping.csproj
@@ -1,14 +1,14 @@
-
-
-
- net6.0
- enable
- enable
-
-
-
-
-
-
-
-
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+
diff --git a/Sources/EFMapping/EFRuneMapper.cs b/Sources/EntityFramework/EFMapping/EFRuneMapper.cs
similarity index 100%
rename from Sources/EFMapping/EFRuneMapper.cs
rename to Sources/EntityFramework/EFMapping/EFRuneMapper.cs
diff --git a/Sources/EFMapping/EFRunePageMapper.cs b/Sources/EntityFramework/EFMapping/EFRunePageMapper.cs
similarity index 100%
rename from Sources/EFMapping/EFRunePageMapper.cs
rename to Sources/EntityFramework/EFMapping/EFRunePageMapper.cs
diff --git a/Sources/EFMapping/EFSkillMapper.cs b/Sources/EntityFramework/EFMapping/EFSkillMapper.cs
similarity index 85%
rename from Sources/EFMapping/EFSkillMapper.cs
rename to Sources/EntityFramework/EFMapping/EFSkillMapper.cs
index 1a615dc..cdac169 100644
--- a/Sources/EFMapping/EFSkillMapper.cs
+++ b/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);
}
}
diff --git a/Sources/EFMapping/EFSkinMapper.cs b/Sources/EntityFramework/EFMapping/EFSkinMapper.cs
similarity index 78%
rename from Sources/EFMapping/EFSkinMapper.cs
rename to Sources/EntityFramework/EFMapping/EFSkinMapper.cs
index 641e3be..0397e1e 100644
--- a/Sources/EFMapping/EFSkinMapper.cs
+++ b/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);
}
}
diff --git a/Sources/EFlib/EFChampion.cs b/Sources/EntityFramework/EFlib/EFChampion.cs
similarity index 100%
rename from Sources/EFlib/EFChampion.cs
rename to Sources/EntityFramework/EFlib/EFChampion.cs
diff --git a/Sources/EFlib/EFCharacteristics.cs b/Sources/EntityFramework/EFlib/EFCharacteristics.cs
similarity index 100%
rename from Sources/EFlib/EFCharacteristics.cs
rename to Sources/EntityFramework/EFlib/EFCharacteristics.cs
diff --git a/Sources/EFlib/EFLargeImage.cs b/Sources/EntityFramework/EFlib/EFLargeImage.cs
similarity index 100%
rename from Sources/EFlib/EFLargeImage.cs
rename to Sources/EntityFramework/EFlib/EFLargeImage.cs
diff --git a/Sources/EFlib/EFRune.cs b/Sources/EntityFramework/EFlib/EFRune.cs
similarity index 100%
rename from Sources/EFlib/EFRune.cs
rename to Sources/EntityFramework/EFlib/EFRune.cs
diff --git a/Sources/EFlib/EFRunePage.cs b/Sources/EntityFramework/EFlib/EFRunePage.cs
similarity index 100%
rename from Sources/EFlib/EFRunePage.cs
rename to Sources/EntityFramework/EFlib/EFRunePage.cs
diff --git a/Sources/EFlib/EFSkill.cs b/Sources/EntityFramework/EFlib/EFSkill.cs
similarity index 100%
rename from Sources/EFlib/EFSkill.cs
rename to Sources/EntityFramework/EFlib/EFSkill.cs
diff --git a/Sources/EFlib/EFSkin.cs b/Sources/EntityFramework/EFlib/EFSkin.cs
similarity index 100%
rename from Sources/EFlib/EFSkin.cs
rename to Sources/EntityFramework/EFlib/EFSkin.cs
diff --git a/Sources/EFlib/EFlib.csproj b/Sources/EntityFramework/EFlib/EFlib.csproj
similarity index 86%
rename from Sources/EFlib/EFlib.csproj
rename to Sources/EntityFramework/EFlib/EFlib.csproj
index 0da59d4..e57d6f4 100644
--- a/Sources/EFlib/EFlib.csproj
+++ b/Sources/EntityFramework/EFlib/EFlib.csproj
@@ -1,4 +1,4 @@
-
+
net6.0
@@ -17,11 +17,8 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
-
+
+
diff --git a/Sources/EFlib/Migrations/20230322184745_myMigration.Designer.cs b/Sources/EntityFramework/EFlib/Migrations/20230322184745_myMigration.Designer.cs
similarity index 100%
rename from Sources/EFlib/Migrations/20230322184745_myMigration.Designer.cs
rename to Sources/EntityFramework/EFlib/Migrations/20230322184745_myMigration.Designer.cs
diff --git a/Sources/EFlib/Migrations/20230322184745_myMigration.cs b/Sources/EntityFramework/EFlib/Migrations/20230322184745_myMigration.cs
similarity index 100%
rename from Sources/EFlib/Migrations/20230322184745_myMigration.cs
rename to Sources/EntityFramework/EFlib/Migrations/20230322184745_myMigration.cs
diff --git a/Sources/EFlib/Migrations/SQLiteContextModelSnapshot.cs b/Sources/EntityFramework/EFlib/Migrations/SQLiteContextModelSnapshot.cs
similarity index 100%
rename from Sources/EFlib/Migrations/SQLiteContextModelSnapshot.cs
rename to Sources/EntityFramework/EFlib/Migrations/SQLiteContextModelSnapshot.cs
diff --git a/Sources/EFlib/Properties/launchSettings.json b/Sources/EntityFramework/EFlib/Properties/launchSettings.json
similarity index 100%
rename from Sources/EFlib/Properties/launchSettings.json
rename to Sources/EntityFramework/EFlib/Properties/launchSettings.json
diff --git a/Sources/EFlib/SQLiteContext.cs b/Sources/EntityFramework/EFlib/SQLiteContext.cs
similarity index 100%
rename from Sources/EFlib/SQLiteContext.cs
rename to Sources/EntityFramework/EFlib/SQLiteContext.cs
diff --git a/Sources/EFlib/projet.dbloulou.db b/Sources/EntityFramework/EFlib/projet.dbloulou.db
similarity index 100%
rename from Sources/EFlib/projet.dbloulou.db
rename to Sources/EntityFramework/EFlib/projet.dbloulou.db
diff --git a/Sources/LeagueOfLegends.sln b/Sources/LeagueOfLegends.sln
index d470e6a..85d2fef 100644
--- a/Sources/LeagueOfLegends.sln
+++ b/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
- {F10C1360-3224-44CD-9C3D-FFA428024825}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F10C1360-3224-44CD-9C3D-FFA428024825}.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}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4DA29685-5544-4250-A5D4-53C9D8FD679A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4DA29685-5544-4250-A5D4-53C9D8FD679A}.Release|Any CPU.ActiveCfg = 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}
diff --git a/Sources/Stubs/StubEF/StubEF.csproj b/Sources/Stubs/StubEF/StubEF.csproj
index 0baf683..8843e14 100644
--- a/Sources/Stubs/StubEF/StubEF.csproj
+++ b/Sources/Stubs/StubEF/StubEF.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/Sources/Tests/TestEF/TestEF.csproj b/Sources/Tests/TestEF/TestEF.csproj
index be67ce1..fc7913c 100644
--- a/Sources/Tests/TestEF/TestEF.csproj
+++ b/Sources/Tests/TestEF/TestEF.csproj
@@ -22,7 +22,6 @@
-