aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies.

Browse Source
This commit is contained in:
Natalia Portillo
2020-06-14 17:47:52 +01:00
parent b4c4086ab7
commit c1d9ce5aea
12 changed files with 25 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -19,9 +19,6 @@
[submodule "Aaru.Helpers"]
path = Aaru.Helpers
url = https://github.com/aaru-dps/Aaru.Helpers
[submodule "oxyplot-avalonia"]
path = oxyplot-avalonia
url = https://github.com/oxyplot/oxyplot-avalonia.git
[submodule "cuetools.net"]
path = cuetools.net
url = https://github.com/claunia/cuetools.net

101
.idea/.idea.Aaru/.idea/contentModel.xml generated
View File

@@ -5,6 +5,8 @@
<e p="$USER_HOME$/.cache/JetBrains/Rider2020.1/resharper-host/local/Transient/ReSharperHost/v201/SolutionCaches/_Aaru.232757112.00" t="ExcludeRecursive" />
<e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" />
<e p="$APPLICATION_CONFIG_DIR$/extensions" t="IncludeRecursive" />
<e p="$APPLICATION_CONFIG_DIR$/scratches" t="IncludeRecursive" />
<e p="$USER_HOME$/.config/git/ignore" t="IncludeRecursive" />
<e p="$APPLICATION_PLUGINS_DIR$/puppet/lib/stubs" t="IncludeRecursive" />
<e p="$PROJECT_DIR$" t="IncludeFlat">
<e p=".git/info/exclude" t="IncludeRecursive" />
@@ -1373,7 +1375,6 @@
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Gui.AssemblyInfo.cs" t="Include" />
<e p="Avalonia" t="Include">
<e p="resources" t="Include" />
</e>
@@ -2129,104 +2130,6 @@
</e>
</e>
<e p="cuetools.net/bin" t="ExcludeRecursive" />
<e p="oxyplot-avalonia/Source/OxyPlot.Avalonia" t="IncludeRecursive">
<e p="Annotations" t="Include">
<e p="Annotation.cs" t="Include" />
<e p="ArrowAnnotation.cs" t="Include" />
<e p="EllipseAnnotation.cs" t="Include" />
<e p="FunctionAnnotation.cs" t="Include" />
<e p="LineAnnotation.cs" t="Include" />
<e p="PathAnnotation.cs" t="Include" />
<e p="PointAnnotation.cs" t="Include" />
<e p="PolygonAnnotation.cs" t="Include" />
<e p="PolylineAnnotation.cs" t="Include" />
<e p="RectangleAnnotation.cs" t="Include" />
<e p="ShapeAnnotation.cs" t="Include" />
<e p="TextAnnotation.cs" t="Include" />
<e p="TextualAnnotation.cs" t="Include" />
</e>
<e p="Axes" t="Include">
<e p="AngleAxis.cs" t="Include" />
<e p="Axis.cs" t="Include" />
<e p="CategoryAxis.cs" t="Include" />
<e p="DateTimeAxis.cs" t="Include" />
<e p="LinearAxis.cs" t="Include" />
<e p="LinearColorAxis.cs" t="Include" />
<e p="LogarithmicAxis.cs" t="Include" />
<e p="MagnitudeAxis.cs" t="Include" />
<e p="TimeSpanAxis.cs" t="Include" />
</e>
<e p="CanvasRenderContext.cs" t="Include" />
<e p="Converters" t="Include">
<e p="OxyColorConverter.cs" t="Include" />
<e p="ThicknessConverter.cs" t="Include" />
</e>
<e p="Extensions" t="Include">
<e p="DataPointExtension.cs" t="Include" />
</e>
<e p="MoreColors.cs" t="Include" />
<e p="NamespaceDoc.cs" t="Include" />
<e p="OxyPlot.Avalonia.csproj" t="IncludeRecursive" />
<e p="OxyPlot.Avalonia.csproj.DotSettings" t="Include" />
<e p="OxyPlotModule.cs" t="Include" />
<e p="Plot.Properties.cs" t="Include" />
<e p="Plot.cs" t="Include" />
<e p="PlotBase.Events.cs" t="Include" />
<e p="PlotBase.Export.cs" t="Include" />
<e p="PlotBase.Properties.cs" t="Include" />
<e p="PlotBase.cs" t="Include" />
<e p="PlotView.cs" t="Include" />
<e p="PngExporter.cs" t="Include" />
<e p="Series" t="Include">
<e p="AreaSeries.cs" t="Include" />
<e p="BarSeries" t="Include">
<e p="BarSeries.cs" t="Include" />
<e p="BarSeriesBase.cs" t="Include" />
<e p="BarSeriesBase{T}.cs" t="Include" />
<e p="CategorizedSeries.cs" t="Include" />
<e p="ColumnSeries.cs" t="Include" />
<e p="LinearBarSeries.cs" t="Include" />
</e>
<e p="BoxPlotSeries.cs" t="Include" />
<e p="DataPointSeries.cs" t="Include" />
<e p="HeatMapSeries.cs" t="Include" />
<e p="ItemsSeries.cs" t="Include" />
<e p="LineSeries.cs" t="Include" />
<e p="PieSeries.cs" t="Include" />
<e p="ScatterErrorSeries.cs" t="Include" />
<e p="ScatterSeries.cs" t="Include" />
<e p="ScatterSeries{T}.cs" t="Include" />
<e p="Series.cs" t="Include" />
<e p="StairStepSeries.cs" t="Include" />
<e p="ThreeColorLineSeries.cs" t="Include" />
<e p="TwoColorAreaSeries.cs" t="Include" />
<e p="TwoColorLineSeries.cs" t="Include" />
<e p="XYAxisSeries.cs" t="Include" />
</e>
<e p="SvgExporter.cs" t="Include" />
<e p="Themes" t="Include">
<e p="Default.xaml" t="Include" />
<e p="Default.xaml.cs" t="Include" />
</e>
<e p="Tracker" t="Include">
<e p="TrackerControl.cs" t="Include" />
<e p="TrackerDefinition.cs" t="Include" />
</e>
<e p="Utilities" t="Include">
<e p="ConverterExtensions.cs" t="Include" />
<e p="Keyboard.cs" t="Include" />
</e>
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netstandard2.0" t="Include">
<e p="Avalonia" t="Include">
<e p="resources" t="Include" />
</e>
</e>
</e>
</e>
</e>
<e p="packages" t="ExcludeRecursive" />
</e>
</component>

8
Aaru.Database/Aaru.Database.csproj
View File

@@ -50,10 +50,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="EntityFramework" Version="6.4.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.2" />
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.6" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
</ItemGroup>

2
Aaru.Filters/Aaru.Filters.csproj
View File

@@ -75,7 +75,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="SharpCompress" Version="0.24.0" />
<PackageReference Include="SharpCompress" Version="0.25.1" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
</ItemGroup>
<ProjectExtensions>

12
Aaru.Gui/Aaru.Gui.csproj
View File

@@ -19,21 +19,19 @@
<NrtShowRevision>true</NrtShowRevision>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.9.7" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.9.10" />
<PackageReference Include="Claunia.Encoding" Version="1.7.0" />
<PackageReference Include="Eto.Forms" Version="2.5.0" />
<PackageReference Include="Eto.Serialization.Xaml" Version="2.5.0" />
<PackageReference Include="MessageBox.Avalonia" Version="0.9.6.1" />
<PackageReference Include="OxyPlot.Avalonia-alpha-2020-04-15" Version="1.0.0" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
<PackageReference Include="Avalonia" Version="0.9.7" />
<PackageReference Include="Avalonia.Desktop" Version="0.9.7" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.9.7" />
<PackageReference Include="Avalonia" Version="0.9.10" />
<PackageReference Include="Avalonia.Desktop" Version="0.9.10" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.9.10" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Aaru.Core\Aaru.Core.csproj" />
<ProjectReference Include="..\Aaru.Devices\Aaru.Devices.csproj" />
<ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj" />
<ProjectReference Include="..\oxyplot-avalonia\Source\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Assets\Logos\Media\AIT1.png" />

8
Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
View File

@@ -39,6 +39,8 @@ using System.Reflection;
using Aaru.CommonTypes.Interop;
using Aaru.Console;
using Avalonia.Controls;
using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums;
using ReactiveUI;
using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
using Version = Aaru.CommonTypes.Interop.Version;
@@ -139,8 +141,10 @@ namespace Aaru.Gui.ViewModels.Dialogs
}
catch(Exception exception)
{
Eto.Forms.MessageBox.Show("Exception {0} trying to save logfile, details has been sent to console.",
exception.Message);
await MessageBoxManager.
GetMessageBoxStandardWindow("Error",
$"Exception {exception.Message} trying to save logfile, details has been sent to console.",
ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
AaruConsole.ErrorWriteLine("Console", exception.Message);
AaruConsole.ErrorWriteLine("Console", exception.StackTrace);

2
Aaru.Helpers

Submodule Aaru.Helpers updated: 9abb9f23bc...3bd05336bd

6
Aaru.Images/Aaru.Images.csproj
View File

@@ -51,9 +51,9 @@
<ItemGroup>
<PackageReference Include="Claunia.Encoding" Version="1.7.0" />
<PackageReference Include="Claunia.RsrcFork" Version="1.1.0" />
<PackageReference Include="DotNetZip" Version="1.13.6" />
<PackageReference Include="plist-cil" Version="2.0.0" />
<PackageReference Include="SharpCompress" Version="0.24.0" />
<PackageReference Include="DotNetZip" Version="1.13.8" />
<PackageReference Include="plist-cil" Version="2.1.0" />
<PackageReference Include="SharpCompress" Version="0.25.1" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
</ItemGroup>

2
Aaru.Settings/Aaru.Settings.csproj
View File

@@ -61,7 +61,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="plist-cil" Version="2.0.0" />
<PackageReference Include="plist-cil" Version="2.1.0" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
</ItemGroup>
<ProjectExtensions>

10
Aaru.sln
View File

@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Dto", "Aaru.Dto\Aaru.D
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Gui", "Aaru.Gui\Aaru.Gui.csproj", "{18C4C44D-2562-4B6D-8181-32D7EA067D96}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot.Avalonia", "oxyplot-avalonia\Source\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj", "{FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs.Flake", "cuetools.net\CUETools.Codecs.Flake\CUETools.Codecs.FLAKE.csproj", "{A6E2C380-F8CB-4873-8DA6-0BB027C48EBC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs", "cuetools.net\CUETools.Codecs\CUETools.Codecs.csproj", "{D1F69B02-A6A4-4EF2-A916-815BACC18F71}"
@@ -186,14 +184,6 @@ Global
{18C4C44D-2562-4B6D-8181-32D7EA067D96}.Release|Any CPU.Build.0 = Release|Any CPU
{18C4C44D-2562-4B6D-8181-32D7EA067D96}.Release|x86.ActiveCfg = Release|Any CPU
{18C4C44D-2562-4B6D-8181-32D7EA067D96}.Release|x86.Build.0 = Release|Any CPU
{FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Debug|x86.ActiveCfg = Debug|Any CPU
{FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Debug|x86.Build.0 = Debug|Any CPU
{FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Release|Any CPU.Build.0 = Release|Any CPU
{FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Release|x86.ActiveCfg = Release|Any CPU
{FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Release|x86.Build.0 = Release|Any CPU
{A6E2C380-F8CB-4873-8DA6-0BB027C48EBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6E2C380-F8CB-4873-8DA6-0BB027C48EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6E2C380-F8CB-4873-8DA6-0BB027C48EBC}.Debug|x86.ActiveCfg = Debug|Any CPU

4
Aaru/Aaru.csproj
View File

@@ -268,10 +268,10 @@
<Content Include="..\.github\PULL_REQUEST_TEMPLATE.md" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.5" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20104.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
<PackageReference Include="System.Collections" Version="4.3.0" />

1
oxyplot-avalonia

Submodule oxyplot-avalonia deleted from cedccb8b71