[US641239][Firebase][InstanceID] Updated to version 3.1.1.0

* Updated the component version in Podfile, targets, nuspec, AssemblyInfo and Readme files
* Added Firebase.Core dependency
* Fixed poco.yaml classes
* This complete Tasks 642417 and 642406
This commit is contained in:
SotoiGhost 2018-07-03 14:19:31 -05:00
Родитель e00bb6b5f2
Коммит 0f7951a078
22 изменённых файлов: 72 добавлений и 60 удалений

Просмотреть файл

@ -16,7 +16,7 @@
<group targetFramework="Xamarin.iOS10">
<dependency id="Xamarin.Build.Download" version="0.4.11" />
<dependency id="Xamarin.Firebase.iOS.Analytics" version="5.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.1.1.0" />
<dependency id="Xamarin.Firebase.iOS.Core" version="5.0.5.0" />
</group>
</dependencies>

Просмотреть файл

@ -17,7 +17,7 @@
<dependency id="Xamarin.Build.Download" version="0.4.11" />
<dependency id="Xamarin.Google.iOS.MobileAds" version="7.30.0.0" />
<dependency id="Xamarin.Firebase.iOS.Analytics" version="5.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.1.1.0" />
<dependency id="Xamarin.Firebase.iOS.Core" version="5.0.5.0" />
</group>
</dependencies>

Просмотреть файл

@ -31,7 +31,7 @@ buildSpec = new BuildSpec () {
},
};
MyDependencies = new [] {"Firebase.InstanceID", "Firebase.Core"};
MyDependencies = new [] {"Firebase.InstanceID"};
Task ("clean").IsDependentOn ("clean-base").Does (() =>
{

Просмотреть файл

@ -15,7 +15,7 @@
<dependencies>
<group targetFramework="Xamarin.iOS10">
<dependency id="Xamarin.Build.Download" version="0.4.11" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.1.1.0" />
<dependency id="Xamarin.Firebase.iOS.Core" version="5.0.5.0" />
</group>
</dependencies>

Просмотреть файл

@ -15,7 +15,7 @@
<dependencies>
<group targetFramework="Xamarin.iOS10">
<dependency id="Xamarin.Build.Download" version="0.4.11" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.1.1.0" />
<dependency id="Xamarin.Firebase.iOS.Core" version="5.0.5.0" />
</group>
</dependencies>

Просмотреть файл

@ -16,7 +16,7 @@
<group targetFramework="Xamarin.iOS10">
<dependency id="Xamarin.Build.Download" version="0.4.11" />
<dependency id="Xamarin.Firebase.iOS.Analytics" version="5.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.1.1.0" />
<dependency id="Xamarin.Firebase.iOS.Core" version="5.0.5.0" />
</group>
</dependencies>

Просмотреть файл

@ -22,8 +22,11 @@ buildSpec = new BuildSpec () {
},
};
MyDependencies = new [] {"Firebase.Core"};
Task ("clean").IsDependentOn ("clean-base").Does (() =>
{
InvokeOtherGoogleModules (MyDependencies, "clean");
RunMake ("./externals/", "clean");
DeleteFiles ("../tmp-nugets/Xamarin.Firebase.iOS.InstanceID*");
});

4
Firebase.InstanceID/externals/Podfile поставляемый
Просмотреть файл

@ -4,7 +4,7 @@ If yes, please, update *.targets file located in binding
project, also, update Podfile file if needed.
In Firebase.InstanceID binding project, you can find the .targets file of:
* FirebaseInstanceID (3.0.0)
* FirebaseInstanceID (3.1.1)
=end
source 'https://github.com/CocoaPods/Specs.git'
@ -13,5 +13,5 @@ platform :ios, '8.0'
install! 'cocoapods', :integrate_targets => false
target 'FirebaseInstanceID' do
pod 'FirebaseInstanceID', '3.0.0'
pod 'FirebaseInstanceID', '3.1.1'
end

12
Firebase.InstanceID/externals/Podfile.lock поставляемый
Просмотреть файл

@ -1,20 +1,20 @@
PODS:
- FirebaseCore (5.0.0):
- FirebaseCore (5.0.5):
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
- FirebaseInstanceID (3.0.0):
- FirebaseInstanceID (3.1.1):
- FirebaseCore (~> 5.0)
- GoogleToolboxForMac/Defines (2.1.4)
- GoogleToolboxForMac/NSData+zlib (2.1.4):
- GoogleToolboxForMac/Defines (= 2.1.4)
DEPENDENCIES:
- FirebaseInstanceID (= 3.0.0)
- FirebaseInstanceID (= 3.1.1)
SPEC CHECKSUMS:
FirebaseCore: e46e4babb9de298fb2f736958edcc6da1dc60d73
FirebaseInstanceID: 83e0040351565df711a5db3d8ebe5ea21aca998a
FirebaseCore: 42b3267233bd21a5abd54117ccc38ca3dd0f8e83
FirebaseInstanceID: f3f0657372592ecdfdfe2cac604a5a75758376a6
GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f
PODFILE CHECKSUM: b79d583bc69cd31f0a4e4850a0c41ec50c28782f
PODFILE CHECKSUM: b03aea93947f79fd99ffb57b2babc2798727cdaf
COCOAPODS: 1.4.0

Просмотреть файл

@ -3,7 +3,7 @@
<metadata>
<id>Xamarin.Firebase.iOS.InstanceID</id>
<title>Firebase APIs Instance ID iOS Library</title>
<version>3.0.0.0</version>
<version>3.1.1.0</version>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@ -15,6 +15,7 @@
<dependencies>
<group targetFramework="Xamarin.iOS10">
<dependency id="Xamarin.Build.Download" version="0.4.11" />
<dependency id="Xamarin.Firebase.iOS.Core" version="5.0.5.0" />
</group>
</dependencies>
</metadata>

Просмотреть файл

@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase.InstanceID", "Firebase.InstanceID\Firebase.InstanceID.csproj", "{D6AA184C-DA45-4BBB-988A-451B20C7B804}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase.Core", "..\..\Firebase.Core\source\Firebase.Core\Firebase.Core.csproj", "{0AD1ED63-C008-41B3-8ADB-04696B4880E3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -13,5 +15,9 @@ Global
{D6AA184C-DA45-4BBB-988A-451B20C7B804}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6AA184C-DA45-4BBB-988A-451B20C7B804}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D6AA184C-DA45-4BBB-988A-451B20C7B804}.Release|Any CPU.Build.0 = Release|Any CPU
{0AD1ED63-C008-41B3-8ADB-04696B4880E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0AD1ED63-C008-41B3-8ADB-04696B4880E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0AD1ED63-C008-41B3-8ADB-04696B4880E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0AD1ED63-C008-41B3-8ADB-04696B4880E3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal

Просмотреть файл

@ -46,5 +46,11 @@
<ItemGroup>
<None Include="Firebase.InstanceID.targets" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Firebase.Core\source\Firebase.Core\Firebase.Core.csproj">
<Project>{0AD1ED63-C008-41B3-8ADB-04696B4880E3}</Project>
<Name>Firebase.Core</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.ObjCBinding.CSharp.targets" />
</Project>

Просмотреть файл

@ -2,18 +2,19 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_FirebaseInstanceIDAssemblyName>Firebase.InstanceID, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</_FirebaseInstanceIDAssemblyName>
<_FirebaseInstanceIDItemsFolder>FInstncID-3.0.0</_FirebaseInstanceIDItemsFolder>
<_FirebaseInstanceIDItemsFolder>FInstncID-3.1.1</_FirebaseInstanceIDItemsFolder>
<_FirebaseInstanceIDSDKBaseFolder>$(XamarinBuildDownloadDir)$(_FirebaseInstanceIDItemsFolder)\Frameworks\</_FirebaseInstanceIDSDKBaseFolder>
</PropertyGroup>
<ItemGroup Condition="('$(OutputType)'!='Library' OR '$(IsAppExtension)'=='True')">
<XamarinBuildDownload Include="$(_FirebaseInstanceIDItemsFolder)">
<Url>https://dl.google.com/dl/cpdc/271d7b3d6321da3c/FirebaseInstanceID-3.0.0.tar.gz</Url>
<Url>https://dl.google.com/dl/cpdc/60ebbeb9aed6cbc8/FirebaseInstanceID-3.1.1.tar.gz</Url>
<Kind>Tgz</Kind>
</XamarinBuildDownload>
<NativeReference Include="$(_FirebaseInstanceIDSDKBaseFolder)FirebaseInstanceID.framework">
<Kind>Framework</Kind>
<ForceLoad>True</ForceLoad>
<LinkerFlags>-ObjC</LinkerFlags>
<Frameworks>Security</Frameworks>
</NativeReference>
</ItemGroup>
</Project>

Просмотреть файл

@ -5,6 +5,7 @@ namespace Firebase.InstanceID
{
static Loader ()
{
Firebase.Core.Loader.ForceLoad ();
}
public static void ForceLoad () { }

Просмотреть файл

@ -26,7 +26,7 @@ using Foundation;
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
[assembly: AssemblyVersion ("1.0.0.0")]
[assembly: AssemblyFileVersion ("3.0.0.0")]
[assembly: AssemblyFileVersion ("3.1.1.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.

Просмотреть файл

@ -18,7 +18,7 @@
<dependency id="Xamarin.Google.iOS.SignIn" version="4.1.2.0" />
<dependency id="Xamarin.Firebase.iOS.DynamicLinks" version="3.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.Analytics" version="5.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.1.1.0" />
<dependency id="Xamarin.Firebase.iOS.Core" version="5.0.5.0" />
</group>
</dependencies>

Просмотреть файл

@ -16,7 +16,7 @@
<group targetFramework="Xamarin.iOS10">
<dependency id="Xamarin.Build.Download" version="0.4.11" />
<dependency id="Xamarin.Firebase.iOS.Analytics" version="5.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.1.1.0" />
<dependency id="Xamarin.Firebase.iOS.Core" version="5.0.5.0" />
</group>
</dependencies>

Просмотреть файл

@ -17,7 +17,7 @@
<dependency id="Xamarin.Build.Download" version="0.4.11" />
<dependency id="Xamarin.Firebase.iOS.ABTesting" version="2.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.Analytics" version="5.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.1.1.0" />
<dependency id="Xamarin.Firebase.iOS.Core" version="5.0.5.0" />
</group>
</dependencies>

Просмотреть файл

@ -17,7 +17,7 @@
<dependency id="Xamarin.Build.Download" version="0.4.11" />
<dependency id="Xamarin.Google.iOS.Core" version="3.1.0.1" />
<dependency id="Xamarin.Firebase.iOS.Analytics" version="5.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.1.1.0" />
<dependency id="Xamarin.Firebase.iOS.Core" version="5.0.5.0" />
</group>
</dependencies>

Просмотреть файл

@ -17,7 +17,7 @@
<dependency id="Xamarin.Build.Download" version="0.4.11" />
<dependency id="Xamarin.Google.iOS.Analytics" version="3.17.0.3" />
<dependency id="Xamarin.Firebase.iOS.Analytics" version="5.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.0.0.0" />
<dependency id="Xamarin.Firebase.iOS.InstanceID" version="3.1.1.0" />
<dependency id="Xamarin.Firebase.iOS.Core" version="5.0.5.0" />
</group>
</dependencies>

Просмотреть файл

@ -16,7 +16,7 @@ Xamarin creates and maintains Xamarin.iOS bindings for the Google APIs for iOS L
| [Xamarin.Firebase.iOS.Crashlytics][F.Crashlytics.Name] | [3.10.3.0][F.Crashlytics.Package] |
| [Xamarin.Firebase.iOS.Database][F.Database.Name] | [5.0.0.0][F.Database.Package] |
| [Xamarin.Firebase.iOS.DynamicLinks][F.DynamicLinks.Name] | [3.0.0.0][F.DynamicLinks.Package] |
| [Xamarin.Firebase.iOS.InstanceID][F.InstanceID.Name] | [3.0.0.0][F.InstanceID.Package] |
| [Xamarin.Firebase.iOS.InstanceID][F.InstanceID.Name] | [3.1.1.0][F.InstanceID.Package] |
| [Xamarin.Firebase.iOS.Invites][F.Invites.Name] | [3.0.0.0][F.Invites.Package] |
| [Xamarin.Firebase.iOS.PerformanceMonitoring][F.PerformanceMonitoring.Name] | [2.0.0.0][F.PerformanceMonitoring.Package] |
| [Xamarin.Firebase.iOS.RemoteConfig][F.RemoteConfig.Name] | [3.0.0.0][F.RemoteConfig.Package] |
@ -47,21 +47,21 @@ Here's a table that shows in which global version is located each component of F
| Component Name | Component Version | Global Version |
|---------------------------------|:-----------------:|:--------------:|
| Firebase A/B Testing | 2.0.0.0 | 5.0.0 |
| Firebase AdMob | 7.30.0.0 | 5.0.0 |
| Firebase Analytics | 5.0.0.0 | 5.0.0 |
| Firebase Auth | 5.0.0.0 | 5.0.0 |
| Firebase Cloud Firestore | 0.12.0.0 | 5.0.0 |
| Firebase Cloud Messaging | 3.0.0.0 | 5.0.0 |
| Firebase Core | 5.0.5.0 | 5.0.5 |
| Firebase Database | 5.0.0.0 | 5.0.0 |
| Firebase Dynamic Links | 3.0.0.0 | 5.0.0 |
| Firebase Instance ID | 3.0.0.0 | 5.0.0 |
| Firebase Invites | 3.0.0.0 | 5.0.0 |
| Firebase Performance Monitoring | 2.0.0.0 | 5.0.0 |
| Firebase RemoteConfig | 3.0.0.0 | 5.0.0 |
| Firebase Storage | 3.0.0.0 | 5.0.0 |
| Google Sign-In | 4.1.2.0 | 5.0.0 |
| Firebase A/B Testing | **2.0.0.0** | **5.0.0** |
| Firebase AdMob | **7.30.0.0** | **5.0.0** |
| Firebase Analytics | **5.0.0.0** | **5.0.0** |
| Firebase Auth | **5.0.0.0** | **5.0.0** |
| Firebase Cloud Firestore | **0.12.0.0** | **5.0.0** |
| Firebase Cloud Messaging | **3.0.0.0** | **5.0.0** |
| Firebase Core | **5.0.5.0** | **5.4.0** |
| Firebase Database | **5.0.0.0** | **5.0.0** |
| Firebase Dynamic Links | **3.0.0.0** | **5.0.0** |
| Firebase Instance ID | **3.1.1.0** | **5.4.0** |
| Firebase Invites | **3.0.0.0** | **5.0.0** |
| Firebase Performance Monitoring | **2.0.0.0** | **5.0.0** |
| Firebase RemoteConfig | **3.0.0.0** | **5.0.0** |
| Firebase Storage | **3.0.0.0** | **5.0.0** |
| Google Sign-In | **4.1.2.0** | **5.0.0** |
## Building

Просмотреть файл

@ -48,12 +48,9 @@ public abstract class Firebase
get { return "Xamarin.Firebase.iOS.Analytics"; }
}
public override string [] BaseOf {
get { return new [] { new Firebase.ABTesting ().Name, new Firebase.AdMob ().Name, new Firebase.Auth ().Name,
new Firebase.CloudFirestore ().Name, new Firebase.CloudMessaging ().Name, new Firebase.CrashReporting ().Name,
new Firebase.Database ().Name, new Firebase.DynamicLinks ().Name, new Firebase.Invites ().Name,
new Firebase.PerformanceMonitoring ().Name, new Firebase.RemoteConfig ().Name, new Firebase.Storage ().Name,
new Google.Core ().Name, new Google.InstanceID ().Name, new Google.PlayGames ().Name,
new Google.SignIn ().Name, new Google.TagManager ().Name };
get { return new [] { new Firebase.ABTesting ().Name, new Firebase.AdMob ().Name, new Firebase.CloudMessaging ().Name,
new Firebase.DynamicLinks ().Name, new Firebase.Invites ().Name, new Firebase.PerformanceMonitoring ().Name,
new Firebase.RemoteConfig ().Name, new Google.InstanceID ().Name, new Google.TagManager ().Name };
}
}
}
@ -97,12 +94,12 @@ public abstract class Firebase
get { return "Xamarin.Firebase.iOS.Core"; }
}
public override string [] BaseOf {
get { return new [] { new Firebase.ABTesting ().Name, new Firebase.AdMob ().Name, new Firebase.Analytics ().Name,
new Firebase.Auth ().Name, new Firebase.CloudFirestore ().Name, new Firebase.CloudMessaging ().Name,
new Firebase.CrashReporting ().Name, new Firebase.Database ().Name, new Firebase.DynamicLinks ().Name,
new Firebase.Invites ().Name, new Firebase.PerformanceMonitoring ().Name, new Firebase.RemoteConfig ().Name,
new Firebase.Storage ().Name, new Google.Core ().Name, new Google.InstanceID ().Name,
new Google.PlayGames ().Name, new Google.SignIn ().Name, new Google.TagManager ().Name };
get { return new [] { new Firebase.ABTesting ().Name, new Firebase.AdMob ().Name, new Firebase.Analytics ().Name,
new Firebase.Auth ().Name, new Firebase.CloudFirestore ().Name, new Firebase.CloudMessaging ().Name,
new Firebase.Database ().Name, new Firebase.DynamicLinks ().Name, new Firebase.InstanceID ().Name,
new Firebase.Invites ().Name, new Firebase.PerformanceMonitoring ().Name, new Firebase.RemoteConfig ().Name,
new Firebase.Storage ().Name, new Google.InstanceID ().Name, new Google.PlayGames ().Name,
new Google.SignIn ().Name, new Google.TagManager ().Name };
}
}
}
@ -159,12 +156,10 @@ public abstract class Firebase
get { return "Xamarin.Firebase.iOS.InstanceID"; }
}
public override string [] BaseOf {
get { return new [] { new Firebase.ABTesting ().Name, new Firebase.AdMob ().Name, new Firebase.Analytics ().Name,
new Firebase.Auth ().Name, new Firebase.CloudFirestore ().Name, new Firebase.CloudMessaging ().Name,
new Firebase.CrashReporting ().Name, new Firebase.Database ().Name, new Firebase.DynamicLinks ().Name,
new Firebase.Invites ().Name, new Firebase.PerformanceMonitoring ().Name, new Firebase.RemoteConfig ().Name,
new Firebase.Storage ().Name, new Google.Core ().Name, new Google.InstanceID ().Name,
new Google.PlayGames ().Name, new Google.SignIn ().Name, new Google.TagManager ().Name };
get { return new [] { new Firebase.ABTesting ().Name, new Firebase.AdMob ().Name, new Firebase.Analytics ().Name,
new Firebase.CloudMessaging ().Name, new Firebase.DynamicLinks ().Name, new Firebase.Invites ().Name,
new Firebase.PerformanceMonitoring ().Name, new Firebase.RemoteConfig ().Name, new Google.InstanceID ().Name,
new Google.TagManager ().Name };
}
}
}
@ -354,9 +349,8 @@ public abstract class Xamarin
new Firebase.DynamicLinks ().Name, new Firebase.InstanceID ().Name, new Firebase.Invites ().Name,
new Firebase.PerformanceMonitoring ().Name, new Firebase.RemoteConfig ().Name, new Firebase.Storage ().Name,
new Google.Analytics ().Name, new Google.AppIndexing ().Name, new Google.Cast ().Name,
new Google.Core ().Name, new Google.InstanceID ().Name, new Google.Maps ().Name,
new Google.MobileAds ().Name, new Google.PlayGames ().Name, new Google.SignIn ().Name,
new Google.TagManager ().Name };
new Google.InstanceID ().Name, new Google.Maps ().Name, new Google.MobileAds ().Name,
new Google.PlayGames ().Name, new Google.SignIn ().Name, new Google.TagManager ().Name };
}
}
}