diff --git a/Documentations/Image rapport/Cas d'utilisation de l'application.PNG b/Documentations/Image rapport/Cas d'utilisation de l'application.PNG new file mode 100644 index 0000000..510166f Binary files /dev/null and b/Documentations/Image rapport/Cas d'utilisation de l'application.PNG differ diff --git a/Documentations/Image rapport/Gantt.PNG b/Documentations/Image rapport/Gantt.PNG new file mode 100644 index 0000000..18c01b9 Binary files /dev/null and b/Documentations/Image rapport/Gantt.PNG differ diff --git a/Documentations/OrdersStacks_GANTT.pdf b/Documentations/OrdersStacks_GANTT.pdf new file mode 100644 index 0000000..dcb26c5 Binary files /dev/null and b/Documentations/OrdersStacks_GANTT.pdf differ diff --git a/Documentations/TheGame_GANTT.xlsx b/Documentations/OrdersStacks_GANTT.xlsx similarity index 100% rename from Documentations/TheGame_GANTT.xlsx rename to Documentations/OrdersStacks_GANTT.xlsx diff --git a/Documentations/Rapport_DUPLAND.docx b/Documentations/Rapport_DUPLAND.docx index 14689cb..bcbbc4f 100644 Binary files a/Documentations/Rapport_DUPLAND.docx and b/Documentations/Rapport_DUPLAND.docx differ diff --git a/OrderStacks.Android/Resources/Resource.designer.cs b/OrderStacks.Android/Resources/Resource.designer.cs index a3fd6a1..d7d5ffa 100644 --- a/OrderStacks.Android/Resources/Resource.designer.cs +++ b/OrderStacks.Android/Resources/Resource.designer.cs @@ -1,11 +1,11 @@ #pragma warning disable 1591 //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Ce code a été généré par un outil. +// Version du runtime :4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si +// le code est régénéré. // //------------------------------------------------------------------------------ diff --git a/OrderStacks.iOS/OrderStacks.iOS.csproj b/OrderStacks.iOS/OrderStacks.iOS.csproj index 6e23049..47399e4 100644 --- a/OrderStacks.iOS/OrderStacks.iOS.csproj +++ b/OrderStacks.iOS/OrderStacks.iOS.csproj @@ -83,24 +83,60 @@ false - - - - - - - - - - - - - - - - - - + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + @@ -134,10 +170,6 @@ - - - - {8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3} diff --git a/OrderStacks.iOS/OrderStacks.iOS.csproj.orig b/OrderStacks.iOS/OrderStacks.iOS.csproj.orig new file mode 100644 index 0000000..5756a44 --- /dev/null +++ b/OrderStacks.iOS/OrderStacks.iOS.csproj.orig @@ -0,0 +1,157 @@ + + + + Debug + iPhoneSimulator + 8.0.30703 + 2.0 + {37A0EC21-60A9-43D2-8B43-3851E1CB7932} + {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {6143fdea-f3c2-4a09-aafa-6e230626515e} + Exe + OrderStacks.iOS + Resources + OrderStacks.iOS + true + NSUrlSessionHandler + TrierImage.ico + + + true + full + false + bin\iPhoneSimulator\Debug + DEBUG + prompt + 4 + x86_64 + None + true + iPhone Distribution + + + none + true + bin\iPhoneSimulator\Release + prompt + 4 + None + x86_64 + iPhone Distribution + orderstacks + + + true + full + false + bin\iPhone\Debug + DEBUG + prompt + 4 + ARM64 + iPhone Developer + true + Entitlements.plist + + + none + true + bin\iPhone\Release + prompt + 4 + ARM64 + iPhone Distribution + Entitlements.plist + orderstacks + + + + + + TrierImageB.ico + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3.1.0 + + + 2.1.1 + + + + + 1.1.0 + + + 1.68.1 + + + + + + + + + + + + + + + + + + + {8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3} + OrderStacks + + + +<<<<<<< HEAD + +======= + + +>>>>>>> 8e8fe48ab2250e4815dcee4bbf0b103cb28fa4c6 + + \ No newline at end of file diff --git a/UnitTestProjectGame/UnitTestProjectGame.csproj b/UnitTestProjectGame/UnitTestProjectGame.csproj index aedc489..496f94e 100644 --- a/UnitTestProjectGame/UnitTestProjectGame.csproj +++ b/UnitTestProjectGame/UnitTestProjectGame.csproj @@ -168,7 +168,7 @@ - + {8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3} TheGameExtreme