Update Packages to Latest Versions (#29)
This commit is contained in:
Artyom
GitHub
Родитель
c73a4b399f
Коммит
a212b90b2b
|
|
@ -47,9 +47,12 @@ To compile the <a href="https://docs.microsoft.com/en-us/xamarin/xamarin-forms/"
|
|||
### Technologies and Tools Used
|
||||
|
||||
- <a href="https://reactiveui.net/">ReactiveUI</a> modern MVVM framework
|
||||
- <a href="https://github.com/reactiveui/Akavache">Akavache</a> persistent key-value store
|
||||
- <a href="https://github.com/reactiveui/DynamicData">DynamicData</a> reactive collections
|
||||
- <a href="http://github.com/avaloniaui">AvaloniaUI</a> cross-platform XAML-based GUI framework
|
||||
- <a href="https://github.com/reactiveui/Akavache">Akavache</a> persistent key-value store
|
||||
- <a href="https://github.com/nuke-build/nuke">Nuke</a> build automation system for C#/.NET
|
||||
- <a href="https://github.com/xunit/xunit">XUnit</a> unit testing tool for .NET
|
||||
- <a href="https://github.com/tonerdo/coverlet">Coverlet</a> code coverage analyzer
|
||||
- <a href="https://github.com/nsubstitute/NSubstitute">NSubstitute</a> mocking library
|
||||
- <a href="https://github.com/fluentassertions/fluentassertions">FluentAssertions</a> assertions library
|
||||
- <a href="https://docs.microsoft.com/en-us/xamarin/xamarin-forms/">Xamarin.Forms</a> mobile GUI framework
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Avalonia" Version="0.8.999-cibuild0003269-beta" />
|
||||
<PackageReference Include="Avalonia.Desktop" Version="0.8.999-cibuild0003269-beta" />
|
||||
<PackageReference Include="Avalonia.ReactiveUI" Version="0.8.999-cibuild0003269-beta" />
|
||||
<PackageReference Include="Avalonia" Version="0.9.0-preview7" />
|
||||
<PackageReference Include="Avalonia.Desktop" Version="0.9.0-preview7" />
|
||||
<PackageReference Include="Avalonia.ReactiveUI" Version="0.9.0-preview7" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="coverlet.msbuild" Version="2.6.3">
|
||||
<PackageReference Include="coverlet.msbuild" Version="2.7.0">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="FluentAssertions" Version="5.7.0" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
|
||||
<PackageReference Include="ReactiveUI.Testing" Version="9.19.5" />
|
||||
<PackageReference Include="FluentAssertions" Version="5.9.0" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
|
||||
<PackageReference Include="ReactiveUI.Testing" Version="10.5.7" />
|
||||
<PackageReference Include="NSubstitute" Version="4.2.1" />
|
||||
<PackageReference Include="xunit" Version="2.4.1" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<AssemblyName>Camelotia.Presentation.Uwp</AssemblyName>
|
||||
<DefaultLanguage>en-us</DefaultLanguage>
|
||||
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
|
||||
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
|
||||
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
|
||||
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
|
||||
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
|
|
|
|||
|
|
@ -132,10 +132,7 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="akavache">
|
||||
<Version>6.5.20</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Costura.Fody">
|
||||
<Version>4.0.0</Version>
|
||||
<Version>6.9.10</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="MahApps.Metro">
|
||||
<Version>1.6.5</Version>
|
||||
|
|
@ -150,13 +147,13 @@
|
|||
<Version>0.1.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="ReactiveUI.Events.WPF">
|
||||
<Version>9.19.5</Version>
|
||||
<Version>10.5.7</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="ReactiveUI.WPF">
|
||||
<Version>9.19.5</Version>
|
||||
<Version>10.5.7</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3">
|
||||
<Version>1.1.14</Version>
|
||||
<Version>2.0.2</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -169,9 +166,6 @@
|
|||
<Name>Camelotia.Services</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="FodyWeavers.xml" />
|
||||
</ItemGroup>
|
||||
<!--
|
||||
Uncomment to have native libraries embedded.
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
|
||||
<Costura />
|
||||
</Weavers>
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
|
||||
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
|
||||
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
|
||||
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
|
||||
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
|
|
@ -56,16 +56,16 @@
|
|||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Reactive" Version="4.1.5" />
|
||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
|
||||
<PackageReference Include="ReactiveUI.AndroidSupport" Version="9.19.5" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="4.1.0.618606" />
|
||||
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
|
||||
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
|
||||
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.1" />
|
||||
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.1" />
|
||||
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.1" />
|
||||
<PackageReference Include="Xamarin.Plugin.FilePicker" Version="2.1.18" />
|
||||
<PackageReference Include="System.Reactive" Version="4.2.0" />
|
||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
|
||||
<PackageReference Include="ReactiveUI.AndroidSupport" Version="10.5.7" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="4.3.0.947036" />
|
||||
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
|
||||
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
|
||||
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
|
||||
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.3" />
|
||||
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.3" />
|
||||
<PackageReference Include="Xamarin.Plugin.FilePicker" Version="2.1.34" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System.Threading.Tasks.Extensions">
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:versionCode="1" android:versionName="1.0" package="com.camelotia">
|
||||
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="27" />
|
||||
<application android:label="Camelotia.Presentation.Xamarin.Android"></application>
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
</manifest>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.camelotia">
|
||||
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
|
||||
<application android:label="Camelotia.Presentation.Xamarin.Android"></application>
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
</manifest>
|
||||
|
|
@ -10,8 +10,8 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ReactiveUI.XamForms" Version="9.19.5" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="4.1.0.618606" />
|
||||
<PackageReference Include="ReactiveUI.XamForms" Version="10.5.7" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="4.3.0.947036" />
|
||||
<PackageReference Include="Xam.Plugin.Iconize" Version="3.5.0.112" />
|
||||
<PackageReference Include="Xam.Plugin.Iconize.FontAwesome" Version="3.5.0.112" />
|
||||
</ItemGroup>
|
||||
|
|
@ -67,4 +67,43 @@
|
|||
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="App.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</None>
|
||||
<None Update="Views\AuthView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</None>
|
||||
<None Update="Views\CreateFolderView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</None>
|
||||
<None Update="Views\DirectAuthView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</None>
|
||||
<None Update="Views\HostAuthView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</None>
|
||||
<None Update="Views\MainMasterView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</None>
|
||||
<None Update="Views\MainProviderView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</None>
|
||||
<None Update="Views\MainView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</None>
|
||||
<None Update="Views\OAuthView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</None>
|
||||
<None Update="Views\ProviderExplorerFileView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</None>
|
||||
<None Update="Views\ProviderExplorerView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</None>
|
||||
<None Update="Views\RenameFileView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -9,8 +9,8 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ReactiveUI" Version="9.19.5" />
|
||||
<PackageReference Include="ReactiveUI.Fody" Version="9.19.5" />
|
||||
<PackageReference Include="ReactiveUI" Version="10.5.7" />
|
||||
<PackageReference Include="ReactiveUI.Fody" Version="10.5.7" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ using DynamicData.Binding;
|
|||
|
||||
namespace Camelotia.Presentation.ViewModels
|
||||
{
|
||||
public sealed class MainViewModel : ReactiveObject, IMainViewModel, ISupportsActivation
|
||||
public sealed class MainViewModel : ReactiveObject, IMainViewModel, IActivatableViewModel
|
||||
{
|
||||
private readonly ReadOnlyObservableCollection<IProviderViewModel> _providers;
|
||||
private readonly ObservableAsPropertyHelper<bool> _welcomeScreenCollapsed;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ namespace Camelotia.Presentation.ViewModels
|
|||
{
|
||||
public delegate IProviderViewModel ProviderViewModelFactory(IProvider provider, IAuthViewModel auth);
|
||||
|
||||
public sealed class ProviderViewModel : ReactiveObject, IProviderViewModel, ISupportsActivation
|
||||
public sealed class ProviderViewModel : ReactiveObject, IProviderViewModel, IActivatableViewModel
|
||||
{
|
||||
private readonly ObservableAsPropertyHelper<IEnumerable<IFileViewModel>> _files;
|
||||
private readonly ReactiveCommand<Unit, IEnumerable<FileModel>> _refresh;
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="DynamicData" Version="6.12.9" />
|
||||
<PackageReference Include="akavache" Version="6.5.20" />
|
||||
<PackageReference Include="FluentFTP" Version="27.0.0" />
|
||||
<PackageReference Include="Google.Apis.Drive.v3" Version="1.40.2.1649" />
|
||||
<PackageReference Include="Octokit" Version="0.32.0" />
|
||||
<PackageReference Include="DynamicData" Version="6.13.21" />
|
||||
<PackageReference Include="akavache" Version="6.9.10" />
|
||||
<PackageReference Include="FluentFTP" Version="28.0.1" />
|
||||
<PackageReference Include="Google.Apis.Drive.v3" Version="1.42.0.1750" />
|
||||
<PackageReference Include="Octokit" Version="0.36.0" />
|
||||
<PackageReference Include="ssh.net" Version="2016.1.0" />
|
||||
<PackageReference Include="System.Reactive" Version="4.1.5" />
|
||||
<PackageReference Include="VkNet" Version="1.44.0" />
|
||||
<PackageReference Include="System.Reactive" Version="4.2.0" />
|
||||
<PackageReference Include="VkNet" Version="1.47.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче