forked from dotnet/android-samples
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump Support and GPS packages to 22/26
Conflicts: Supportv7/AppCompat/Toolbar/Supportv7Toolbar/Supportv7Toolbar.csproj Supportv7/AppCompat/Toolbar/Supportv7Toolbar/packages.config Supportv7/Pallete/Supportv7Pallete/Supportv7Pallete.csproj Supportv7/Pallete/Supportv7Pallete/packages.config
- Loading branch information
Showing
192 changed files
with
750 additions
and
1,040 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Xamarin.Android.Support.v13" version="20.0.0.4" targetFramework="MonoAndroid403" /> | ||
<package id="Xamarin.Android.Support.v4" version="20.0.0.4" targetFramework="MonoAndroid403" /> | ||
<package id="Xamarin.Android.Support.v4" version="23.0.1.0-rc2" targetFramework="MonoAndroid403" /> | ||
</packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Xamarin.Android.Support.v13" version="20.0.0.4" targetFramework="MonoAndroid403" /> | ||
<package id="Xamarin.Android.Support.v4" version="20.0.0.4" targetFramework="MonoAndroid403" /> | ||
<package id="Xamarin.Android.Support.v4" version="23.0.1.0-rc2" targetFramework="MonoAndroid403" /> | ||
</packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Xamarin.Android.Support.v13" version="20.0.0.4" targetFramework="MonoAndroid403" /> | ||
<package id="Xamarin.Android.Support.v4" version="20.0.0.4" targetFramework="MonoAndroid403" /> | ||
<package id="Xamarin.Android.Support.v4" version="23.0.1.0-rc2" targetFramework="MonoAndroid403" /> | ||
</packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Xamarin.Android.Support.v4" version="20.0.0.4" targetFramework="MonoAndroid23" /> | ||
<package id="Xamarin.Android.Support.v4" version="23.0.1.0-rc2" targetFramework="MonoAndroid50" /> | ||
</packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Xamarin.Android.Support.v4" version="20.0.0.4" targetFramework="MonoAndroid23" /> | ||
<package id="Xamarin.Android.Support.v4" version="23.0.1.0-rc2" targetFramework="MonoAndroid50" /> | ||
</packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
FilePickerExample/Properties/AndroidManifest.xml
100755 → 100644
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" package="com.xamarin.recipe.filepicker" android:versionCode="1" android:versionName="1"> | ||
<uses-sdk android:targetSdkVersion="16" /> | ||
<application> | ||
</application> | ||
<uses-sdk android:targetSdkVersion="21" android:minSdkVersion="10" /> | ||
<application> | ||
</application> | ||
</manifest> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Xamarin.Android.Support.v4" version="20.0.0.4" targetFramework="MonoAndroid23" /> | ||
<package id="Xamarin.Android.Support.v4" version="23.0.1.0-rc2" targetFramework="MonoAndroid50" /> | ||
</packages> |
5 changes: 3 additions & 2 deletions
5
FragmentsWalkthrough/SupportLibFragments/Properties/AndroidManifest.xml
100755 → 100644
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"> | ||
<application android:icon="@drawable/icon"></application> | ||
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="18" /> | ||
<application android:icon="@drawable/icon"> | ||
</application> | ||
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="21" /> | ||
</manifest> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Xamarin.Android.Support.v4" version="20.0.0.4" targetFramework="MonoAndroid23" /> | ||
<package id="Xamarin.Android.Support.v4" version="23.0.1.0-rc2" targetFramework="MonoAndroid50" /> | ||
</packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Xamarin.Android.Support.v4" version="22.2.0.0" targetFramework="MonoAndroid50" /> | ||
<package id="Xamarin.GooglePlayServices.Base" version="25.0.0.0" targetFramework="MonoAndroid50" /> | ||
<package id="Xamarin.GooglePlayServices.Location" version="25.0.0.0" targetFramework="MonoAndroid50" /> | ||
<package id="Xamarin.GooglePlayServices.Maps" version="25.0.0.0" targetFramework="MonoAndroid50" /> | ||
<package id="Xamarin.Android.Support.v4" version="23.0.0.0-rc2" targetFramework="MonoAndroid50" /> | ||
<package id="Xamarin.GooglePlayServices.Base" version="26.0.0.0-rc3" targetFramework="MonoAndroid50" /> | ||
<package id="Xamarin.GooglePlayServices.Location" version="26.0.0.0-rc3" targetFramework="MonoAndroid50" /> | ||
<package id="Xamarin.GooglePlayServices.Maps" version="26.0.0.0-rc3" targetFramework="MonoAndroid50" /> | ||
</packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Xamarin.Android.Support.v4" version="22.2.0.0" targetFramework="MonoAndroid50" /> | ||
<package id="Xamarin.GooglePlayServices.Base" version="25.0.0.0" targetFramework="MonoAndroid50" /> | ||
<package id="Xamarin.GooglePlayServices.Maps" version="25.0.0.0" targetFramework="MonoAndroid50" /> | ||
<package id="Xamarin.Android.Support.v4" version="23.0.0.0-rc2" targetFramework="MonoAndroid50" /> | ||
<package id="Xamarin.GooglePlayServices.Base" version="26.0.0.0-rc3" targetFramework="MonoAndroid50" /> | ||
<package id="Xamarin.GooglePlayServices.Maps" version="26.0.0.0-rc3" targetFramework="MonoAndroid50" /> | ||
</packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.