5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-29 22:45:44 +00:00
Code Issues Projects Releases Wiki Activity

Fusion en cours

Browse source
This commit is contained in:
Yan Maniez 2020-12-20 03:07:43 +01:00
commit a2a32b9f0d
6 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AideDeJeu.sln
View file

@ -616,7 +616,6 @@ Global
{D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Debug|ARM.ActiveCfg = Debug|Any CPU {D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Debug|ARM.ActiveCfg = Debug|Any CPU
{D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Debug|ARM.Build.0 = Debug|Any CPU {D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Debug|ARM.Build.0 = Debug|Any CPU
{D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Debug|iPhone.ActiveCfg = Debug|Any CPU {D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Debug|iPhone.Build.0 = Debug|Any CPU
{D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Debug|x64.ActiveCfg = Debug|Any CPU {D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Debug|x64.ActiveCfg = Debug|Any CPU
@ -832,7 +831,6 @@ Global
{443C655C-FDE9-48C9-95E4-630DD368ABDB}.Debug|ARM.ActiveCfg = Debug|Any CPU {443C655C-FDE9-48C9-95E4-630DD368ABDB}.Debug|ARM.ActiveCfg = Debug|Any CPU
{443C655C-FDE9-48C9-95E4-630DD368ABDB}.Debug|ARM.Build.0 = Debug|Any CPU {443C655C-FDE9-48C9-95E4-630DD368ABDB}.Debug|ARM.Build.0 = Debug|Any CPU
{443C655C-FDE9-48C9-95E4-630DD368ABDB}.Debug|iPhone.ActiveCfg = Debug|Any CPU {443C655C-FDE9-48C9-95E4-630DD368ABDB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{443C655C-FDE9-48C9-95E4-630DD368ABDB}.Debug|iPhone.Build.0 = Debug|Any CPU
{443C655C-FDE9-48C9-95E4-630DD368ABDB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {443C655C-FDE9-48C9-95E4-630DD368ABDB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{443C655C-FDE9-48C9-95E4-630DD368ABDB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {443C655C-FDE9-48C9-95E4-630DD368ABDB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{443C655C-FDE9-48C9-95E4-630DD368ABDB}.Debug|x64.ActiveCfg = Debug|Any CPU {443C655C-FDE9-48C9-95E4-630DD368ABDB}.Debug|x64.ActiveCfg = Debug|Any CPU
@ -940,7 +938,6 @@ Global
{F3173507-0CED-44BB-92D2-9DB7832FF011}.Debug|ARM.ActiveCfg = Debug|Any CPU {F3173507-0CED-44BB-92D2-9DB7832FF011}.Debug|ARM.ActiveCfg = Debug|Any CPU
{F3173507-0CED-44BB-92D2-9DB7832FF011}.Debug|ARM.Build.0 = Debug|Any CPU {F3173507-0CED-44BB-92D2-9DB7832FF011}.Debug|ARM.Build.0 = Debug|Any CPU
{F3173507-0CED-44BB-92D2-9DB7832FF011}.Debug|iPhone.ActiveCfg = Debug|Any CPU {F3173507-0CED-44BB-92D2-9DB7832FF011}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{F3173507-0CED-44BB-92D2-9DB7832FF011}.Debug|iPhone.Build.0 = Debug|Any CPU
{F3173507-0CED-44BB-92D2-9DB7832FF011}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {F3173507-0CED-44BB-92D2-9DB7832FF011}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{F3173507-0CED-44BB-92D2-9DB7832FF011}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {F3173507-0CED-44BB-92D2-9DB7832FF011}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{F3173507-0CED-44BB-92D2-9DB7832FF011}.Debug|x64.ActiveCfg = Debug|Any CPU {F3173507-0CED-44BB-92D2-9DB7832FF011}.Debug|x64.ActiveCfg = Debug|Any CPU
@ -1048,7 +1045,6 @@ Global
{F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|ARM.ActiveCfg = Debug|Any CPU {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|ARM.ActiveCfg = Debug|Any CPU
{F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|ARM.Build.0 = Debug|Any CPU {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|ARM.Build.0 = Debug|Any CPU
{F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|iPhone.ActiveCfg = Debug|Any CPU {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|iPhone.Build.0 = Debug|Any CPU
{F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|x64.ActiveCfg = Debug|Any CPU {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|x64.ActiveCfg = Debug|Any CPU

6
AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
View file

@ -188,6 +188,7 @@
</Reference> </Reference>
<Reference Include="Rg.Plugins.Popup, Version=2.0.0.6, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Rg.Plugins.Popup, Version=2.0.0.6, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Rg.Plugins.Popup.2.0.0.6\lib\net472\Rg.Plugins.Popup.dll</HintPath> <HintPath>..\..\packages\Rg.Plugins.Popup.2.0.0.6\lib\net472\Rg.Plugins.Popup.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="SkiaSharp, Version=2.80.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL"> <Reference Include="SkiaSharp, Version=2.80.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\packages\SkiaSharp.2.80.2\lib\net462\SkiaSharp.dll</HintPath> <HintPath>..\..\packages\SkiaSharp.2.80.2\lib\net462\SkiaSharp.dll</HintPath>
@ -334,8 +335,9 @@
<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>
</Reference> </Reference>
<Reference Include="YamlDotNet, Version=8.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL"> <Reference Include="YamlDotNet, Version=9.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
<HintPath>..\..\packages\YamlDotNet.8.1.2\lib\net45\YamlDotNet.dll</HintPath> <HintPath>..\..\packages\YamlDotNet.9.1.0\lib\net45\YamlDotNet.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
AideDeJeu/AideDeJeu.GTK/packages.config
View file

@ -75,5 +75,5 @@
<package id="Xamarin.Forms.Platform.WPF" version="5.0.0.1791-pre5" targetFramework="net472" /> <package id="Xamarin.Forms.Platform.WPF" version="5.0.0.1791-pre5" targetFramework="net472" />
<package id="Xamarin.Forms.Visual.Material" version="5.0.0.1791-pre5" targetFramework="net472" /> <package id="Xamarin.Forms.Visual.Material" version="5.0.0.1791-pre5" targetFramework="net472" />
<package id="XamiTextSharpLGPLv2" version="1.0.0" targetFramework="net471" /> <package id="XamiTextSharpLGPLv2" version="1.0.0" targetFramework="net471" />
<package id="YamlDotNet" version="8.1.2" targetFramework="net472" /> <package id="YamlDotNet" version="9.1.0" targetFramework="net472" />
</packages> </packages>

5
AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj
View file

@ -303,8 +303,9 @@
<HintPath>..\..\packages\Xamarin.Forms.5.0.0.1791-pre5\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.5.0.0.1791-pre5\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="YamlDotNet, Version=8.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL"> <Reference Include="YamlDotNet, Version=9.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
<HintPath>..\..\packages\YamlDotNet.8.1.2\lib\net45\YamlDotNet.dll</HintPath> <HintPath>..\..\packages\YamlDotNet.9.1.0\lib\net45\YamlDotNet.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
AideDeJeu/AideDeJeu.WPF/packages.config
View file

@ -70,9 +70,9 @@
<package id="System.Threading" version="4.3.0" targetFramework="net472" /> <package id="System.Threading" version="4.3.0" targetFramework="net472" />
<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.6.0-rc1" targetFramework="net472" /> <package id="Xamarin.Essentials" version="1.5.3.2" targetFramework="net472" />
<package id="Xamarin.Forms" version="5.0.0.1791-pre5" targetFramework="net472" /> <package id="Xamarin.Forms" version="4.8.0.1687" targetFramework="net472" />
<package id="Xamarin.Forms.Platform.WPF" version="5.0.0.1791-pre5" targetFramework="net472" /> <package id="Xamarin.Forms.Platform.WPF" version="4.8.0.1687" targetFramework="net472" />
<package id="Xamarin.Forms.Visual.Material" version="5.0.0.1791-pre5" targetFramework="net472" /> <package id="Xamarin.Forms.Visual.Material" version="4.8.0.1687" targetFramework="net472" />
<package id="YamlDotNet" version="8.1.2" targetFramework="net472" /> <package id="YamlDotNet" version="9.1.0" targetFramework="net472" />
</packages> </packages>

20
AideDeJeu/AideDeJeu/AideDeJeu.csproj
View file

@ -97,19 +97,19 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Markdig" Version="0.22.1" /> <PackageReference Include="Markdig" Version="0.22.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.0" />
<PackageReference Include="OnePlat.DiceNotation" Version="2.0.2" /> <PackageReference Include="OnePlat.DiceNotation" Version="2.0.2" />
<PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.9" /> <PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.7" />
<PackageReference Include="SkiaSharp.Svg" Version="1.60.0" /> <PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views" Version="2.80.3-preview.18" /> <PackageReference Include="SkiaSharp.Views" Version="2.80.2" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="2.80.3-preview.18" /> <PackageReference Include="SkiaSharp.Views.Forms" Version="2.80.2" />
<PackageReference Include="sqlite-net-pcl" Version="1.8.0-beta" /> <PackageReference Include="sqlite-net-pcl" Version="1.7.335" />
<PackageReference Include="UrhoSharp.Forms" Version="1.9.67" /> <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.0-rc1" /> <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1791-pre5" /> <PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="5.0.0.1791-pre5" /> <PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.8.0.1687" />
<PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" /> <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" />
<PackageReference Include="YamlDotNet" Version="9.1.0" /> <PackageReference Include="YamlDotNet" Version="9.1.0" />
</ItemGroup> </ItemGroup>