mirror of
				https://github.com/Nioux/AideDeJeu.git
				synced 2025-10-29 22:45:44 +00:00 
			
		
		
		
	Début maj
This commit is contained in:
		
							parent
							
								
									a4b0e6d2c0
								
							
						
					
					
						commit
						3ac4118576
					
				
					 23 changed files with 752 additions and 711 deletions
				
			
		|  | @ -412,18 +412,21 @@ Global | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_CO|x86.ActiveCfg = Release_CO|x86 | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_CO|x86.ActiveCfg = Release_CO|x86 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_CO|x86.Build.0 = Release_CO|x86 | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_CO|x86.Build.0 = Release_CO|x86 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_CO|x86.Deploy.0 = Release_CO|x86 | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_CO|x86.Deploy.0 = Release_CO|x86 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|Any CPU.ActiveCfg = Release_HD|x86 | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|Any CPU.ActiveCfg = Release_JoA|x64 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|ARM.ActiveCfg = Release_HD|ARM | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|Any CPU.Build.0 = Release_JoA|x64 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|ARM.Build.0 = Release_HD|ARM | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|ARM.ActiveCfg = Release_JoA|ARM | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|ARM.Deploy.0 = Release_HD|ARM | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|ARM.Build.0 = Release_JoA|ARM | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|iPhone.ActiveCfg = Release_HD|x86 | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|iPhone.ActiveCfg = Release_JoA|x64 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|iPhoneSimulator.ActiveCfg = Release_HD|x86 | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|iPhone.Build.0 = Release_JoA|x64 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|x64.ActiveCfg = Release_HD|x64 | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|iPhoneSimulator.ActiveCfg = Release_JoA|x64 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|x64.Build.0 = Release_HD|x64 | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|iPhoneSimulator.Build.0 = Release_JoA|x64 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|x64.Deploy.0 = Release_HD|x64 | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|iPhoneSimulator.Deploy.0 = Release_JoA|x64 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|x86.ActiveCfg = Release_HD|x86 | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|x64.ActiveCfg = Release_JoA|x64 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|x86.Build.0 = Release_HD|x86 | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|x64.Build.0 = Release_JoA|x64 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|x86.Deploy.0 = Release_HD|x86 | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|x64.Deploy.0 = Release_JoA|x64 | ||||||
|  | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|x86.ActiveCfg = Release_JoA|x86 | ||||||
|  | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|x86.Build.0 = Release_JoA|x86 | ||||||
|  | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_HD|x86.Deploy.0 = Release_JoA|x86 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_JoA|Any CPU.ActiveCfg = Release_JoA|x86 | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_JoA|Any CPU.ActiveCfg = Release_JoA|x86 | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_JoA|ARM.ActiveCfg = Release_JoA|ARM | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_JoA|ARM.ActiveCfg = Release_JoA|ARM | ||||||
| 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_JoA|ARM.Build.0 = Release_JoA|ARM | 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Release_JoA|ARM.Build.0 = Release_JoA|ARM | ||||||
|  |  | ||||||
|  | @ -255,10 +255,10 @@ | ||||||
|       <Version>1.5.3.2</Version> |       <Version>1.5.3.2</Version> | ||||||
|     </PackageReference> |     </PackageReference> | ||||||
|     <PackageReference Include="Xamarin.Forms"> |     <PackageReference Include="Xamarin.Forms"> | ||||||
|       <Version>4.6.0.800</Version> |       <Version>4.8.0.1269</Version> | ||||||
|     </PackageReference> |     </PackageReference> | ||||||
|     <PackageReference Include="Xamarin.Forms.Visual.Material"> |     <PackageReference Include="Xamarin.Forms.Visual.Material"> | ||||||
|       <Version>4.6.0.800</Version> |       <Version>4.8.0.1269</Version> | ||||||
|     </PackageReference> |     </PackageReference> | ||||||
|     <PackageReference Include="XamiTextSharpLGPLv2"> |     <PackageReference Include="XamiTextSharpLGPLv2"> | ||||||
|       <Version>1.0.0</Version> |       <Version>1.0.0</Version> | ||||||
|  |  | ||||||
|  | @ -21,7 +21,8 @@ namespace AideDeJeu.Droid | ||||||
| #elif CONFIG_HD | #elif CONFIG_HD | ||||||
|     [Activity(Name = "com.nioux.aidedejeu.MainActivity", Label = "Haches & Dés", Icon = "@drawable/main", Theme = "@style/MyTheme.Splash", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)] |     [Activity(Name = "com.nioux.aidedejeu.MainActivity", Label = "Haches & Dés", Icon = "@drawable/main", Theme = "@style/MyTheme.Splash", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)] | ||||||
| #else | #else | ||||||
|     [Activity(Name = "com.nioux.aidedejeu.hereva.MainActivity", Label = "Sorcières d Hereva", Icon = "@drawable/main", Theme = "@style/MyTheme.Splash", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)] |     [Activity(Name = "com.nioux.aidedejeu.MainActivity", Label = "Haches & Dés", Icon = "@drawable/main", Theme = "@style/MyTheme.Splash", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)] | ||||||
|  | //    [Activity(Name = "com.nioux.aidedejeu.hereva.MainActivity", Label = "Sorcières d Hereva", Icon = "@drawable/main", Theme = "@style/MyTheme.Splash", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)] | ||||||
| #endif | #endif | ||||||
|     public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity |     public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity | ||||||
|     { |     { | ||||||
|  | @ -220,7 +221,8 @@ namespace AideDeJeu.Droid | ||||||
| #elif CONFIG_HD | #elif CONFIG_HD | ||||||
|     [Activity(Name = "com.nioux.aidedejeu.SearchActivity", Label = "Haches et dés")] |     [Activity(Name = "com.nioux.aidedejeu.SearchActivity", Label = "Haches et dés")] | ||||||
| #else | #else | ||||||
|     [Activity(Name = "com.nioux.aidedejeu.hereva.SearchActivity", Label = "Sorcières d Hereva")] |     [Activity(Name = "com.nioux.aidedejeu.SearchActivity", Label = "Haches et dés")] | ||||||
|  |     //[Activity(Name = "com.nioux.aidedejeu.hereva.SearchActivity", Label = "Sorcières d Hereva")] | ||||||
| #endif | #endif | ||||||
|     public class SearchActivity : Android.App.Activity // global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity |     public class SearchActivity : Android.App.Activity // global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity | ||||||
|     { |     { | ||||||
|  |  | ||||||
							
								
								
									
										1318
									
								
								AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										1318
									
								
								AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs
									
										
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							|  | @ -1,6 +1,6 @@ | ||||||
| <?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||||
| <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||||||
|   <Import Project="..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.props')" /> |   <Import Project="..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.props')" /> | ||||||
|   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> |   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||||||
|   <PropertyGroup> |   <PropertyGroup> | ||||||
|     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||||||
|  | @ -297,22 +297,22 @@ | ||||||
|       <HintPath>..\..\packages\UrhoSharp.Forms.1.9.67\lib\netstandard2.0\UrhoSharp.Forms.dll</HintPath> |       <HintPath>..\..\packages\UrhoSharp.Forms.1.9.67\lib\netstandard2.0\UrhoSharp.Forms.dll</HintPath> | ||||||
|     </Reference> |     </Reference> | ||||||
|     <Reference Include="webkit-sharp, Version=1.1.15.0, Culture=neutral, PublicKeyToken=eaa1d335d2e19745, processorArchitecture=MSIL"> |     <Reference Include="webkit-sharp, Version=1.1.15.0, Culture=neutral, PublicKeyToken=eaa1d335d2e19745, processorArchitecture=MSIL"> | ||||||
|       <HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.4.6.0.800\lib\net45\webkit-sharp.dll</HintPath> |       <HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.4.8.0.1269\lib\net45\webkit-sharp.dll</HintPath> | ||||||
|     </Reference> |     </Reference> | ||||||
|     <Reference Include="Xamarin.Essentials, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |     <Reference Include="Xamarin.Essentials, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||||||
|       <HintPath>..\..\packages\Xamarin.Essentials.1.5.3.2\lib\netstandard2.0\Xamarin.Essentials.dll</HintPath> |       <HintPath>..\..\packages\Xamarin.Essentials.1.5.3.2\lib\netstandard2.0\Xamarin.Essentials.dll</HintPath> | ||||||
|     </Reference> |     </Reference> | ||||||
|     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||||||
|       <HintPath>..\..\packages\Xamarin.Forms.4.6.0.800\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath> |       <HintPath>..\..\packages\Xamarin.Forms.4.8.0.1269\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath> | ||||||
|     </Reference> |     </Reference> | ||||||
|     <Reference Include="Xamarin.Forms.Platform, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |     <Reference Include="Xamarin.Forms.Platform, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||||||
|       <HintPath>..\..\packages\Xamarin.Forms.4.6.0.800\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath> |       <HintPath>..\..\packages\Xamarin.Forms.4.8.0.1269\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath> | ||||||
|     </Reference> |     </Reference> | ||||||
|     <Reference Include="Xamarin.Forms.Platform.GTK, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |     <Reference Include="Xamarin.Forms.Platform.GTK, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||||||
|       <HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.4.6.0.800\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath> |       <HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.4.8.0.1269\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath> | ||||||
|     </Reference> |     </Reference> | ||||||
|     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||||||
|       <HintPath>..\..\packages\Xamarin.Forms.4.6.0.800\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath> |       <HintPath>..\..\packages\Xamarin.Forms.4.8.0.1269\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath> | ||||||
|     </Reference> |     </Reference> | ||||||
|     <Reference Include="XamiTextSharpLGPLv2, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |     <Reference Include="XamiTextSharpLGPLv2, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||||||
|       <HintPath>..\..\packages\XamiTextSharpLGPLv2.1.0.0\lib\netstandard2.0\XamiTextSharpLGPLv2.dll</HintPath> |       <HintPath>..\..\packages\XamiTextSharpLGPLv2.1.0.0\lib\netstandard2.0\XamiTextSharpLGPLv2.dll</HintPath> | ||||||
|  | @ -398,12 +398,12 @@ | ||||||
|     <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" /> |     <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" /> | ||||||
|     <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" /> |     <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" /> | ||||||
|     <Error Condition="!Exists('..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets'))" /> |     <Error Condition="!Exists('..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets'))" /> | ||||||
|     <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.props'))" /> |     <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.props'))" /> | ||||||
|     <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.targets'))" /> |     <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.targets'))" /> | ||||||
|   </Target> |   </Target> | ||||||
|   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" /> |   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" /> | ||||||
|   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" /> |   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" /> | ||||||
|   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" /> |   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" /> | ||||||
|   <Import Project="..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets" Condition="Exists('..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets')" /> |   <Import Project="..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets" Condition="Exists('..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets')" /> | ||||||
|   <Import Project="..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.targets')" /> |   <Import Project="..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.targets')" /> | ||||||
| </Project> | </Project> | ||||||
|  | @ -65,9 +65,9 @@ | ||||||
|   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net471" /> |   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net471" /> | ||||||
|   <package id="UrhoSharp.Forms" version="1.9.67" targetFramework="net471" /> |   <package id="UrhoSharp.Forms" version="1.9.67" targetFramework="net471" /> | ||||||
|   <package id="Xamarin.Essentials" version="1.5.3.2" targetFramework="net471" /> |   <package id="Xamarin.Essentials" version="1.5.3.2" targetFramework="net471" /> | ||||||
|   <package id="Xamarin.Forms" version="4.6.0.800" targetFramework="net471" /> |   <package id="Xamarin.Forms" version="4.8.0.1269" targetFramework="net471" /> | ||||||
|   <package id="Xamarin.Forms.Platform.GTK" version="4.6.0.800" targetFramework="net471" /> |   <package id="Xamarin.Forms.Platform.GTK" version="4.8.0.1269" targetFramework="net471" /> | ||||||
|   <package id="Xamarin.Forms.Visual.Material" version="4.6.0.800" targetFramework="net471" /> |   <package id="Xamarin.Forms.Visual.Material" version="4.8.0.1269" targetFramework="net471" /> | ||||||
|   <package id="XamiTextSharpLGPLv2" version="1.0.0" targetFramework="net471" /> |   <package id="XamiTextSharpLGPLv2" version="1.0.0" targetFramework="net471" /> | ||||||
|   <package id="YamlDotNet" version="6.1.2" targetFramework="net471" /> |   <package id="YamlDotNet" version="6.1.2" targetFramework="net471" /> | ||||||
| </packages> | </packages> | ||||||
|  | @ -11,7 +11,7 @@ | ||||||
|     <AssemblyName>AideDeJeu.UWP</AssemblyName> |     <AssemblyName>AideDeJeu.UWP</AssemblyName> | ||||||
|     <DefaultLanguage>fr-FR</DefaultLanguage> |     <DefaultLanguage>fr-FR</DefaultLanguage> | ||||||
|     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier> |     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier> | ||||||
|     <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion> |     <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion> | ||||||
|     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion> |     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion> | ||||||
|     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion> |     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion> | ||||||
|     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile> |     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile> | ||||||
|  | @ -413,10 +413,10 @@ | ||||||
|       <Version>1.5.3.2</Version> |       <Version>1.5.3.2</Version> | ||||||
|     </PackageReference> |     </PackageReference> | ||||||
|     <PackageReference Include="Xamarin.Forms"> |     <PackageReference Include="Xamarin.Forms"> | ||||||
|       <Version>4.6.0.800</Version> |       <Version>4.8.0.1269</Version> | ||||||
|     </PackageReference> |     </PackageReference> | ||||||
|     <PackageReference Include="Xamarin.Forms.Visual.Material"> |     <PackageReference Include="Xamarin.Forms.Visual.Material"> | ||||||
|       <Version>4.6.0.800</Version> |       <Version>4.8.0.1269</Version> | ||||||
|     </PackageReference> |     </PackageReference> | ||||||
|     <PackageReference Include="XamiTextSharpLGPLv2"> |     <PackageReference Include="XamiTextSharpLGPLv2"> | ||||||
|       <Version>1.0.0</Version> |       <Version>1.0.0</Version> | ||||||
|  |  | ||||||
|  | @ -54,7 +54,7 @@ namespace AideDeJeu.UWP | ||||||
| 
 | 
 | ||||||
|                 rootFrame.NavigationFailed += OnNavigationFailed; |                 rootFrame.NavigationFailed += OnNavigationFailed; | ||||||
| 
 | 
 | ||||||
|                 Rg.Plugins.Popup.Popup.Init(); |                 //Rg.Plugins.Popup.Popup.Init(); | ||||||
| 
 | 
 | ||||||
|                 //Xamarin.Forms.Forms.Init(e); |                 //Xamarin.Forms.Forms.Init(e); | ||||||
|                 //Xamarin.Forms.SetFlags("CollectionView_Experimental"); |                 //Xamarin.Forms.SetFlags("CollectionView_Experimental"); | ||||||
|  | @ -63,7 +63,7 @@ namespace AideDeJeu.UWP | ||||||
|                 Xamarin.Essentials.ExperimentalFeatures.Enable(Xamarin.Essentials.ExperimentalFeatures.ShareFileRequest); |                 Xamarin.Essentials.ExperimentalFeatures.Enable(Xamarin.Essentials.ExperimentalFeatures.ShareFileRequest); | ||||||
| 
 | 
 | ||||||
|                 var assemblies = new List<System.Reflection.Assembly>(); |                 var assemblies = new List<System.Reflection.Assembly>(); | ||||||
|                 assemblies.AddRange(Rg.Plugins.Popup.Popup.GetExtraAssemblies()); |                 //assemblies.AddRange(Rg.Plugins.Popup.Popup.GetExtraAssemblies()); | ||||||
|                 assemblies.Add(typeof(Urho.Forms.UwpSurfaceRenderer).GetTypeInfo().Assembly); |                 assemblies.Add(typeof(Urho.Forms.UwpSurfaceRenderer).GetTypeInfo().Assembly); | ||||||
|                 Xamarin.Forms.Forms.Init(e, assemblies); |                 Xamarin.Forms.Forms.Init(e, assemblies); | ||||||
|                 //Xamarin.Forms.Forms.Init(e, Rg.Plugins.Popup.Popup.GetExtraAssemblies()); |                 //Xamarin.Forms.Forms.Init(e, Rg.Plugins.Popup.Popup.GetExtraAssemblies()); | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| <?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||||||
|  |   <Import Project="..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.props')" /> | ||||||
|   <Import Project="..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.3\build\net45\SkiaSharp.Views.Forms.WPF.props" Condition="Exists('..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.3\build\net45\SkiaSharp.Views.Forms.WPF.props')" /> |   <Import Project="..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.3\build\net45\SkiaSharp.Views.Forms.WPF.props" Condition="Exists('..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.3\build\net45\SkiaSharp.Views.Forms.WPF.props')" /> | ||||||
|   <Import Project="..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.props')" /> |  | ||||||
|   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> |   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||||||
|   <PropertyGroup> |   <PropertyGroup> | ||||||
|     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||||||
|  | @ -255,16 +255,16 @@ | ||||||
|       <HintPath>..\..\packages\Xamarin.Essentials.1.5.3.2\lib\netstandard2.0\Xamarin.Essentials.dll</HintPath> |       <HintPath>..\..\packages\Xamarin.Essentials.1.5.3.2\lib\netstandard2.0\Xamarin.Essentials.dll</HintPath> | ||||||
|     </Reference> |     </Reference> | ||||||
|     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||||||
|       <HintPath>..\..\packages\Xamarin.Forms.4.6.0.800\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath> |       <HintPath>..\..\packages\Xamarin.Forms.4.8.0.1269\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath> | ||||||
|     </Reference> |     </Reference> | ||||||
|     <Reference Include="Xamarin.Forms.Platform, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |     <Reference Include="Xamarin.Forms.Platform, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||||||
|       <HintPath>..\..\packages\Xamarin.Forms.4.6.0.800\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath> |       <HintPath>..\..\packages\Xamarin.Forms.4.8.0.1269\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath> | ||||||
|     </Reference> |     </Reference> | ||||||
|     <Reference Include="Xamarin.Forms.Platform.WPF, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |     <Reference Include="Xamarin.Forms.Platform.WPF, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||||||
|       <HintPath>..\..\packages\Xamarin.Forms.Platform.WPF.4.6.0.800\lib\net45\Xamarin.Forms.Platform.WPF.dll</HintPath> |       <HintPath>..\..\packages\Xamarin.Forms.Platform.WPF.4.8.0.1269\lib\net461\Xamarin.Forms.Platform.WPF.dll</HintPath> | ||||||
|     </Reference> |     </Reference> | ||||||
|     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||||||
|       <HintPath>..\..\packages\Xamarin.Forms.4.6.0.800\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath> |       <HintPath>..\..\packages\Xamarin.Forms.4.8.0.1269\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath> | ||||||
|     </Reference> |     </Reference> | ||||||
|     <Reference Include="YamlDotNet, Version=6.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL"> |     <Reference Include="YamlDotNet, Version=6.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL"> | ||||||
|       <HintPath>..\..\packages\YamlDotNet.6.1.2\lib\net45\YamlDotNet.dll</HintPath> |       <HintPath>..\..\packages\YamlDotNet.6.1.2\lib\net45\YamlDotNet.dll</HintPath> | ||||||
|  | @ -340,15 +340,15 @@ | ||||||
|     <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" /> |     <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" /> | ||||||
|     <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" /> |     <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" /> | ||||||
|     <Error Condition="!Exists('..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets'))" /> |     <Error Condition="!Exists('..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets'))" /> | ||||||
|     <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.props'))" /> |  | ||||||
|     <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.targets'))" /> |  | ||||||
|     <Error Condition="!Exists('..\..\packages\SkiaSharp.Views.Forms.1.68.3\build\net45\SkiaSharp.Views.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.Views.Forms.1.68.3\build\net45\SkiaSharp.Views.Forms.targets'))" /> |     <Error Condition="!Exists('..\..\packages\SkiaSharp.Views.Forms.1.68.3\build\net45\SkiaSharp.Views.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.Views.Forms.1.68.3\build\net45\SkiaSharp.Views.Forms.targets'))" /> | ||||||
|     <Error Condition="!Exists('..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.3\build\net45\SkiaSharp.Views.Forms.WPF.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.3\build\net45\SkiaSharp.Views.Forms.WPF.props'))" /> |     <Error Condition="!Exists('..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.3\build\net45\SkiaSharp.Views.Forms.WPF.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.3\build\net45\SkiaSharp.Views.Forms.WPF.props'))" /> | ||||||
|  |     <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.props'))" /> | ||||||
|  |     <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.targets'))" /> | ||||||
|   </Target> |   </Target> | ||||||
|   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" /> |   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" /> | ||||||
|   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" /> |   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" /> | ||||||
|   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" /> |   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" /> | ||||||
|   <Import Project="..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets" Condition="Exists('..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets')" /> |   <Import Project="..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets" Condition="Exists('..\..\packages\SkiaSharp.1.68.3\build\net462\SkiaSharp.targets')" /> | ||||||
|   <Import Project="..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.targets')" /> |  | ||||||
|   <Import Project="..\..\packages\SkiaSharp.Views.Forms.1.68.3\build\net45\SkiaSharp.Views.Forms.targets" Condition="Exists('..\..\packages\SkiaSharp.Views.Forms.1.68.3\build\net45\SkiaSharp.Views.Forms.targets')" /> |   <Import Project="..\..\packages\SkiaSharp.Views.Forms.1.68.3\build\net45\SkiaSharp.Views.Forms.targets" Condition="Exists('..\..\packages\SkiaSharp.Views.Forms.1.68.3\build\net45\SkiaSharp.Views.Forms.targets')" /> | ||||||
|  |   <Import Project="..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.4.8.0.1269\build\Xamarin.Forms.targets')" /> | ||||||
| </Project> | </Project> | ||||||
|  | @ -58,8 +58,8 @@ | ||||||
|   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" /> |   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" /> | ||||||
|   <package id="UrhoSharp.Forms" version="1.9.67" targetFramework="net472" /> |   <package id="UrhoSharp.Forms" version="1.9.67" targetFramework="net472" /> | ||||||
|   <package id="Xamarin.Essentials" version="1.5.3.2" targetFramework="net472" /> |   <package id="Xamarin.Essentials" version="1.5.3.2" targetFramework="net472" /> | ||||||
|   <package id="Xamarin.Forms" version="4.6.0.800" targetFramework="net472" /> |   <package id="Xamarin.Forms" version="4.8.0.1269" targetFramework="net472" /> | ||||||
|   <package id="Xamarin.Forms.Platform.WPF" version="4.6.0.800" targetFramework="net472" /> |   <package id="Xamarin.Forms.Platform.WPF" version="4.8.0.1269" targetFramework="net472" /> | ||||||
|   <package id="Xamarin.Forms.Visual.Material" version="4.6.0.800" targetFramework="net472" /> |   <package id="Xamarin.Forms.Visual.Material" version="4.8.0.1269" targetFramework="net472" /> | ||||||
|   <package id="YamlDotNet" version="6.1.2" targetFramework="net472" /> |   <package id="YamlDotNet" version="6.1.2" targetFramework="net472" /> | ||||||
| </packages> | </packages> | ||||||
|  | @ -245,10 +245,10 @@ | ||||||
|       <Version>1.5.3.2</Version> |       <Version>1.5.3.2</Version> | ||||||
|     </PackageReference> |     </PackageReference> | ||||||
|     <PackageReference Include="Xamarin.Forms"> |     <PackageReference Include="Xamarin.Forms"> | ||||||
|       <Version>4.6.0.800</Version> |       <Version>4.8.0.1269</Version> | ||||||
|     </PackageReference> |     </PackageReference> | ||||||
|     <PackageReference Include="Xamarin.Forms.Visual.Material"> |     <PackageReference Include="Xamarin.Forms.Visual.Material"> | ||||||
|       <Version>4.6.0.800</Version> |       <Version>4.8.0.1269</Version> | ||||||
|     </PackageReference> |     </PackageReference> | ||||||
|     <PackageReference Include="XamiTextSharpLGPLv2"> |     <PackageReference Include="XamiTextSharpLGPLv2"> | ||||||
|       <Version>1.0.0</Version> |       <Version>1.0.0</Version> | ||||||
|  |  | ||||||
|  | @ -108,8 +108,8 @@ | ||||||
|     <PackageReference Include="sqlite-net-pcl" Version="1.6.292" /> |     <PackageReference Include="sqlite-net-pcl" Version="1.6.292" /> | ||||||
|     <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" /> |     <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" /> | ||||||
|     <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> |     <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> | ||||||
|     <PackageReference Include="Xamarin.Forms" Version="4.6.0.800" /> |     <PackageReference Include="Xamarin.Forms" Version="4.8.0.1269" /> | ||||||
|     <PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.6.0.800" /> |     <PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.8.0.1269" /> | ||||||
|     <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" /> |     <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" /> | ||||||
|     <PackageReference Include="YamlDotNet" Version="6.1.2" /> |     <PackageReference Include="YamlDotNet" Version="6.1.2" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  |  | ||||||
|  | @ -13,7 +13,8 @@ namespace AideDeJeu | ||||||
| #elif CONFIG_CO | #elif CONFIG_CO | ||||||
|         public const string Domain = "CO"; |         public const string Domain = "CO"; | ||||||
| #else | #else | ||||||
|         public const string Domain = "Hereva"; |         //public const string Domain = "Hereva"; | ||||||
|  |         public const string Domain = "HD"; | ||||||
| #endif | #endif | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -81,13 +81,14 @@ namespace AideDeJeuLib | ||||||
|         [DataMember] |         [DataMember] | ||||||
|         public virtual string Languages { get; set; } |         public virtual string Languages { get; set; } | ||||||
| 
 | 
 | ||||||
|         [YamlMember] |         //[YamlMember] | ||||||
|         public IEnumerable<SubRaceItem> SubRaces |         //[IgnoreDataMember] | ||||||
|         { |         //public IEnumerable<SubRaceItem> SubRaces | ||||||
|             get |         //{ | ||||||
|             { |         //    get | ||||||
|                 return GetChildren<SubRaceItem>(); |         //    { | ||||||
|             } |         //        return GetChildren<SubRaceItem>(); | ||||||
|         } |         //    } | ||||||
|  |         //} | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -692,7 +692,8 @@ namespace AideDeJeu.ViewModels | ||||||
|             protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) |             protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) | ||||||
|             { |             { | ||||||
|                 optionsBuilder |                 optionsBuilder | ||||||
|                     .UseSqlite($"Data Source='{DbPath}'"); |                     .UseSqlite($"Data Source='{DbPath}'") | ||||||
|  |                     .EnableSensitiveDataLogging(true); | ||||||
|                     //.ConfigureWarnings(warnings => warnings.Throw(Microsoft.EntityFrameworkCore.Diagnostics.RelationalEventId.QueryClientEvaluationWarning)); |                     //.ConfigureWarnings(warnings => warnings.Throw(Microsoft.EntityFrameworkCore.Diagnostics.RelationalEventId.QueryClientEvaluationWarning)); | ||||||
|             } |             } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -20,7 +20,7 @@ | ||||||
|     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" /> |     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" /> | ||||||
|     <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" /> |     <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" /> | ||||||
|     <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> |     <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> | ||||||
|     <PackageReference Include="Xamarin.Forms" Version="4.6.0.800" /> |     <PackageReference Include="Xamarin.Forms" Version="4.8.0.1269" /> | ||||||
|     <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" /> |     <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -136,6 +136,11 @@ namespace Tests.Xamarin.Forms.Mocks | ||||||
|             { |             { | ||||||
|                 throw new NotImplementedException(); |                 throw new NotImplementedException(); | ||||||
|             } |             } | ||||||
|  | 
 | ||||||
|  |             public string GetHash(string input) | ||||||
|  |             { | ||||||
|  |                 throw new NotImplementedException(); | ||||||
|  |             } | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         internal class MockDeserializer : IDeserializer |         internal class MockDeserializer : IDeserializer | ||||||
|  |  | ||||||
|  | @ -989,6 +989,12 @@ namespace AideDeJeuCmd | ||||||
|             index.Value.Id = index.Value.RootId; |             index.Value.Id = index.Value.RootId; | ||||||
|             index.Value.Name = "Bibliothèque"; |             index.Value.Name = "Bibliothèque"; | ||||||
| 
 | 
 | ||||||
|  |             var doublons = store._AllItems.GroupBy(i => i.Value.Id) | ||||||
|  |                 .Where(g => g.Count() > 1) | ||||||
|  |                 .ToDictionary(x => x.Key, y => y.Count()); | ||||||
|  |             //.Select(y => y.Key) | ||||||
|  |             //.ToList(); | ||||||
|  | 
 | ||||||
|             using (var context = await StoreViewModel.GetLibraryContextAsync()) |             using (var context = await StoreViewModel.GetLibraryContextAsync()) | ||||||
|             { |             { | ||||||
|                 try |                 try | ||||||
|  |  | ||||||
|  | @ -15,7 +15,7 @@ | ||||||
|     <PackageReference Include="sqlite-net-pcl" Version="1.6.292" /> |     <PackageReference Include="sqlite-net-pcl" Version="1.6.292" /> | ||||||
|     <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" /> |     <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" /> | ||||||
|     <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> |     <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> | ||||||
|     <PackageReference Include="Xamarin.Forms" Version="4.6.0.800" /> |     <PackageReference Include="Xamarin.Forms" Version="4.8.0.1269" /> | ||||||
|     <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" /> |     <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -18,7 +18,7 @@ | ||||||
|     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" /> |     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" /> | ||||||
|     <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" /> |     <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" /> | ||||||
|     <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> |     <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> | ||||||
|     <PackageReference Include="Xamarin.Forms" Version="4.6.0.800" /> |     <PackageReference Include="Xamarin.Forms" Version="4.8.0.1269" /> | ||||||
|     <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" /> |     <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										
											BIN
										
									
								
								Data/library.db
									
										
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Data/library.db
									
										
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										2
									
								
								JoA
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								JoA
									
										
									
									
									
								
							|  | @ -1 +1 @@ | ||||||
| Subproject commit f4fd23d54f3e7670c69cd64d68a2efec72d1fb09 | Subproject commit 670c2340c7711b3bd3720d438022640b1777aac7 | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Yan Maniez
						Yan Maniez