Skip to content

Commit a9a6a80

Browse files
mythzmythz
committed
Upgrade clients to ServiceStack v5
1 parent 7aba118 commit a9a6a80

File tree

5 files changed

+51
-51
lines changed

5 files changed

+51
-51
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[Bb]in/
77
packages/
88
TestResults/
9+
.vs/
910

1011
# globs
1112
Makefile.in

‎AndroidXamarinChat.sln

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27130.2003
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidXamarinChat", "AndroidXamarinChat\AndroidXamarinChat.csproj", "{A5B4D483-38A5-4B91-B7B4-071EE552D718}"
77
EndProject
@@ -21,4 +21,7 @@ Global
2121
GlobalSection(SolutionProperties) = preSolution
2222
HideSolutionNode = FALSE
2323
EndGlobalSection
24+
GlobalSection(ExtensibilityGlobals) = postSolution
25+
SolutionGuid = {2F4FD3BC-801F-43BC-8342-5AA31AE526A0}
26+
EndGlobalSection
2427
EndGlobal

‎AndroidXamarinChat/AndroidXamarinChat.csproj

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
1616
<AssemblyName>AndroidXamarinChat</AssemblyName>
1717
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
18-
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
1919
<XamarinInsightsApiKey>915687c692385e0d101fdd66982ba723aa67baf3</XamarinInsightsApiKey>
2020
<NuGetPackageImportStamp>
2121
</NuGetPackageImportStamp>
@@ -53,58 +53,51 @@
5353
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
5454
</PropertyGroup>
5555
<ItemGroup>
56+
<Reference Include="Microsoft.CSharp" />
57+
<Reference Include="Microsoft.Extensions.Primitives, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
58+
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
59+
</Reference>
5660
<Reference Include="Mono.Android.Export" />
5761
<Reference Include="Refractored.PagerSlidingTabStrip, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
5862
<HintPath>..\packages\Refractored.PagerSlidingTabStrip.1.1.6\lib\MonoAndroid10\Refractored.PagerSlidingTabStrip.dll</HintPath>
5963
<Private>True</Private>
6064
</Reference>
61-
<Reference Include="ServiceStack.Client, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
62-
<HintPath>..\packages\ServiceStack.Client.4.5.6\lib\MonoAndroid\ServiceStack.Client.dll</HintPath>
63-
<Private>True</Private>
65+
<Reference Include="ServiceStack.Client, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
66+
<HintPath>..\packages\ServiceStack.Client.5.0.0\lib\netstandard2.0\ServiceStack.Client.dll</HintPath>
6467
</Reference>
65-
<Reference Include="ServiceStack.HttpClient, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
66-
<HintPath>..\packages\ServiceStack.HttpClient.4.5.6\lib\portable-net45+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.HttpClient.dll</HintPath>
67-
<Private>True</Private>
68+
<Reference Include="ServiceStack.HttpClient, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
69+
<HintPath>..\packages\ServiceStack.HttpClient.5.0.0\lib\netstandard2.0\ServiceStack.HttpClient.dll</HintPath>
6870
</Reference>
69-
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
70-
<HintPath>..\packages\ServiceStack.Interfaces.4.5.6\lib\portable-wp80+sl5+net45+win8+wpa81+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
71-
<Private>True</Private>
71+
<Reference Include="ServiceStack.Interfaces, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
72+
<HintPath>..\packages\ServiceStack.Interfaces.5.0.0\lib\netstandard2.0\ServiceStack.Interfaces.dll</HintPath>
7273
</Reference>
73-
<Reference Include="ServiceStack.Pcl.Android, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
74-
<HintPath>..\packages\ServiceStack.Client.4.5.6\lib\MonoAndroid\ServiceStack.Pcl.Android.dll</HintPath>
75-
<Private>True</Private>
76-
</Reference>
77-
<Reference Include="ServiceStack.Text, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
78-
<HintPath>..\packages\ServiceStack.Text.4.5.6\lib\portable-net45+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Text.dll</HintPath>
79-
<Private>True</Private>
74+
<Reference Include="ServiceStack.Text, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
75+
<HintPath>..\packages\ServiceStack.Text.5.0.0\lib\netstandard2.0\ServiceStack.Text.dll</HintPath>
8076
</Reference>
8177
<Reference Include="System" />
8278
<Reference Include="System.Core" />
8379
<Reference Include="Mono.Android" />
80+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
81+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
82+
</Reference>
8483
<Reference Include="System.Xml" />
8584
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
8685
<HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.4.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
87-
<Private>True</Private>
8886
</Reference>
8987
<Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
9088
<HintPath>..\packages\Xamarin.Android.Support.Design.23.4.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath>
91-
<Private>True</Private>
9289
</Reference>
9390
<Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
9491
<HintPath>..\packages\Xamarin.Android.Support.v4.23.4.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
95-
<Private>True</Private>
9692
</Reference>
9793
<Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
9894
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.4.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
99-
<Private>True</Private>
10095
</Reference>
10196
<Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
10297
<HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.4.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
103-
<Private>True</Private>
10498
</Reference>
10599
<Reference Include="Xamarin.Android.Support.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
106100
<HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.23.4.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
107-
<Private>True</Private>
108101
</Reference>
109102
<Reference Include="Xamarin.Auth.Android">
110103
<HintPath>..\Components\xamarin.auth-1.2.3.1\lib\android\Xamarin.Auth.Android.dll</HintPath>

‎AndroidXamarinChat/Resources/Resource.designer.cs

Lines changed: 8 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AndroidXamarinChat/packages.config

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="monoandroid51" />
4+
<package id="Microsoft.CSharp" version="4.4.1" targetFramework="monoandroid71" />
5+
<package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="monoandroid71" />
46
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="monoandroid51" />
57
<package id="Refractored.PagerSlidingTabStrip" version="1.1.6" targetFramework="monoandroid60" />
6-
<package id="ServiceStack.Client" version="4.5.6" targetFramework="monoandroid60" />
7-
<package id="ServiceStack.HttpClient" version="4.5.6" targetFramework="monoandroid60" />
8-
<package id="ServiceStack.Interfaces" version="4.5.6" targetFramework="monoandroid60" />
9-
<package id="ServiceStack.Text" version="4.5.6" targetFramework="monoandroid60" />
10-
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.4.0" targetFramework="monoandroid60" />
11-
<package id="Xamarin.Android.Support.Design" version="23.4.0" targetFramework="monoandroid60" />
12-
<package id="Xamarin.Android.Support.v4" version="23.4.0" targetFramework="monoandroid60" />
13-
<package id="Xamarin.Android.Support.v7.AppCompat" version="23.4.0" targetFramework="monoandroid60" />
14-
<package id="Xamarin.Android.Support.v7.RecyclerView" version="23.4.0" targetFramework="monoandroid60" />
15-
<package id="Xamarin.Android.Support.Vector.Drawable" version="23.4.0" targetFramework="monoandroid60" />
8+
<package id="ServiceStack.Client" version="5.0.0" targetFramework="monoandroid71" />
9+
<package id="ServiceStack.HttpClient" version="5.0.0" targetFramework="monoandroid71" />
10+
<package id="ServiceStack.Interfaces" version="5.0.0" targetFramework="monoandroid71" />
11+
<package id="ServiceStack.Text" version="5.0.0" targetFramework="monoandroid71" />
12+
<package id="System.Collections.Specialized" version="4.3.0" targetFramework="monoandroid71" />
13+
<package id="System.Net.Requests" version="4.3.0" targetFramework="monoandroid71" />
14+
<package id="System.Reflection.Emit" version="4.3.0" targetFramework="monoandroid71" />
15+
<package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="monoandroid71" />
16+
<package id="System.Runtime" version="4.3.0" targetFramework="monoandroid71" />
17+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="monoandroid71" />
18+
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="monoandroid71" />
19+
<package id="System.ServiceModel.Primitives" version="4.4.0" targetFramework="monoandroid71" />
20+
<package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="monoandroid71" />
21+
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.4.0" targetFramework="monoandroid71" />
22+
<package id="Xamarin.Android.Support.Design" version="23.4.0" targetFramework="monoandroid71" />
23+
<package id="Xamarin.Android.Support.v4" version="23.4.0" targetFramework="monoandroid71" />
24+
<package id="Xamarin.Android.Support.v7.AppCompat" version="23.4.0" targetFramework="monoandroid71" />
25+
<package id="Xamarin.Android.Support.v7.RecyclerView" version="23.4.0" targetFramework="monoandroid71" />
26+
<package id="Xamarin.Android.Support.Vector.Drawable" version="23.4.0" targetFramework="monoandroid71" />
1627
<package id="Xamarin.Insights" version="1.12.3" targetFramework="monoandroid60" />
1728
</packages>

0 commit comments

Comments
 (0)