Skip to content
This repository was archived by the owner on Jul 2, 2022. It is now read-only.

Commit b2960c7

Browse files
thedillonbthedillonb
committed
Updated to MvvmCross 4.0.0
1 parent 170181a commit b2960c7

File tree

173 files changed

+512
-560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+512
-560
lines changed

‎CodeHub.Core/App.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
using Cirrious.MvvmCross.ViewModels;
21
using CodeHub.Core.ViewModels.App;
3-
using CodeFramework.Core.Services;
4-
using Cirrious.CrossCore;
2+
using CodeHub.Core.Services;
53
using System.Net;
64
using System.Net.Http;
75
using ModernHttpClient;
86
using System.Threading.Tasks;
97
using System;
108
using Foundation;
9+
using MvvmCross.Core.ViewModels;
1110

1211
namespace CodeHub.Core
1312
{
@@ -24,7 +23,7 @@ public override void Initialize()
2423
ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, sslPolicyErrors) => true;
2524

2625
//Ensure this is loaded
27-
Cirrious.MvvmCross.Plugins.Messenger.PluginLoader.Instance.EnsureLoaded();
26+
MvvmCross.Plugins.Messenger.PluginLoader.Instance.EnsureLoaded();
2827

2928
GitHubSharp.Client.ClientConstructor = () => new HttpClient(new HttpMessageHandler());
3029

‎CodeHub.Core/Bootstrap/MessengerPluginBootstrap.cs‎

100755100644
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using Cirrious.CrossCore.Plugins;
2-
3-
namespace CodeHub.Core.Bootstrap
4-
{
5-
public class MessengerPluginBootstrap
6-
: MvxPluginBootstrapAction<Cirrious.MvvmCross.Plugins.Messenger.PluginLoader>
7-
{
8-
}
1+
using MvvmCross.Platform.Plugins;
2+
3+
namespace CodeHub.Core.Bootstrap
4+
{
5+
public class MessengerPluginBootstrap
6+
: MvxPluginBootstrapAction<MvvmCross.Plugins.Messenger.PluginLoader>
7+
{
8+
}
99
}

‎CodeHub.Core/Cache/CacheEntry.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using SQLite;
22

3-
namespace CodeFramework.Core.Cache
3+
namespace CodeHub.Core.Cache
44
{
55
public class CacheEntry
66
{

‎CodeHub.Core/CodeHub.Core.iOS.csproj‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<Compile Include="Utils\ViewModelExtensions.cs" />
9696
<Compile Include="ViewModels\Source\ChangesetDiffViewModel.cs" />
9797
<Compile Include="ViewModels\App\StartupViewModel.cs" />
98-
<Compile Include="Bootstrap\MessengerPluginBootstrap.cs" />
9998
<Compile Include="ViewModels\Issues\BaseIssuesViewModel.cs" />
10099
<Compile Include="Filters\BaseIssuesFilterModel.cs" />
101100
<Compile Include="ViewModels\Issues\IssueLabelsViewModel.cs" />
@@ -181,6 +180,7 @@
181180
<Compile Include="Utils\GitHubAvatar.cs" />
182181
<Compile Include="Utils\GitHubExtensions.cs" />
183182
<Compile Include="Utils\WeakReferenceExtensions.cs" />
183+
<Compile Include="Bootstrap\MessengerPluginBootstrap.cs" />
184184
</ItemGroup>
185185
<ItemGroup />
186186
<ItemGroup>
@@ -192,35 +192,35 @@
192192
<Reference Include="ModernHttpClient">
193193
<HintPath>..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll</HintPath>
194194
</Reference>
195-
<Reference Include="Cirrious.CrossCore.Touch">
196-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.1\lib\Xamarin.iOS10\Cirrious.CrossCore.Touch.dll</HintPath>
195+
<Reference Include="Newtonsoft.Json">
196+
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
197197
</Reference>
198-
<Reference Include="Cirrious.MvvmCross.Binding.Touch">
199-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.1\lib\Xamarin.iOS10\Cirrious.MvvmCross.Binding.Touch.dll</HintPath>
198+
<Reference Include="GitHubSharp">
199+
<HintPath>..\packages\GitHubClient.1.0.9.0\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\GitHubSharp.dll</HintPath>
200200
</Reference>
201-
<Reference Include="Cirrious.CrossCore">
202-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.1\lib\Xamarin.iOS10\Cirrious.CrossCore.dll</HintPath>
201+
<Reference Include="MvvmCross.Platform.iOS">
202+
<HintPath>..\packages\MvvmCross.Platform.4.0.0\lib\Xamarin.iOS10\MvvmCross.Platform.iOS.dll</HintPath>
203203
</Reference>
204-
<Reference Include="Cirrious.MvvmCross.Binding">
205-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.1\lib\Xamarin.iOS10\Cirrious.MvvmCross.Binding.dll</HintPath>
204+
<Reference Include="MvvmCross.Platform">
205+
<HintPath>..\packages\MvvmCross.Platform.4.0.0\lib\Xamarin.iOS10\MvvmCross.Platform.dll</HintPath>
206206
</Reference>
207-
<Reference Include="Cirrious.MvvmCross.Localization">
208-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.1\lib\Xamarin.iOS10\Cirrious.MvvmCross.Localization.dll</HintPath>
207+
<Reference Include="MvvmCross.Plugins.Messenger">
208+
<HintPath>..\packages\MvvmCross.Plugin.Messenger.4.0.0\lib\Xamarin.iOS10\MvvmCross.Plugins.Messenger.dll</HintPath>
209209
</Reference>
210-
<Reference Include="Cirrious.MvvmCross.Plugins.Messenger">
211-
<HintPath>..\packages\MvvmCross.HotTuna.Plugin.Messenger.3.5.1\lib\Xamarin.iOS10\Cirrious.MvvmCross.Plugins.Messenger.dll</HintPath>
210+
<Reference Include="MvvmCross.iOS">
211+
<HintPath>..\packages\MvvmCross.Core.4.0.0\lib\Xamarin.iOS10\MvvmCross.iOS.dll</HintPath>
212212
</Reference>
213-
<Reference Include="Cirrious.MvvmCross.Touch">
214-
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.5.1\lib\Xamarin.iOS10\Cirrious.MvvmCross.Touch.dll</HintPath>
213+
<Reference Include="MvvmCross.Core">
214+
<HintPath>..\packages\MvvmCross.Core.4.0.0\lib\Xamarin.iOS10\MvvmCross.Core.dll</HintPath>
215215
</Reference>
216-
<Reference Include="Cirrious.MvvmCross">
217-
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.5.1\lib\Xamarin.iOS10\Cirrious.MvvmCross.dll</HintPath>
216+
<Reference Include="MvvmCross.Binding.iOS">
217+
<HintPath>..\packages\MvvmCross.Binding.4.0.0\lib\Xamarin.iOS10\MvvmCross.Binding.iOS.dll</HintPath>
218218
</Reference>
219-
<Reference Include="Newtonsoft.Json">
220-
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
219+
<Reference Include="MvvmCross.Binding">
220+
<HintPath>..\packages\MvvmCross.Binding.4.0.0\lib\Xamarin.iOS10\MvvmCross.Binding.dll</HintPath>
221221
</Reference>
222-
<Reference Include="GitHubSharp">
223-
<HintPath>..\packages\GitHubClient.1.0.9.0\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\GitHubSharp.dll</HintPath>
222+
<Reference Include="MvvmCross.Localization">
223+
<HintPath>..\packages\MvvmCross.Binding.4.0.0\lib\Xamarin.iOS10\MvvmCross.Localization.dll</HintPath>
224224
</Reference>
225225
</ItemGroup>
226226
<ItemGroup />

‎CodeHub.Core/Data/Account.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
using System;
22
using System.Globalization;
33
using System.IO;
4-
using Cirrious.CrossCore;
5-
using CodeFramework.Core.Services;
4+
using CodeHub.Core.Services;
65
using SQLite;
6+
using MvvmCross.Platform;
77

8-
namespace CodeFramework.Core.Data
8+
namespace CodeHub.Core.Data
99
{
1010
public abstract class Account : IAccount, IDisposable
1111
{

‎CodeHub.Core/Data/AccountCache.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
using System.Collections;
33
using System.Collections.Generic;
44
using System.Linq;
5-
using CodeFramework.Core.Cache;
5+
using CodeHub.Core.Cache;
66
using SQLite;
77

8-
namespace CodeFramework.Core.Data
8+
namespace CodeHub.Core.Data
99
{
1010
public class AccountCache : IEnumerable<CacheEntry>
1111
{

‎CodeHub.Core/Data/AccountFilters.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System.Collections;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using CodeFramework.Core.ViewModels;
4+
using CodeHub.Core.ViewModels;
55
using SQLite;
66

7-
namespace CodeFramework.Core.Data
7+
namespace CodeHub.Core.Data
88
{
99
public class AccountFilters : IEnumerable<Filter>
1010
{

‎CodeHub.Core/Data/AccountPinnedRepositories.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Linq;
44
using SQLite;
55

6-
namespace CodeFramework.Core.Data
6+
namespace CodeHub.Core.Data
77
{
88
public class AccountPinnedRepositories : IEnumerable<PinnedRepository>
99
{

‎CodeHub.Core/Data/Filter.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using SQLite;
2+
using MvvmCross.Platform;
23

3-
namespace CodeFramework.Core.Data
4+
namespace CodeHub.Core.Data
45
{
56
public class Filter
67
{
@@ -22,7 +23,7 @@ public class Filter
2223
{
2324
try
2425
{
25-
var serializer = Cirrious.CrossCore.Mvx.Resolve<CodeFramework.Core.Services.IJsonSerializationService>();
26+
var serializer = Mvx.Resolve<CodeHub.Core.Services.IJsonSerializationService>();
2627
return serializer.Deserialize<T>(RawData);
2728
}
2829
catch
@@ -37,7 +38,7 @@ public class Filter
3738
/// <param name="o">O.</param>
3839
public void SetData(object o)
3940
{
40-
var serializer = Cirrious.CrossCore.Mvx.Resolve<CodeFramework.Core.Services.IJsonSerializationService>();
41+
var serializer = Mvx.Resolve<CodeHub.Core.Services.IJsonSerializationService>();
4142
RawData = serializer.Serialize(o);
4243
}
4344
}

‎CodeHub.Core/Data/GitHubAccount.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using CodeFramework.Core.Data;
1+
using CodeHub.Core.Data;
22
using SQLite;
33

44
namespace CodeHub.Core.Data

0 commit comments

Comments
 (0)