* Update to 3.1.1

* Updating to 3.1.2
This commit is contained in:
Matthew Podwysocki 2020-11-11 17:43:01 -05:00 коммит произвёл GitHub
Родитель 5a6ead0dce
Коммит 3138ecac92
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
14 изменённых файлов: 106 добавлений и 114 удалений

6
NuGet.config Normal file
Просмотреть файл

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="BuildOutput" value="src/bindings/output" />
</packageSources>
</configuration>

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

@ -1,6 +1,6 @@
<!-- BEGIN MICROSOFT SECURITY.MD V0.0.5 BLOCK -->
## Security
# Security
Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
@ -18,13 +18,13 @@ You should receive a response within 24 hours. If for some reason you do not, pl
Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
* Full paths of source file(s) related to the manifestation of the issue
* The location of the affected source code (tag/branch/commit or direct URL)
* Any special configuration required to reproduce the issue
* Step-by-step instructions to reproduce the issue
* Proof-of-concept or exploit code (if possible)
* Impact of the issue, including how an attacker might exploit the issue
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
* Full paths of source file(s) related to the manifestation of the issue
* The location of the affected source code (tag/branch/commit or direct URL)
* Any special configuration required to reproduce the issue
* Step-by-step instructions to reproduce the issue
* Proof-of-concept or exploit code (if possible)
* Impact of the issue, including how an attacker might exploit the issue
This information will help us triage your report more quickly.

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

@ -54,9 +54,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Volley" Version="1.1.1.1" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1269" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1560" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="71.1610.4" />
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="117.2.1" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />

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

@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1269" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1560" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
</ItemGroup>
<ItemGroup>

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

@ -1,6 +1,8 @@
<?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">
<plist version="1.0">
<dict>
</dict>
<dict>
<key>aps-environment</key>
<string>development</string>
</dict>
</plist>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?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">
<plist version="1.0">
<dict>
@ -63,5 +63,9 @@
</array>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string>
<key>UIBackgroundModes</key>
<array>
<string>remote-notification</string>
</array>
</dict>
</plist>

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

@ -5,11 +5,6 @@ namespace NHubSampleXamariniOS
{
public class InstallationManagementDelegate : MSInstallationManagementDelegate
{
public override void WillDeleteInstallation(MSNotificationHub notificationHub, string installationId, NullableCompletionHandler completionHandler)
{
completionHandler(null);
}
public override void WillUpsertInstallation(MSNotificationHub notificationHub, MSInstallation installation, NullableCompletionHandler completionHandler)
{
// Save the installation to your own backend

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

@ -48,6 +48,7 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchLink>SdkOnly</MtouchLink>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@ -58,6 +59,7 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchLink>SdkOnly</MtouchLink>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@ -69,7 +71,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.Azure.NotificationHubs.iOS" Version="3.1.0" />
<PackageReference Include="Xamarin.Azure.NotificationHubs.iOS" Version="3.1.2" />
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">

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

@ -44,7 +44,7 @@
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) OR $(TargetFramework.StartsWith('Xamarin.TVOS')) OR $(TargetFramework.StartsWith('Xamarin.Mac')) ">
<!-- Add Xamarin iOS bindings -->
<PackageReference Include="Xamarin.Azure.NotificationHubs.iOS" Version="3.1.0" />
<PackageReference Include="Xamarin.Azure.NotificationHubs.iOS" Version="3.1.2" />
<!-- iOS files have ios.cs -->
<Compile Include="**\*.ios.cs" />
@ -52,10 +52,10 @@
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
<!-- Add Xamarin Android bindings -->
<PackageReference Include="Xamarin.Azure.NotificationHubs.Android" Version="1.1.1" />
<PackageReference Include="Xamarin.Azure.NotificationHubs.Android" Version="1.1.2" />
<PackageReference Include="Xamarin.Android.Volley" Version="1.1.1.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="71.1610.4" />
<PackageReference Include="Xamarin.Firebase.Messaging" Version="71.1740.4" />
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="117.2.1" />
<PackageReference Include="Xamarin.Firebase.Messaging" Version="120.1.7" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Compat" Version="28.0.0.3" />
@ -63,7 +63,7 @@
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Fragment" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Media.Compat" Version="28.0.0.3" />
<PackageReference Include="Xamarin.GooglePlayServices.Iid" Version="71.1600.4" />
<PackageReference Include="Xamarin.GooglePlayServices.Iid" Version="117.0.0" />
<!-- Android files have android.cs -->
<Compile Include="**\*.android.cs" />

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

@ -1,30 +1,15 @@
<metadata>
<!--
This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
<remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
<remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
-->
<attr path="api/package[@name='com.microsoft.windowsazure.messaging']" name="managedName">WindowsAzure.Messaging</attr>
<attr path="api/package[@name='com.microsoft.windowsazure.messaging.notificationhubs']" name="managedName">WindowsAzure.Messaging.NotificationHubs</attr>
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging.notificationhubs']/interface[@name='NotificationListener']/method[@name='onPushNotificationReceived' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='com.microsoft.windowsazure.messaging.notificationhubs.NotificationMessage']]/parameter[1]" name="managedName">context</attr>
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging.notificationhubs']/interface[@name='NotificationListener']/method[@name='onPushNotificationReceived' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='com.microsoft.windowsazure.messaging.notificationhubs.NotificationMessage']]/parameter[2]" name="managedName">message</attr>
<remove-node path="/api/package[@name='com.microsoft.windowsazure.messaging.notificationhubs.http']/class[not(starts-with(@name, 'ServiceCall') or @name = 'HttpResponse' or @name = 'HttpException' or @name = 'HttpClient')]" />
<!-- Auto Generated naming adjustments using class-parse -->
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='AdmNativeRegistration']/method[@name='appendCustomPayload' and count(parameter)=2 and parameter[1][@type='org.w3c.dom.Document'] and parameter[2][@type='org.w3c.dom.Element']]/parameter[1]" name="managedName">doc</attr>
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='AdmNativeRegistration']/method[@name='appendCustomPayload' and count(parameter)=2 and parameter[1][@type='org.w3c.dom.Document'] and parameter[2][@type='org.w3c.dom.Element']]/parameter[2]" name="managedName">registrationDescription</attr>
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='AdmNativeRegistration']/method[@name='loadCustomXmlData' and count(parameter)=1 and parameter[1][@type='org.w3c.dom.Element']]/parameter[1]" name="managedName">payloadNode</attr>
<!-- <attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='AdmTemplateRegistration']/method[@name='appendCustomPayload' and count(parameter)=2 and parameter[1][@type='org.w3c.dom.Document'] and parameter[2][@type='org.w3c.dom.Element']]/parameter[1]" name="managedName">doc</attr>-->
<!-- <attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='AdmTemplateRegistration']/method[@name='appendCustomPayload' and count(parameter)=2 and parameter[1][@type='org.w3c.dom.Document'] and parameter[2][@type='org.w3c.dom.Element']]/parameter[2]" name="managedName">templateRegistrationDescription</attr>-->
<!-- <attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='AdmTemplateRegistration']/method[@name='loadCustomXmlData' and count(parameter)=1 and parameter[1][@type='org.w3c.dom.Element']]/parameter[1]" name="managedName">payloadNode</attr>-->
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='BaiduNativeRegistration']/method[@name='appendCustomPayload' and count(parameter)=2 and parameter[1][@type='org.w3c.dom.Document'] and parameter[2][@type='org.w3c.dom.Element']]/parameter[1]" name="managedName">doc</attr>
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='BaiduNativeRegistration']/method[@name='appendCustomPayload' and count(parameter)=2 and parameter[1][@type='org.w3c.dom.Document'] and parameter[2][@type='org.w3c.dom.Element']]/parameter[2]" name="managedName">registrationDescription</attr>
<!-- <attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='BaiduNativeRegistration']/method[@name='loadCustomXmlData' and count(parameter)=1 and parameter[1][@type='org.w3c.dom.Element']]/parameter[1]" name="managedName">payloadNode</attr>-->
<!-- <attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='BaiduTemplateRegistration']/method[@name='appendCustomPayload' and count(parameter)=2 and parameter[1][@type='org.w3c.dom.Document'] and parameter[2][@type='org.w3c.dom.Element']]/parameter[1]" name="managedName">doc</attr>-->
<!-- <attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='BaiduTemplateRegistration']/method[@name='appendCustomPayload' and count(parameter)=2 and parameter[1][@type='org.w3c.dom.Document'] and parameter[2][@type='org.w3c.dom.Element']]/parameter[2]" name="managedName">templateRegistrationDescription</attr>-->
<!-- <attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='BaiduTemplateRegistration']/method[@name='loadCustomXmlData' and count(parameter)=1 and parameter[1][@type='org.w3c.dom.Element']]/parameter[1]" name="managedName">payloadNode</attr>-->
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='ConnectionString']/method[@name='createUsingSharedAccessKey' and count(parameter)=3 and parameter[1][@type='java.net.URI'] and parameter[2][@type='java.lang.String'] and parameter[3][@type='java.lang.String']]/parameter[1]" name="managedName">endPoint</attr>
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='ConnectionString']/method[@name='createUsingSharedAccessKey' and count(parameter)=3 and parameter[1][@type='java.net.URI'] and parameter[2][@type='java.lang.String'] and parameter[3][@type='java.lang.String']]/parameter[2]" name="managedName">keyName</attr>
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='ConnectionString']/method[@name='createUsingSharedAccessKey' and count(parameter)=3 and parameter[1][@type='java.net.URI'] and parameter[2][@type='java.lang.String'] and parameter[3][@type='java.lang.String']]/parameter[3]" name="managedName">accessSecret</attr>
@ -35,9 +20,6 @@
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='GcmNativeRegistration']/method[@name='appendCustomPayload' and count(parameter)=2 and parameter[1][@type='org.w3c.dom.Document'] and parameter[2][@type='org.w3c.dom.Element']]/parameter[1]" name="managedName">doc</attr>
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='GcmNativeRegistration']/method[@name='appendCustomPayload' and count(parameter)=2 and parameter[1][@type='org.w3c.dom.Document'] and parameter[2][@type='org.w3c.dom.Element']]/parameter[2]" name="managedName">registrationDescription</attr>
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='GcmNativeRegistration']/method[@name='loadCustomXmlData' and count(parameter)=1 and parameter[1][@type='org.w3c.dom.Element']]/parameter[1]" name="managedName">payloadNode</attr>
<!-- <attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='GcmTemplateRegistration']/method[@name='appendCustomPayload' and count(parameter)=2 and parameter[1][@type='org.w3c.dom.Document'] and parameter[2][@type='org.w3c.dom.Element']]/parameter[1]" name="managedName">doc</attr>-->
<!-- <attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='GcmTemplateRegistration']/method[@name='appendCustomPayload' and count(parameter)=2 and parameter[1][@type='org.w3c.dom.Document'] and parameter[2][@type='org.w3c.dom.Element']]/parameter[2]" name="managedName">templateRegistrationDescription</attr>-->
<!-- <attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='GcmTemplateRegistration']/method[@name='loadCustomXmlData' and count(parameter)=1 and parameter[1][@type='org.w3c.dom.Element']]/parameter[1]" name="managedName">payloadNode</attr>-->
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='NotificationHub']/method[@name='register' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='java.lang.String...']]/parameter[1]" name="managedName">pnsHandle</attr>
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='NotificationHub']/method[@name='register' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='java.lang.String...']]/parameter[2]" name="managedName">tags</attr>
<attr path="/api/package[@name='com.microsoft.windowsazure.messaging']/class[@name='NotificationHub']/method[@name='registerBaidu' and count(parameter)=3 and parameter[1][@type='java.lang.String'] and parameter[2][@type='java.lang.String'] and parameter[3][@type='java.lang.String...']]/parameter[1]" name="managedName">userId</attr>

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

@ -27,7 +27,7 @@
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=864958</PackageProjectUrl>
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=864960</PackageLicenseUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageVersion>1.1.1</PackageVersion>
<PackageVersion>1.1.2</PackageVersion>
</PropertyGroup>
<ItemGroup>
@ -42,8 +42,9 @@
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" PrivateAssets="None" />
<PackageReference Include="Xamarin.Firebase.Messaging" Version="71.1740.4" />
<PackageReference Include="Xamarin.Android.Volley" Version="1.1.1.1" />
<PackageReference Include="Xamarin.Google.Android.DataTransport.TransportBackendCct" Version="2.2.2" />
<PackageReference Include="Xamarin.Google.Android.DataTransport.TransportRuntime" Version="2.2.2" />
<PackageReference Include="Xamarin.Firebase.Messaging" Version="120.1.7" />
</ItemGroup>
</Project>

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

@ -1,11 +1,11 @@
var TARGET = Argument ("t", Argument ("target", "ci"));
var IOS_VERSION = "3.1.1";
var IOS_NUGET_VERSION = "3.1.1";
var IOS_VERSION = "3.1.2";
var IOS_NUGET_VERSION = "3.1.2";
var IOS_URL = $"https://github.com/Azure/azure-notificationhubs-ios/releases/download/{IOS_VERSION}/WindowsAzureMessaging-SDK-Apple-{IOS_VERSION}.zip";
var ANDROID_VERSION = "1.1.1";
var ANDROID_NUGET_VERSION = "1.1.1";
var ANDROID_VERSION = "1.1.2";
var ANDROID_NUGET_VERSION = "1.1.2";
var ANDROID_URL = string.Format ("https://dl.bintray.com/microsoftazuremobile/SDK/com/microsoft/azure/notification-hubs-android-sdk/{0}/notification-hubs-android-sdk-{0}.aar", ANDROID_VERSION);
Task("libs-ios")

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

@ -284,7 +284,7 @@ namespace WindowsAzure.Messaging.NotificationHubs
string Body { get; }
[Export("userInfo")]
NSDictionary<NSString, NSString> UserInfo { get; }
NSDictionary UserInfo { get; }
}
[Protocol]

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

@ -20,7 +20,7 @@
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=864962</PackageProjectUrl>
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=865062</PackageLicenseUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageVersion>3.1.1</PackageVersion>
<PackageVersion>3.1.2</PackageVersion>
</PropertyGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">