Skip to content

Commit b5cd916

Browse files
fedemkrfedemkr
committed
Updated MvvmCross from 4.4.0 to 6.4.0 and changed QuickLayout.Core target framework to NetStandard 2.0
1 parent b171e82 commit b5cd916

32 files changed

+184
-284
lines changed

‎QuickLayout.Core/App.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
using MvvmCross.Platform.IoC;
1+
using MvvmCross.IoC;
2+
using MvvmCross.ViewModels;
23

34
namespace QuickLayout.Core
45
{
5-
public class App : MvvmCross.Core.ViewModels.MvxApplication
6+
public class App : MvxApplication
67
{
78
public override void Initialize()
89
{

‎QuickLayout.Core/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎QuickLayout.Core/QuickLayout.Core.csproj

Lines changed: 5 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<Project Sdk="Microsoft.NET.Sdk">
3+
44
<PropertyGroup>
5-
<MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{849AFB57-994A-42D9-A786-EF34FC951CDE}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>QuickLayout.Core</RootNamespace>
12-
<AssemblyName>QuickLayout.Core</AssemblyName>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
15-
<FileAlignment>512</FileAlignment>
16-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
5+
<TargetFramework>netstandard2.0</TargetFramework>
6+
<LangVersion>7.1</LangVersion>
177
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
</PropertyGroup>
35-
<ItemGroup>
36-
<Compile Include="App.cs" />
37-
<Compile Include="Properties\AssemblyInfo.cs" />
38-
<Compile Include="Services\CalculationService.cs" />
39-
<Compile Include="Services\ICalculationService.cs" />
40-
<Compile Include="ViewModels\BaseDetailsViewModel.cs" />
41-
<Compile Include="ViewModels\DetailsViewModel.cs" />
42-
<Compile Include="ViewModels\FirstViewModel.cs" />
43-
<Compile Include="ViewModels\FormGridViewModel.cs" />
44-
<Compile Include="ViewModels\FormViewModel.cs" />
45-
<Compile Include="ViewModels\FullSizeViewModel.cs" />
46-
<Compile Include="ViewModels\SearchViewModel.cs" />
47-
<Compile Include="ViewModels\TipViewModel.cs" />
48-
<Compile Include="ViewModels\ToCenterConstraintsViewModel.cs" />
49-
<Compile Include="ViewModels\UpdateConstraintsViewModel.cs" />
50-
<Compile Include="ViewModels\AdvancedVerticalStackViewModel.cs" />
51-
<Compile Include="ViewModels\DirectionFormViewModel.cs" />
52-
<Compile Include="ViewModels\RightToLeftViewModel.cs" />
53-
<Compile Include="ViewModels\ViewWithSafeAreaViewModel.cs" />
54-
</ItemGroup>
55-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
56-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
57-
Other similar extension points exist, see Microsoft.Common.targets.
58-
<Target Name="BeforeBuild">
59-
</Target>
60-
<Target Name="AfterBuild">
61-
</Target>
62-
-->
63-
<ItemGroup>
64-
<Reference Include="MvvmCross.Platform">
65-
<HintPath>..\packages\MvvmCross.Platform.4.4.0\lib\portable-net45+win+wpa81+wp80\MvvmCross.Platform.dll</HintPath>
66-
</Reference>
67-
<Reference Include="MvvmCross.Core">
68-
<HintPath>..\packages\MvvmCross.Core.4.4.0\lib\portable-net45+win+wpa81+wp80\MvvmCross.Core.dll</HintPath>
69-
</Reference>
70-
<Reference Include="MvvmCross.Binding">
71-
<HintPath>..\packages\MvvmCross.Binding.4.4.0\lib\portable-net45+win+wpa81+wp80\MvvmCross.Binding.dll</HintPath>
72-
</Reference>
73-
<Reference Include="MvvmCross.Localization">
74-
<HintPath>..\packages\MvvmCross.Binding.4.4.0\lib\portable-net45+win+wpa81+wp80\MvvmCross.Localization.dll</HintPath>
75-
</Reference>
76-
</ItemGroup>
778
<ItemGroup>
78-
<None Include="packages.config" />
9+
<PackageReference Include="MvvmCross" Version="6.4.0" />
7910
</ItemGroup>
8011
</Project>

‎QuickLayout.Core/ViewModels/BaseDetailsViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using MvvmCross.Core.ViewModels;
1+
using MvvmCross.ViewModels;
22

33
namespace QuickLayout.Core.ViewModels
44
{

‎QuickLayout.Core/ViewModels/FirstViewModel.cs

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,39 @@
1-
using MvvmCross.Core.ViewModels;
1+
using MvvmCross.Logging;
2+
using MvvmCross.Navigation;
3+
using MvvmCross.ViewModels;
24

35
namespace QuickLayout.Core.ViewModels
46
{
57
public class FirstViewModel
6-
: MvxViewModel
8+
: MvxNavigationViewModel
79
{
8-
public void GoDetails() => ShowViewModel<DetailsViewModel>();
10+
public FirstViewModel(IMvxLogProvider logProvider, IMvxNavigationService navigationService)
11+
: base(logProvider, navigationService)
12+
{
13+
}
914

10-
public void GoForm() => ShowViewModel<FormViewModel>();
15+
public void GoDetails() => NavigationService.Navigate<DetailsViewModel>();
1116

12-
public void GoFormGrid() => ShowViewModel<FormGridViewModel>();
17+
public void GoForm() => NavigationService.Navigate<FormViewModel>();
1318

14-
public void GoSearch() => ShowViewModel<SearchViewModel>();
19+
public void GoFormGrid() => NavigationService.Navigate<FormGridViewModel>();
1520

16-
public void GoTip() => ShowViewModel<TipViewModel>();
21+
public void GoSearch() => NavigationService.Navigate<SearchViewModel>();
1722

18-
public void GoUpdateConstraints() => ShowViewModel<UpdateConstraintsViewModel>();
23+
public void GoTip() => NavigationService.Navigate<TipViewModel>();
1924

20-
public void GoAdvancedVerticalStack() => ShowViewModel<AdvancedVerticalStackViewModel>();
25+
public void GoUpdateConstraints() => NavigationService.Navigate<UpdateConstraintsViewModel>();
2126

22-
public void GoFullSize() => ShowViewModel<FullSizeViewModel>();
27+
public void GoAdvancedVerticalStack() => NavigationService.Navigate<AdvancedVerticalStackViewModel>();
28+
29+
public void GoFullSize() => NavigationService.Navigate<FullSizeViewModel>();
2330

24-
public void GoDirectionForm() => ShowViewModel<DirectionFormViewModel>();
31+
public void GoDirectionForm() => NavigationService.Navigate<DirectionFormViewModel>();
2532

26-
public void GoRightToLeft() => ShowViewModel<RightToLeftViewModel>();
33+
public void GoRightToLeft() => NavigationService.Navigate<RightToLeftViewModel>();
2734

28-
public void GoViewWithSafeArea() => ShowViewModel<ViewWithSafeAreaViewModel>();
35+
public void GoViewWithSafeArea() => NavigationService.Navigate<ViewWithSafeAreaViewModel>();
2936

30-
public void GoCenterConstraints() => ShowViewModel<ToCenterConstraintsViewModel>();
37+
public void GoCenterConstraints() => NavigationService.Navigate<ToCenterConstraintsViewModel>();
3138
}
3239
}

‎QuickLayout.Core/ViewModels/FullSizeViewModel.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-

2-
using MvvmCross.Core.ViewModels;
1+
using MvvmCross.ViewModels;
32

43
namespace QuickLayout.Core.ViewModels
54
{
6-
public class FullSizeViewModel
5+
public class FullSizeViewModel
76
: MvxViewModel
87
{
98
}

‎QuickLayout.Core/ViewModels/SearchViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using MvvmCross.Core.ViewModels;
1+
using MvvmCross.ViewModels;
22

33
namespace QuickLayout.Core.ViewModels
44
{

‎QuickLayout.Core/ViewModels/TipViewModel.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using MvvmCross.Core.ViewModels;
1+
using MvvmCross.ViewModels;
22
using QuickLayout.Core.Services;
33

44
namespace QuickLayout.Core.ViewModels
@@ -37,7 +37,8 @@ public int Generosity
3737
set
3838
{
3939
_generosity = Limit(value);
40-
MvvmCross.Platform.Core.MvxAsyncDispatcher.BeginAsync(() => RaisePropertyChanged(() => Generosity));
40+
InvokeOnMainThreadAsync(() => RaisePropertyChanged(() => Generosity));
41+
//MvxAsyncDispatcher.BeginAsync();
4142
Recalcuate();
4243
}
4344
}

‎QuickLayout.Core/ViewModels/ToCenterConstraintsViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using MvvmCross.Core.ViewModels;
1+
using MvvmCross.ViewModels;
22

33
namespace QuickLayout.Core.ViewModels
44
{

‎QuickLayout.Core/ViewModels/UpdateConstraintsViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using MvvmCross.Core.ViewModels;
1+
using MvvmCross.ViewModels;
22

33
namespace QuickLayout.Core.ViewModels
44
{
5-
public class UpdateConstraintsViewModel : MvxViewModel
5+
public class UpdateConstraintsViewModel : MvxViewModel
66
{
77
private bool _active = true;
88
public bool Active

0 commit comments

Comments
 (0)