Skip to content

Commit

Permalink
Update to 3.6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesmontemagno committed Mar 8, 2019
1 parent e691479 commit 5c23eb4
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Droid/Properties/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?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.refractored.refreshsample">
<uses-sdk android:minSdkVersion="15" />
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="28" />
<application android:theme="@style/MyTheme" android:label="Pull to Refresh!"></application>
</manifest>
14 changes: 7 additions & 7 deletions Droid/RefreshSample.Droid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<AndroidApplication>True</AndroidApplication>
<AssemblyName>RefreshSample.Droid</AssemblyName>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
Expand Down Expand Up @@ -82,22 +82,22 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design">
<Version>25.4.0.2</Version>
<Version>28.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>25.4.0.2</Version>
<Version>28.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.CardView">
<Version>25.4.0.2</Version>
<Version>28.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter">
<Version>25.4.0.2</Version>
<Version>28.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Build.Download">
<Version>0.4.7</Version>
<Version>0.4.11</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>3.4.0.1009999</Version>
<Version>3.6.0.220655</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
Expand Down
14 changes: 7 additions & 7 deletions PullToRefresh/PullToRefresh.Droid/PullToRefresh.Droid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<AndroidResgenClass>Resource</AndroidResgenClass>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AssemblyName>Refractored.XamForms.PullToRefresh.Droid</AssemblyName>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
Expand Down Expand Up @@ -61,22 +61,22 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design">
<Version>25.4.0.2</Version>
<Version>28.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>25.4.0.2</Version>
<Version>28.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.CardView">
<Version>25.4.0.2</Version>
<Version>28.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter">
<Version>25.4.0.2</Version>
<Version>28.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Build.Download">
<Version>0.4.7</Version>
<Version>0.4.11</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>3.4.0.1009999</Version>
<Version>3.6.0.220655</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="3.4.0.1009999" />
<PackageReference Include="Xamarin.Forms" Version="3.6.0.220655" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion PullToRefresh/PullToRefresh.iOS/PullToRefresh.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>3.4.0.1009999</Version>
<Version>3.6.0.220655</Version>
</PackageReference>
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions PullToRefreshLayout.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<description>
Add Pull to Refresh to ScrollView or group a ListView. See Project for more details
Ensure you call PullToRefreshLayoutRenderer.Init() on each platform!
Built against: 3.4.0.1008975
Built against: 3.6.0.220655
</description>
<summary>Enhanced Pull To Refresh Layout for Xamarin.Forms</summary>
<tags>xamarin, pcl, xam.pcl, android, xamarin.forms, ios, pull to refresh, refresh, swipe</tags>
Expand All @@ -28,13 +28,13 @@
</group>
<group targetFramework="netstandard1.0">
<dependency id="NETStandard.Library" version="1.6.1" />
<dependency id="Xamarin.Forms" version="3.4.0.1008975" />
<dependency id="Xamarin.Forms" version="3.6.0.220655" />
</group>
<group targetFramework="MonoAndroid10">
<dependency id="Xamarin.Forms" version="3.4.0.1008975" />
<group targetFramework="MonoAndroid90">
<dependency id="Xamarin.Forms" version="3.6.0.220655" />
</group>
<group targetFramework="Xamarin.iOS10">
<dependency id="Xamarin.Forms" version="3.4.0.1008975" />
<dependency id="Xamarin.Forms" version="3.6.0.220655" />
</group>
<group targetFramework="Xamarin.Mac20">
</group>
Expand All @@ -56,7 +56,7 @@


<!--Xamarin.Android-->
<file src="PullToRefresh\PullToRefresh.Droid\bin\Release\Refractored.XamForms.PullToRefresh.*" target="lib\MonoAndroid10" />
<file src="PullToRefresh\PullToRefresh.Droid\bin\Release\Refractored.XamForms.PullToRefresh.*" target="lib\MonoAndroid90" />

<!--Xamarin.iOSUnified-->
<file src="PullToRefresh\PullToRefresh.iOS\bin\Release\Refractored.XamForms.PullToRefresh.*" target="lib\Xamarin.iOS10" />
Expand Down
2 changes: 1 addition & 1 deletion RefreshSample/RefreshSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="3.4.0.1009999" />
<PackageReference Include="Xamarin.Forms" Version="3.6.0.220655" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions RefreshSample/packages.config

This file was deleted.

4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 2.2.3.{build}-beta
version: 2.3.0.{build}-beta
image: Visual Studio 2017
configuration: Release
assembly_info:
Expand All @@ -11,7 +11,7 @@ install:
- echo y | "C:\Program Files (x86)\Android\android-sdk\tools\android.bat" update sdk -u -a -t tools
- echo y | "C:\Program Files (x86)\Android\android-sdk\tools\android.bat" update sdk -u -a -t platform-tools
- echo y | "C:\Program Files (x86)\Android\android-sdk\tools\android.bat" update sdk -u -a -t build-tools-25.0.6
- echo y | "C:\Program Files (x86)\Android\android-sdk\tools\android.bat" update sdk -u -a -t android-25
- echo y | "C:\Program Files (x86)\Android\android-sdk\tools\android.bat" update sdk -u -a -t android-28
- echo y | "C:\Program Files (x86)\Android\android-sdk\tools\android.bat" update sdk -u -a -t android-15
build_script:
- cmd: >-
Expand Down
2 changes: 1 addition & 1 deletion iOS/RefreshSample.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>3.4.0.1009999</Version>
<Version>3.6.0.220655</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
Expand Down

0 comments on commit 5c23eb4

Please sign in to comment.