updated samples from ex_042_001_EF_CodeFirst_conventions to ex_042_011_EF_CF_Many_to_Many_FluentAPI

6 years ago · 544289bedb
parent 0f90b07bb6
commit 544289bedb
33 changed files with 154 additions and 125 deletions
--- a/Exemples.sln
+++ b/Exemples.sln
@ -92,8 +92,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "chap040_LINQ_to_Json", "cha
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "p08_BDD", "p08_BDD", "{65DF0C9A-4F06-4361-8DD9-E8360B6325CA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "chap041_ADO_NET", "chap041_ADO_NET", "{04EBF611-0C0B-40C4-948E-74F01985EB9C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "chap042_EntityFramework", "chap042_EntityFramework", "{ED951AD1-2EB1-49CC-9DBE-E3360E11525B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01. EF CodeFirst approach", "01. EF CodeFirst approach", "{D2D113F6-9444-4F75-959F-8761054F1AEE}"
@ -4510,7 +4508,6 @@ Global
 		{4E4B6208-50FC-46F8-A827-AC7B713D6646} = {915BFE30-1456-4DB2-B727-666362E7B324}
 		{13CDB6B1-9B1D-43A9-9E9E-08989D55ACA5} = {1BCDE8FE-64B4-4C41-9323-81BB09EFD7CD}
 		{3BD95300-E2F6-4CA6-B4CC-5D19DF5C6AC0} = {1BCDE8FE-64B4-4C41-9323-81BB09EFD7CD}
 		{04EBF611-0C0B-40C4-948E-74F01985EB9C} = {65DF0C9A-4F06-4361-8DD9-E8360B6325CA}
 		{ED951AD1-2EB1-49CC-9DBE-E3360E11525B} = {65DF0C9A-4F06-4361-8DD9-E8360B6325CA}
 		{D2D113F6-9444-4F75-959F-8761054F1AEE} = {ED951AD1-2EB1-49CC-9DBE-E3360E11525B}
 		{41B79FDB-6371-41E1-B9A3-73A9A209E906} = {ED951AD1-2EB1-49CC-9DBE-E3360E11525B}
--- a/ex_040_001_LINQ_to_Json/ex_040_001_LINQ_to_Json.csproj
+++ b/ex_040_001_LINQ_to_Json/ex_040_001_LINQ_to_Json.csproj
@ -10,6 +10,6 @@
    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
  </ItemGroup>
 </Project>
--- a/ex_042_001_EF_CodeFirst_conventions/ex_042_001_EF_CodeFirst_conventions.csproj
+++ b/ex_042_001_EF_CodeFirst_conventions/ex_042_001_EF_CodeFirst_conventions.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netcoreapp3.0</TargetFramework>
    <AssemblyName>ex_042_001_EF_CodeFirst_conventions</AssemblyName>
@ -10,13 +10,13 @@
    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_002_EF_CodeFirst_data_annotations/ex_042_002_EF_CodeFirst_data_annotations.csproj
+++ b/ex_042_002_EF_CodeFirst_data_annotations/ex_042_002_EF_CodeFirst_data_annotations.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netcoreapp3.0</TargetFramework>
    <AssemblyName>ex_042_002_EF_CodeFirst_data_annotations</AssemblyName>
@ -10,13 +10,13 @@
    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_003_EF_CodeFirst_Fluent_API/ex_042_003_EF_CodeFirst_Fluent_API.csproj
+++ b/ex_042_003_EF_CodeFirst_Fluent_API/ex_042_003_EF_CodeFirst_Fluent_API.csproj
@ -10,13 +10,13 @@
    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_004_EF_CF_InitializationStrategy/ex_042_004_EF_CF_InitializationStrategy.csproj
+++ b/ex_042_004_EF_CF_InitializationStrategy/ex_042_004_EF_CF_InitializationStrategy.csproj
@ -10,10 +10,10 @@
    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_005_EF_CF_Seeding_Data/ex_042_005_EF_CF_Seeding_Data.csproj
+++ b/ex_042_005_EF_CF_Seeding_Data/ex_042_005_EF_CF_Seeding_Data.csproj
@ -10,10 +10,10 @@
    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_006_EF_CF_One_to_One/ex_042_006_EF_CF_One_to_One.csproj
+++ b/ex_042_006_EF_CF_One_to_One/ex_042_006_EF_CF_One_to_One.csproj
@ -10,10 +10,10 @@
    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_007_EF_CF_One_to_One_FluentAPI/ex_042_007_EF_CF_One_to_One_FluentAPI.csproj
+++ b/ex_042_007_EF_CF_One_to_One_FluentAPI/ex_042_007_EF_CF_One_to_One_FluentAPI.csproj
@ -10,10 +10,10 @@
    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_008_EF_CF_One_to_Many/ex_042_008_EF_CF_One_to_Many.csproj
+++ b/ex_042_008_EF_CF_One_to_Many/ex_042_008_EF_CF_One_to_Many.csproj
@ -10,10 +10,10 @@
    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_009_EF_CF_One_to_Many_FluentAPI/ex_042_009_EF_CF_One_to_Many_FluentAPI.csproj
+++ b/ex_042_009_EF_CF_One_to_Many_FluentAPI/ex_042_009_EF_CF_One_to_Many_FluentAPI.csproj
@ -10,10 +10,10 @@
    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_010_EF_CF_Many_to_Many/ex_042_010_EF_CF_Many_to_Many.csproj
+++ b/ex_042_010_EF_CF_Many_to_Many/ex_042_010_EF_CF_Many_to_Many.csproj
@ -10,10 +10,10 @@
    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_011_EF_CF_Many_to_Many_FluentAPI/DbEntities/AlbumArtisteDBEntities.cs
+++ b/ex_042_011_EF_CF_Many_to_Many_FluentAPI/DbEntities/AlbumArtisteDBEntities.cs
@ -51,8 +51,8 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
            modelBuilder.Entity<AlbumArtiste>().Property<Guid>("AlbumId");
            modelBuilder.Entity<AlbumArtiste>().Property<Guid>("ArtisteId");
            //ajoute les mêmes aux entités AlbumEF et ArtisteEF
-            modelBuilder.Entity<AlbumEF>().Property<Guid>("AlbumId");   
+            //modelBuilder.Entity<AlbumEF>().Property<Guid>("AlbumId");   
-            modelBuilder.Entity<ArtisteEF>().Property<Guid>("ArtisteId");
+            //modelBuilder.Entity<ArtisteEF>().Property<Guid>("ArtisteId");
            //crée une clé primaire à partir des deux propriétés précédentes
            modelBuilder.Entity<AlbumArtiste>().HasKey("AlbumId", "ArtisteId");
--- a/ex_042_011_EF_CF_Many_to_Many_FluentAPI/DbEntities/AlbumEF.cs
+++ b/ex_042_011_EF_CF_Many_to_Many_FluentAPI/DbEntities/AlbumEF.cs
@ -24,7 +24,7 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
        /// le sujet réel wrappé par le procurateur
        /// lorsqu'il est setté, la collection d'artistes est mise à jour
        /// </summary>
-        public Album Album
+        private Album Album
        {
            get
            {
@ -33,7 +33,7 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
            set
            {
                album = value;
-                UpdateArtistes();
+                //UpdateArtistes();
            }
        }
        private Album album;
@ -50,27 +50,27 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
            set
            {
                albumsArtistes = value;
-                UpdateArtistes();
+                //UpdateArtistes();
            }
        }
        private ICollection<AlbumArtiste> albumsArtistes = new List<AlbumArtiste>();
-        private void UpdateArtistes()
+        //private void UpdateArtistes()
-        {
+        //{
-            if (Album != null && AlbumsArtistes != null)
+        //    if (Album != null && AlbumsArtistes != null)
-            {
+        //    {
-                foreach (var art in AlbumsArtistes.Select(aa => aa.Artiste.Artiste))
+        //        foreach (var art in AlbumsArtistes.Select(aa => aa.Artiste.Artiste))
-                {
+        //        {
-                    Album.Artistes.Add(art);
+        //            Album.Artistes.Add(art);
-                }
+        //        }
-            }
+        //    }
-        }
+        //}
-        public ICollection<Artiste> Artistes
+        public ICollection<IArtiste> Artistes
        {
            get
            {
-                return Album.Artistes;
+                return AlbumsArtistes.Select<AlbumArtiste, IArtiste>(aa => aa.Artiste).ToList();
            }
        }
@ -98,12 +98,24 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
            }
        }
-        private Guid uniqueId;
+        //private Guid uniqueId;
        public Guid UniqueId
        {
-            get { return uniqueId; }
+            //get { return uniqueId; }
-            set { uniqueId = value; Album.UniqueId = value; }
+            get => Album.UniqueId;
            //set { uniqueId = value; Album.UniqueId = value; }
            set => Album.UniqueId = value;
        }
        public AlbumEF()
        {
            Album = new Album();
        }
        public AlbumEF(Album album)
        {
            Album = album;
        }
    }
--- a/ex_042_011_EF_CF_Many_to_Many_FluentAPI/DbEntities/ArtisteEF.cs
+++ b/ex_042_011_EF_CF_Many_to_Many_FluentAPI/DbEntities/ArtisteEF.cs
@ -20,11 +20,11 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
    /// </summary>
    public class ArtisteEF : IArtiste
    {
-        public ICollection<Album> Albums
+        public ICollection<IAlbum> Albums
        {
            get
            {
-                return Artiste.Albums;
+                return ArtistesAlbums.Select<AlbumArtiste, IAlbum>(aa => aa.Album).ToList();
            }
        }
@ -37,13 +37,13 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
            set
            {
                artistesAlbums = value;
-                UpdateAlbums();
+                //UpdateAlbums();
            }
        }
        private ICollection<AlbumArtiste> artistesAlbums = new List<AlbumArtiste>();
-        public Artiste Artiste
+        private Artiste Artiste
        {
            get
            {
@ -52,21 +52,21 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
            set
            {
                artiste = value;
-                UpdateAlbums();
+                //UpdateAlbums();
            }
        }
        private Artiste artiste;
-        private void UpdateAlbums()
+        //private void UpdateAlbums()
-        {
+        //{
-            if (Artiste != null && ArtistesAlbums != null)
+        //    if (Artiste != null && ArtistesAlbums != null)
-            {
+        //    {
-                foreach (var alb in ArtistesAlbums.Select(aa => aa.Album.Album))
+        //        foreach (var alb in ArtistesAlbums.Select(aa => aa.Album.Album))
-                {
+        //        {
-                    Artiste.Albums.Add(alb);
+        //            Artiste.Albums.Add(alb);
-                }
+        //        }
-            }
+        //    }
-        }
+        //}
        public DateTime? DateDeMort
        {
@ -116,13 +116,24 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
            }
        }
-        private Guid uniqueId;
+        //private Guid uniqueId;
        public Guid UniqueId
        {
-            get { return uniqueId; }
+            //get { return uniqueId; }
-            set { uniqueId = value; Artiste.UniqueId = value; }
+            get => Artiste.UniqueId;
            //set { uniqueId = value; Artiste.UniqueId = value; }
            set => Artiste.UniqueId = value;
        }
        public ArtisteEF()
        {
            Artiste = new Artiste();
        }
        public ArtisteEF(Artiste artiste)
        {
            Artiste = artiste;
        }
    }
 }
--- a/ex_042_011_EF_CF_Many_to_Many_FluentAPI/DbEntities/DbContextInitializer.cs
+++ b/ex_042_011_EF_CF_Many_to_Many_FluentAPI/DbEntities/DbContextInitializer.cs
@ -78,8 +78,8 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
                ["artBlakey"] = new Artiste { Prénom = "Art", Nom = "Blakey", DateDeNaissance = new DateTime(1919, 10, 11), DateDeMort = new DateTime(1990, 10, 16) }
            };
-            albumsEF = albums.ToDictionary(kvp => kvp.Key, kvp => new AlbumEF { Album = kvp.Value });
+            albumsEF = albums.ToDictionary(kvp => kvp.Key, kvp => new AlbumEF(kvp.Value));
-            artistesEF = artistes.ToDictionary(kvp => kvp.Key, kvp => new ArtisteEF { Artiste = kvp.Value });
+            artistesEF = artistes.ToDictionary(kvp => kvp.Key, kvp => new ArtisteEF(kvp.Value));
            //les artistes qui jouent sur Kind Of Blue sont reliés à l'album
            AddArtisteAlbum(context, "kindOfBlue", "milesDavis");
@ -98,6 +98,7 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
            AddArtisteAlbum(context, "somethinElse", "artBlakey");
            context.SaveChanges();
        }
        /// <summary>
--- a/ex_042_011_EF_CF_Many_to_Many_FluentAPI/Model/Album.cs
+++ b/ex_042_011_EF_CF_Many_to_Many_FluentAPI/Model/Album.cs
@ -26,6 +26,10 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
    /// </summary>
    public class Album : IAlbum
    {
        public Album()
        {
        }
        public Guid UniqueId
        {
            get; set;
@ -41,7 +45,7 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
            get; set;
        }
-        public ICollection<Artiste> Artistes { get; set; } = new List<Artiste>(); 
+        public ICollection<IArtiste> Artistes { get; set; } = new List<IArtiste>(); 
    }
 }
--- a/ex_042_011_EF_CF_Many_to_Many_FluentAPI/Model/Artiste.cs
+++ b/ex_042_011_EF_CF_Many_to_Many_FluentAPI/Model/Artiste.cs
@ -54,7 +54,7 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
            get; set;
        }
-        public ICollection<Album> Albums { get; set; } = new List<Album>();
+        public ICollection<IAlbum> Albums { get; set; } = new List<IAlbum>();
    }
--- a/ex_042_011_EF_CF_Many_to_Many_FluentAPI/Model/IAlbum.cs
+++ b/ex_042_011_EF_CF_Many_to_Many_FluentAPI/Model/IAlbum.cs
@ -22,6 +22,6 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
        Guid UniqueId { get; }
        string Titre { get; }
        DateTime DateDeSortie { get; }
-        ICollection<Artiste> Artistes { get; }
+        ICollection<IArtiste> Artistes { get; }
    }
 }
--- a/ex_042_011_EF_CF_Many_to_Many_FluentAPI/Model/IArtiste.cs
+++ b/ex_042_011_EF_CF_Many_to_Many_FluentAPI/Model/IArtiste.cs
@ -43,6 +43,6 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
            get;
        }
-        ICollection<Album> Albums { get; }
+        ICollection<IAlbum> Albums { get; }
    }
 }
--- a/ex_042_011_EF_CF_Many_to_Many_FluentAPI/Program.cs
+++ b/ex_042_011_EF_CF_Many_to_Many_FluentAPI/Program.cs
@ -1,4 +1,5 @@
-using System;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@ -46,9 +47,12 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
                {
                    //choix de la stratégie et remplissage avec des données stubbées
                    DbContextInitializer.Seed(db);
                }
                using (AlbumArtisteDBEntities db = new AlbumArtisteDBEntities())
                { 
                    WriteLine("Albums : ");
-                    foreach (var album in db.Albums.Select(alEF => alEF.Album))
+                    foreach (var album in db.Albums)
                    {
                        WriteLine($"\t{album.UniqueId}: {album.Titre} (sorti le : {album.DateDeSortie.ToString("d")})");
                        foreach (var artiste in album.Artistes)
@ -60,7 +64,7 @@ namespace ex_042_011_EF_CF_Many_to_Many_FluentAPI
                    WriteLine();
                    WriteLine("Artistes :");
-                    foreach (var artiste in db.Artistes.Select(arEF => arEF.Artiste))
+                    foreach (var artiste in db.Artistes.Include(a => a.ArtistesAlbums))
                    {
                        var annéeDeMort = artiste.DateDeMort.HasValue ? $" - {artiste.DateDeMort.Value.Year}" : "";
                        var titresAlbums = artiste.Albums.Aggregate(String.Empty, (albums, album) => albums + $"\"{album.Titre}\" ");
--- a/ex_042_011_EF_CF_Many_to_Many_FluentAPI/ex_042_011_EF_CF_Many_to_Many_FluentAPI.csproj
+++ b/ex_042_011_EF_CF_Many_to_Many_FluentAPI/ex_042_011_EF_CF_Many_to_Many_FluentAPI.csproj
@ -10,10 +10,10 @@
    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_012_EF_CF_Dictionary/ex_042_012_EF_CF_Dictionary.csproj
+++ b/ex_042_012_EF_CF_Dictionary/ex_042_012_EF_CF_Dictionary.csproj
@ -11,10 +11,10 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_013_EF_CF_TPT_Inheritance/ex_042_013_EF_CF_TPT_Inheritance.csproj
+++ b/ex_042_013_EF_CF_TPT_Inheritance/ex_042_013_EF_CF_TPT_Inheritance.csproj
@ -11,10 +11,10 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_014_EF_CF_TPH_Inheritance/ex_042_014_EF_CF_TPH_Inheritance.csproj
+++ b/ex_042_014_EF_CF_TPH_Inheritance/ex_042_014_EF_CF_TPH_Inheritance.csproj
@ -11,10 +11,10 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_016_EF_current_original_database_val/ex_042_016_EF_current_original_database_val.csproj
+++ b/ex_042_016_EF_current_original_database_val/ex_042_016_EF_current_original_database_val.csproj
@ -11,10 +11,10 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_017_EF_concurrency_problematic/ex_042_017_EF_concurrency_problematic.csproj
+++ b/ex_042_017_EF_concurrency_problematic/ex_042_017_EF_concurrency_problematic.csproj
@ -11,10 +11,10 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_018_EF_concurrency_databaseWins/ex_042_018_EF_concurrency_databaseWins.csproj
+++ b/ex_042_018_EF_concurrency_databaseWins/ex_042_018_EF_concurrency_databaseWins.csproj
@ -11,10 +11,10 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_019_EF_concurrency_clientWins/ex_042_019_EF_concurrency_clientWins.csproj
+++ b/ex_042_019_EF_concurrency_clientWins/ex_042_019_EF_concurrency_clientWins.csproj
@ -11,10 +11,10 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_020_EF_concurrency_customDbProp/ex_042_020_EF_concurrency_customDbProp.csproj
+++ b/ex_042_020_EF_concurrency_customDbProp/ex_042_020_EF_concurrency_customDbProp.csproj
@ -11,10 +11,10 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_042_021_EF_concurrency_customObjects/ex_042_021_EF_concurrency_customObjects.csproj
+++ b/ex_042_021_EF_concurrency_customObjects/ex_042_021_EF_concurrency_customObjects.csproj
@ -11,10 +11,10 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/ex_050_010_Threading_en_UWP/ex_050_010_Threading_en_UWP.csproj
+++ b/ex_050_010_Threading_en_UWP/ex_050_010_Threading_en_UWP.csproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
@ -151,7 +151,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.8</Version>
+      <Version>6.2.9</Version>
    </PackageReference>
  </ItemGroup>
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
--- a/ex_052_006_problématique_6_UWP/ex_052_006_problématique_6_UWP.csproj
+++ b/ex_052_006_problématique_6_UWP/ex_052_006_problématique_6_UWP.csproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
@ -7,8 +7,8 @@
    <ProjectGuid>{BCE167F6-6323-46FC-A112-D9941A75815A}</ProjectGuid>
    <OutputType>AppContainerExe</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ex_052_006_problématique_6_UWP</RootNamespace>
+    <RootNamespace>ex_052_006_probl<EFBFBD>matique_6_UWP</RootNamespace>
-    <AssemblyName>ex_052_006_problématique_6_UWP</AssemblyName>
+    <AssemblyName>ex_052_006_probl<EFBFBD>matique_6_UWP</AssemblyName>
    <DefaultLanguage>fr-FR</DefaultLanguage>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
@ -150,7 +150,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.8</Version>
+      <Version>6.2.9</Version>
    </PackageReference>
  </ItemGroup>
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">