From a7e9aa9dd07bdfd02994b5ce30cd6f044e72bfe5 Mon Sep 17 00:00:00 2001 From: Matheo HERSAN Date: Fri, 9 Jun 2023 14:45:56 +0200 Subject: [PATCH] Added DataContractPersistance into project --- .../DataContractPersistance/DataContractJSON.cs | 4 ++-- .../DataContractPersistance.csproj | 13 +++++++++++++ .../DataContractPersistance/DataContractXML.cs | 4 ++-- .../DataContractPersistance/DataToPersist.cs | 2 +- src/MangaMap/MangaMap.csproj | 1 + src/MangaMap/MangaMap.sln | 8 +++++++- 6 files changed, 26 insertions(+), 6 deletions(-) rename src/{MangaMap => }/DataContractPersistance/DataContractJSON.cs (97%) create mode 100644 src/DataContractPersistance/DataContractPersistance.csproj rename src/{MangaMap => }/DataContractPersistance/DataContractXML.cs (97%) rename src/{MangaMap => }/DataContractPersistance/DataToPersist.cs (91%) diff --git a/src/MangaMap/DataContractPersistance/DataContractJSON.cs b/src/DataContractPersistance/DataContractJSON.cs similarity index 97% rename from src/MangaMap/DataContractPersistance/DataContractJSON.cs rename to src/DataContractPersistance/DataContractJSON.cs index 08fb73a..acbe907 100644 --- a/src/MangaMap/DataContractPersistance/DataContractJSON.cs +++ b/src/DataContractPersistance/DataContractJSON.cs @@ -8,7 +8,7 @@ using System.Runtime.Serialization.Json; using System.Text; using System.Threading.Tasks; -namespace MangaMap.DataContractPersistance +namespace DataContractPersistance { /// /// Implémentation de l'interface IPersistanceManager utilisant la sérialisation avec DataContract. @@ -33,7 +33,7 @@ namespace MangaMap.DataContractPersistance { DataContractJsonSerializer jsonSerializer = new DataContractJsonSerializer(typeof(DataToPersist)); - DataToPersist data; + DataToPersist? data; using (FileStream stream2 = File.OpenRead(Path.Combine(FilePath, FileName))) { diff --git a/src/DataContractPersistance/DataContractPersistance.csproj b/src/DataContractPersistance/DataContractPersistance.csproj new file mode 100644 index 0000000..d24baee --- /dev/null +++ b/src/DataContractPersistance/DataContractPersistance.csproj @@ -0,0 +1,13 @@ + + + + net7.0 + enable + enable + + + + + + + diff --git a/src/MangaMap/DataContractPersistance/DataContractXML.cs b/src/DataContractPersistance/DataContractXML.cs similarity index 97% rename from src/MangaMap/DataContractPersistance/DataContractXML.cs rename to src/DataContractPersistance/DataContractXML.cs index 5c09abf..9917896 100644 --- a/src/MangaMap/DataContractPersistance/DataContractXML.cs +++ b/src/DataContractPersistance/DataContractXML.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Xml; -namespace MangaMap.DataContractPersistance +namespace DataContractPersistance { /// /// Implémentation de l'interface IPersistanceManager utilisant la sérialisation avec DataContract. @@ -33,7 +33,7 @@ namespace MangaMap.DataContractPersistance public (ObservableCollection, List) chargeDonne() { var serializer = new DataContractSerializer(typeof(DataToPersist)); - DataToPersist data; + DataToPersist? data; if (File.Exists(Path.Combine(FilePath, FileName))) // Vérifiez si le fichier existe { diff --git a/src/MangaMap/DataContractPersistance/DataToPersist.cs b/src/DataContractPersistance/DataToPersist.cs similarity index 91% rename from src/MangaMap/DataContractPersistance/DataToPersist.cs rename to src/DataContractPersistance/DataToPersist.cs index 01cb813..3d68c84 100644 --- a/src/MangaMap/DataContractPersistance/DataToPersist.cs +++ b/src/DataContractPersistance/DataToPersist.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Collections.ObjectModel; -namespace MangaMap.DataContractPersistance +namespace DataContractPersistance { /// /// Classe de données pour la persistance contenant les listes des oeuvres et des utilisateurs. diff --git a/src/MangaMap/MangaMap.csproj b/src/MangaMap/MangaMap.csproj index 8b91f47..ca7d14b 100644 --- a/src/MangaMap/MangaMap.csproj +++ b/src/MangaMap/MangaMap.csproj @@ -135,6 +135,7 @@ + diff --git a/src/MangaMap/MangaMap.sln b/src/MangaMap/MangaMap.sln index db3434e..3745ae7 100644 --- a/src/MangaMap/MangaMap.sln +++ b/src/MangaMap/MangaMap.sln @@ -9,7 +9,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Models", "..\Models\Models. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "..\UnitTests\UnitTests.csproj", "{6B675815-FEE2-49D0-BAF9-84ECD5116FF9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stub", "..\Stub\Stub.csproj", "{434D7C7C-2B01-44AA-8619-28D65657C47A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stub", "..\Stub\Stub.csproj", "{434D7C7C-2B01-44AA-8619-28D65657C47A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataContractPersistance", "..\DataContractPersistance\DataContractPersistance.csproj", "{49C8C786-B3A1-48FE-A120-E5209A441320}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -35,6 +37,10 @@ Global {434D7C7C-2B01-44AA-8619-28D65657C47A}.Debug|Any CPU.Build.0 = Debug|Any CPU {434D7C7C-2B01-44AA-8619-28D65657C47A}.Release|Any CPU.ActiveCfg = Release|Any CPU {434D7C7C-2B01-44AA-8619-28D65657C47A}.Release|Any CPU.Build.0 = Release|Any CPU + {49C8C786-B3A1-48FE-A120-E5209A441320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {49C8C786-B3A1-48FE-A120-E5209A441320}.Debug|Any CPU.Build.0 = Debug|Any CPU + {49C8C786-B3A1-48FE-A120-E5209A441320}.Release|Any CPU.ActiveCfg = Release|Any CPU + {49C8C786-B3A1-48FE-A120-E5209A441320}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE