Skip to content
This repository has been archived by the owner on Aug 26, 2024. It is now read-only.

Commit

Permalink
- Bumps Android and iOS version numbers.
Browse files Browse the repository at this point in the history
- Changes the Xamarin.Google.Guava dependency version for projects using MonoAndroid <= v8.0.
- Using the PATCH Version number inside the make script.
  • Loading branch information
ricardocolombo committed Apr 13, 2021
1 parent 3efb839 commit 7a3eb4b
Show file tree
Hide file tree
Showing 12 changed files with 159 additions and 14,805 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("29.1.1")]
[assembly: AssemblyVersion("30.0.0")]
//[assembly: AssemblyFileVersion("24.1.0.0")]
//[assembly: AssemblyInformationalVersion("24.1.0-rc.1")]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("29.1.0")]
[assembly: AssemblyVersion("30.0.0")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
Expand Down
4 changes: 2 additions & 2 deletions Examples/AnylineExamples.Droid/AnylineExamples.Droid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
<AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_round.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Anyline.Xamarin.SDK.Droid" Version="29.1.1" />
<PackageReference Include="Anyline.Xamarin.SDK.Droid" Version="30.0.0" />
<PackageReference Include="Xamarin.Android.Support.Compat" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Core.UI" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
Expand Down Expand Up @@ -182,6 +182,6 @@
-->
<Target Name="BeforeBuild" Condition=" '$(RUNNING_ON_CICD)' == 'true' ">
<XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="&lt;Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' /&gt;" Query="manifest/@android:versionCode" Value="$(VERSION_CODE_ANDROID)" />
<XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="&lt;Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' /&gt;" Query="manifest/@android:versionName" Value="$(MAJOR_VERSION_ANDROID).$(MINOR_VERSION_ANDROID).$(BUILD_NUMBER_ANDROID)" />
<XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="&lt;Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' /&gt;" Query="manifest/@android:versionName" Value="$(MAJOR_VERSION_ANDROID).$(MINOR_VERSION_ANDROID).$(PATCH_VERSION_ANDROID)" />
</Target>
</Project>
9 changes: 5 additions & 4 deletions Examples/AnylineExamples.Droid/Properties/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="29.1.1" package="com.anyline.xamarin.examples" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.CAMERA" />
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:largeHeap="true"></application>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="30.0.0" package="com.anyline.xamarin.examples" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.CAMERA" />
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:largeHeap="true">
</application>
</manifest>
4 changes: 2 additions & 2 deletions Examples/AnylineExamples.iOS/AnylineExamples.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,13 @@
</ImageAsset>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Anyline.Xamarin.SDK.iOS" Version="29.1.0" />
<PackageReference Include="Anyline.Xamarin.SDK.iOS" Version="30.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
<Import Project="..\AnylineExamples.Shared\AnylineExamples.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Target Name="BeforeBuild" Condition=" '$(RUNNING_ON_CICD)' == 'true' ">
<XmlPoke XmlInputPath="Info.plist" Query="//dict/key[. = 'CFBundleVersion']/following-sibling::string[1]" Value="$(BUNDLE_VERSION_IOS)" />
<XmlPoke XmlInputPath="Info.plist" Query="//dict/key[. = 'CFBundleShortVersionString']/following-sibling::string[1]" Value="$(MAJOR_VERSION_IOS).$(MINOR_VERSION_IOS).$(BUILD_NUMBER_IOS)" />
<XmlPoke XmlInputPath="Info.plist" Query="//dict/key[. = 'CFBundleShortVersionString']/following-sibling::string[1]" Value="$(MAJOR_VERSION_IOS).$(MINOR_VERSION_IOS).$(PATCH_VERSION_IOS)" />
</Target>
</Project>
75 changes: 37 additions & 38 deletions Examples/AnylineExamples.iOS/Info.plist
Original file line number Diff line number Diff line change
@@ -1,39 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<plist version="1.0">
<dict>
<key>CFBundleDisplayName</key>
<string>Xamarin.iOS Examples</string>
<key>MinimumOSVersion</key>
<string>12.0</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
<integer>2</integer>
</array>
<key>CFBundleShortVersionString</key>
<string>29.1.0</string>
<key>UILaunchStoryboardName</key>
<string>MainStoryboard.storyboard</string>
<key>UIMainStoryboardFile</key>
<string>MainStoryboard</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>NSCameraUsageDescription</key>
<string>Yes we scan!</string>
<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
<array>
<string>A0000002471001</string>
</array>
<key>NFCReaderUsageDescription</key>
<string>Please allow NFC access to read passports</string>
<key>CFBundleName</key>
<string>Xamarin.iOS Examples</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>CFBundleIdentifier</key>
<string>com.anyline.xamarin.examples</string>
</dict>
</plist>
<dict>
<key>CFBundleDisplayName</key>
<string>Xamarin.iOS Examples</string>
<key>MinimumOSVersion</key>
<string>12.0</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
<integer>2</integer>
</array>
<key>CFBundleShortVersionString</key>
<string>30.0.0</string>
<key>UILaunchStoryboardName</key>
<string>MainStoryboard.storyboard</string>
<key>UIMainStoryboardFile</key>
<string>MainStoryboard</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>NSCameraUsageDescription</key>
<string>Yes we scan!</string>
<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
<array>
<string>A0000002471001</string>
</array>
<key>NFCReaderUsageDescription</key>
<string>Please allow NFC access to read passports</string>
<key>CFBundleName</key>
<string>Xamarin.iOS Examples</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>CFBundleIdentifier</key>
<string>com.anyline.xamarin.examples</string>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<Reference Include="System.Numerics.Vectors" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Anyline.Xamarin.SDK.Droid" Version="29.1.1" />
<PackageReference Include="Anyline.Xamarin.SDK.Droid" Version="30.0.0" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.495" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.Firebase.ML.Vision" Version="71.1700.4" />
Expand Down
Loading

0 comments on commit 7a3eb4b

Please sign in to comment.