diff --git a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractFirebaseAuthTest.cs b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractFirebaseAuthTest.cs index 3321641b..37b8d650 100644 --- a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractFirebaseAuthTest.cs +++ b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractFirebaseAuthTest.cs @@ -481,10 +481,10 @@ public async Task ListUsers() } var pagedEnumerable = this.Auth.ListUsersAsync(null); - var enumerator = pagedEnumerable.GetEnumerator(); + var enumerator = pagedEnumerable.GetAsyncEnumerator(); var listedUsers = new List(); - while (await enumerator.MoveNext()) + while (await enumerator.MoveNextAsync()) { var uid = enumerator.Current.Uid; if (users.Contains(uid) && !listedUsers.Contains(uid)) diff --git a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractOidcProviderConfigTest.cs b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractOidcProviderConfigTest.cs index 58408baf..f124bf92 100644 --- a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractOidcProviderConfigTest.cs +++ b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractOidcProviderConfigTest.cs @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System.Collections.Generic; using System.Threading.Tasks; using FirebaseAdmin.Auth; using FirebaseAdmin.Auth.Providers; @@ -69,8 +68,8 @@ public async Task ListProviderConfig() OidcProviderConfig config = null; var pagedEnumerable = this.auth.ListOidcProviderConfigsAsync(null); - var enumerator = pagedEnumerable.GetEnumerator(); - while (await enumerator.MoveNext()) + var enumerator = pagedEnumerable.GetAsyncEnumerator(); + while (await enumerator.MoveNextAsync()) { if (enumerator.Current.ProviderId == this.providerId) { diff --git a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractSamlProviderConfigTest.cs b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractSamlProviderConfigTest.cs index 71eaa128..e3d26ec6 100644 --- a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractSamlProviderConfigTest.cs +++ b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractSamlProviderConfigTest.cs @@ -75,8 +75,8 @@ public async Task ListProviderConfig() SamlProviderConfig config = null; var pagedEnumerable = this.auth.ListSamlProviderConfigsAsync(null); - var enumerator = pagedEnumerable.GetEnumerator(); - while (await enumerator.MoveNext()) + var enumerator = pagedEnumerable.GetAsyncEnumerator(); + while (await enumerator.MoveNextAsync()) { if (enumerator.Current.ProviderId == this.providerId) { diff --git a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/TenantManagerTest.cs b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/TenantManagerTest.cs index 27d16da4..632e3802 100644 --- a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/TenantManagerTest.cs +++ b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/TenantManagerTest.cs @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System.Collections.Generic; using System.Threading.Tasks; using FirebaseAdmin.Auth; using FirebaseAdmin.Auth.Multitenancy; @@ -63,8 +62,8 @@ public async Task ListTenants() var pagedEnumerable = FirebaseAuth.DefaultInstance.TenantManager .ListTenantsAsync(null); - var enumerator = pagedEnumerable.GetEnumerator(); - while (await enumerator.MoveNext()) + var enumerator = pagedEnumerable.GetAsyncEnumerator(); + while (await enumerator.MoveNextAsync()) { if (enumerator.Current.TenantId == this.fixture.TenantId) { diff --git a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseAdmin.IntegrationTests.csproj b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseAdmin.IntegrationTests.csproj index 2a296dd0..5c839131 100644 --- a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseAdmin.IntegrationTests.csproj +++ b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseAdmin.IntegrationTests.csproj @@ -1,7 +1,7 @@ - netcoreapp2.0 + netcoreapp2.1 latest false true @@ -9,10 +9,12 @@ - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all diff --git a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/IntegrationTestUtils.cs b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/IntegrationTestUtils.cs index bee0adc0..8b6af282 100644 --- a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/IntegrationTestUtils.cs +++ b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/IntegrationTestUtils.cs @@ -13,11 +13,7 @@ // limitations under the License. using System; -using System.Collections.Generic; -using System.IO; -using FirebaseAdmin; using Google.Apis.Auth.OAuth2; -using Google.Apis.Json; namespace FirebaseAdmin.IntegrationTests { diff --git a/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAdmin.Snippets.csproj b/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAdmin.Snippets.csproj index f58f8b3b..75cedf49 100644 --- a/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAdmin.Snippets.csproj +++ b/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAdmin.Snippets.csproj @@ -1,15 +1,15 @@ - netcoreapp2.0 + netcoreapp2.1 false true ../../stylecop_test.ruleset - - + + diff --git a/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAppSnippets.cs b/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAppSnippets.cs index 32ca9be5..64f88ac9 100644 --- a/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAppSnippets.cs +++ b/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAppSnippets.cs @@ -14,7 +14,6 @@ using System; // [START using_namespace_decl] -using FirebaseAdmin; using FirebaseAdmin.Auth; using Google.Apis.Auth.OAuth2; // [END using_namespace_decl] diff --git a/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAuthSnippets.cs b/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAuthSnippets.cs index 3018e969..b11974cd 100644 --- a/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAuthSnippets.cs +++ b/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAuthSnippets.cs @@ -498,8 +498,8 @@ internal static async Task ListAllUsersAsync() // [START list_all_users] // Start listing users from the beginning, 1000 at a time. var pagedEnumerable = FirebaseAuth.DefaultInstance.ListUsersAsync(null); - var responses = pagedEnumerable.AsRawResponses().GetEnumerator(); - while (await responses.MoveNext()) + var responses = pagedEnumerable.AsRawResponses().GetAsyncEnumerator(); + while (await responses.MoveNextAsync()) { ExportedUserRecords response = responses.Current; foreach (ExportedUserRecord user in response.Users) @@ -510,8 +510,8 @@ internal static async Task ListAllUsersAsync() // Iterate through all users. This will still retrieve users in batches, // buffering no more than 1000 users in memory at a time. - var enumerator = FirebaseAuth.DefaultInstance.ListUsersAsync(null).GetEnumerator(); - while (await enumerator.MoveNext()) + var enumerator = FirebaseAuth.DefaultInstance.ListUsersAsync(null).GetAsyncEnumerator(); + while (await enumerator.MoveNextAsync()) { ExportedUserRecord user = enumerator.Current; Console.WriteLine($"User: {user.Uid}"); @@ -756,9 +756,9 @@ internal static async Task ListSamlProviderConfigs() }; IAsyncEnumerator enumerator = FirebaseAuth.DefaultInstance .ListSamlProviderConfigsAsync(listOptions) - .GetEnumerator(); + .GetAsyncEnumerator(); - while (await enumerator.MoveNext()) + while (await enumerator.MoveNextAsync()) { SamlProviderConfig saml = enumerator.Current; Console.WriteLine(saml.ProviderId); @@ -826,9 +826,9 @@ internal static async Task ListOidcProviderConfigs() }; IAsyncEnumerator enumerator = FirebaseAuth.DefaultInstance .ListOidcProviderConfigsAsync(listOptions) - .GetEnumerator(); + .GetAsyncEnumerator(); - while (await enumerator.MoveNext()) + while (await enumerator.MoveNextAsync()) { OidcProviderConfig oidc = enumerator.Current; Console.WriteLine(oidc.ProviderId); diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs index 4727c85b..f8b03cbf 100644 --- a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs +++ b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs @@ -13,9 +13,6 @@ // limitations under the License. using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; using FirebaseAdmin.Auth.Jwt; using Google.Apis.Auth.OAuth2; using Xunit; diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Multitenancy/TenantManagerTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Multitenancy/TenantManagerTest.cs index 54be27de..adaace77 100644 --- a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Multitenancy/TenantManagerTest.cs +++ b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Multitenancy/TenantManagerTest.cs @@ -399,8 +399,8 @@ public async Task ListTenants() var tenants = new List(); var pagedEnumerable = auth.TenantManager.ListTenantsAsync(null); - var enumerator = pagedEnumerable.GetEnumerator(); - while (await enumerator.MoveNext()) + var enumerator = pagedEnumerable.GetAsyncEnumerator(); + while (await enumerator.MoveNextAsync()) { tenants.Add(enumerator.Current); } @@ -509,8 +509,8 @@ public async Task ListTenantsAsRawResponses() var tokens = new List(); var pagedEnumerable = auth.TenantManager.ListTenantsAsync(null); - var responses = pagedEnumerable.AsRawResponses().GetEnumerator(); - while (await responses.MoveNext()) + var responses = pagedEnumerable.AsRawResponses().GetAsyncEnumerator(); + while (await responses.MoveNextAsync()) { tenants.AddRange(responses.Current.Tenants); tokens.Add(responses.Current.NextPageToken); diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Providers/OidcProviderConfigTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Providers/OidcProviderConfigTest.cs index a00d8ea3..3286ce3e 100644 --- a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Providers/OidcProviderConfigTest.cs +++ b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Providers/OidcProviderConfigTest.cs @@ -431,8 +431,8 @@ public async Task ListConfigs(ProviderTestConfig config) var configs = new List(); var pagedEnumerable = auth.ListOidcProviderConfigsAsync(null); - var enumerator = pagedEnumerable.GetEnumerator(); - while (await enumerator.MoveNext()) + var enumerator = pagedEnumerable.GetAsyncEnumerator(); + while (await enumerator.MoveNextAsync()) { configs.Add(enumerator.Current); } @@ -528,8 +528,8 @@ public async Task ListOidcAsRawResponses(ProviderTestConfig config) var tokens = new List(); var pagedEnumerable = auth.ListOidcProviderConfigsAsync(null); - var responses = pagedEnumerable.AsRawResponses().GetEnumerator(); - while (await responses.MoveNext()) + var responses = pagedEnumerable.AsRawResponses().GetAsyncEnumerator(); + while (await responses.MoveNextAsync()) { configs.AddRange(responses.Current.ProviderConfigs); tokens.Add(responses.Current.NextPageToken); diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Providers/SamlProviderConfigTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Providers/SamlProviderConfigTest.cs index ceaa6c0f..7fb9331a 100644 --- a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Providers/SamlProviderConfigTest.cs +++ b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Providers/SamlProviderConfigTest.cs @@ -426,8 +426,8 @@ public async Task ListConfigs(ProviderTestConfig config) var configs = new List(); var pagedEnumerable = auth.ListSamlProviderConfigsAsync(null); - var enumerator = pagedEnumerable.GetEnumerator(); - while (await enumerator.MoveNext()) + var enumerator = pagedEnumerable.GetAsyncEnumerator(); + while (await enumerator.MoveNextAsync()) { configs.Add(enumerator.Current); } @@ -523,8 +523,8 @@ public async Task ListSamlAsRawResponses(ProviderTestConfig config) var tokens = new List(); var pagedEnumerable = auth.ListSamlProviderConfigsAsync(null); - var responses = pagedEnumerable.AsRawResponses().GetEnumerator(); - while (await responses.MoveNext()) + var responses = pagedEnumerable.AsRawResponses().GetAsyncEnumerator(); + while (await responses.MoveNextAsync()) { configs.AddRange(responses.Current.ProviderConfigs); tokens.Add(responses.Current.NextPageToken); diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Users/FirebaseUserManagerTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Users/FirebaseUserManagerTest.cs index 80fc8393..35584766 100644 --- a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Users/FirebaseUserManagerTest.cs +++ b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Users/FirebaseUserManagerTest.cs @@ -17,7 +17,6 @@ using System.Linq; using System.Net; using System.Net.Http; -using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; using FirebaseAdmin.Auth.Hash; @@ -443,8 +442,8 @@ public async Task ListUsers(TestConfig config) var users = new List(); var pagedEnumerable = auth.ListUsersAsync(null); - var enumerator = pagedEnumerable.GetEnumerator(); - while (await enumerator.MoveNext()) + var enumerator = pagedEnumerable.GetAsyncEnumerator(); + while (await enumerator.MoveNextAsync()) { users.Add(enumerator.Current); if (users.Count % 3 == 0) @@ -649,8 +648,8 @@ public async Task ListUsersAsRawResponses(TestConfig config) var tokens = new List(); var pagedEnumerable = auth.ListUsersAsync(null); - var responses = pagedEnumerable.AsRawResponses().GetEnumerator(); - while (await responses.MoveNext()) + var responses = pagedEnumerable.AsRawResponses().GetAsyncEnumerator(); + while (await responses.MoveNextAsync()) { users.AddRange(responses.Current.Users); tokens.Add(responses.Current.NextPageToken); @@ -750,7 +749,7 @@ public async Task ListUsersHttpError(TestConfig config) var pagedEnumerable = auth.ListUsersAsync(null); var exception = await Assert.ThrowsAsync( - async () => await pagedEnumerable.First()); + async () => await pagedEnumerable.FirstAsync()); Assert.Equal(ErrorCode.Internal, exception.ErrorCode); Assert.Null(exception.AuthErrorCode); @@ -775,16 +774,16 @@ public async Task ListUsersIntermittentHttpError(TestConfig config) var auth = config.CreateAuth(handler); var pagedEnumerable = auth.ListUsersAsync(null); - var enumerator = pagedEnumerable.GetEnumerator(); + var enumerator = pagedEnumerable.GetAsyncEnumerator(); for (int i = 0; i < 3; i++) { - Assert.True(await enumerator.MoveNext()); + Assert.True(await enumerator.MoveNextAsync()); } handler.StatusCode = HttpStatusCode.InternalServerError; handler.Response = "{}"; var exception = await Assert.ThrowsAsync( - async () => await enumerator.MoveNext()); + async () => await enumerator.MoveNextAsync()); Assert.Equal(ErrorCode.Internal, exception.ErrorCode); Assert.Null(exception.AuthErrorCode); @@ -812,7 +811,7 @@ public async Task ListUsersNonJsonResponse(TestConfig config) var pagedEnumerable = auth.ListUsersAsync(null); var exception = await Assert.ThrowsAsync( - async () => await pagedEnumerable.First()); + async () => await pagedEnumerable.FirstAsync()); Assert.Equal(ErrorCode.Unknown, exception.ErrorCode); Assert.Equal(AuthErrorCode.UnexpectedResponse, exception.AuthErrorCode); diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj b/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj index 29de5dae..974f2237 100644 --- a/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj +++ b/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 latest false ../../FirebaseAdmin.snk @@ -11,11 +11,18 @@ - - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Messaging/MessageTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Messaging/MessageTest.cs index 5d937697..51141c26 100644 --- a/FirebaseAdmin/FirebaseAdmin.Tests/Messaging/MessageTest.cs +++ b/FirebaseAdmin/FirebaseAdmin.Tests/Messaging/MessageTest.cs @@ -16,7 +16,6 @@ using System.Collections.Generic; using System.Linq; using Google.Apis.Json; -using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Xunit; diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Messaging/TopicManagementResponseTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Messaging/TopicManagementResponseTest.cs index 9853cfa6..34e5b0fb 100644 --- a/FirebaseAdmin/FirebaseAdmin.Tests/Messaging/TopicManagementResponseTest.cs +++ b/FirebaseAdmin/FirebaseAdmin.Tests/Messaging/TopicManagementResponseTest.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using FirebaseAdmin.Messaging; using Newtonsoft.Json; using Xunit; diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/IUserInfo.cs b/FirebaseAdmin/FirebaseAdmin/Auth/IUserInfo.cs index 6e0e21cc..36b10b90 100644 --- a/FirebaseAdmin/FirebaseAdmin/Auth/IUserInfo.cs +++ b/FirebaseAdmin/FirebaseAdmin/Auth/IUserInfo.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace FirebaseAdmin.Auth +namespace FirebaseAdmin.Auth { /// /// A collection of standard profile information for a user. Used to expose profile information diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/FirebaseTokenVerifier.cs b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/FirebaseTokenVerifier.cs index 5d09fb78..a37904f0 100644 --- a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/FirebaseTokenVerifier.cs +++ b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/FirebaseTokenVerifier.cs @@ -290,15 +290,8 @@ private async Task VerifySignatureAsync( var keys = await this.keySource.GetPublicKeysAsync(cancellationToken) .ConfigureAwait(false); var verified = keys.Any(key => -#if NETSTANDARD1_5 || NETSTANDARD2_0 || NET461 key.Id == keyId && key.RSA.VerifyHash( hash, signature, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1) -#elif NET45 - key.Id == keyId && - ((RSACryptoServiceProvider)key.RSA).VerifyHash(hash, Sha256Oid, signature) -#else -#error Unsupported target -#endif ); if (!verified) { diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/HttpPublicKeySource.cs b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/HttpPublicKeySource.cs index bc4d134a..b7786c94 100644 --- a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/HttpPublicKeySource.cs +++ b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/HttpPublicKeySource.cs @@ -23,14 +23,7 @@ using FirebaseAdmin.Util; using Google.Apis.Http; using Google.Apis.Util; - -#if NETSTANDARD1_5 || NETSTANDARD2_0 || NET461 using RSAKey = System.Security.Cryptography.RSA; -#elif NET45 -using RSAKey = System.Security.Cryptography.RSACryptoServiceProvider; -#else -#error Unsupported target -#endif namespace FirebaseAdmin.Auth.Jwt { @@ -132,13 +125,7 @@ private IReadOnlyList ParseKeys(DeserializedResponseInfo 1.17.1 - netstandard1.5;netstandard2.0;net45;net461 - netstandard1.5;netstandard2.0 + netstandard2.0;net461 + netstandard2.0 latest true ../../FirebaseAdmin.snk @@ -25,10 +25,9 @@ - - - - + + + all diff --git a/FirebaseAdmin/FirebaseAdmin/FirebaseApp.cs b/FirebaseAdmin/FirebaseAdmin/FirebaseApp.cs index 0a3544f2..3371a000 100644 --- a/FirebaseAdmin/FirebaseAdmin/FirebaseApp.cs +++ b/FirebaseAdmin/FirebaseAdmin/FirebaseApp.cs @@ -17,7 +17,6 @@ using System.Collections.Immutable; using System.Reflection; using System.Runtime.CompilerServices; -using System.Threading.Tasks; using Google; using Google.Apis.Auth.OAuth2; using Google.Apis.Logging; diff --git a/FirebaseAdmin/FirebaseAdmin/Messaging/ApnsConfig.cs b/FirebaseAdmin/FirebaseAdmin/Messaging/ApnsConfig.cs index 01c3b782..a21509e7 100644 --- a/FirebaseAdmin/FirebaseAdmin/Messaging/ApnsConfig.cs +++ b/FirebaseAdmin/FirebaseAdmin/Messaging/ApnsConfig.cs @@ -15,7 +15,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Google.Apis.Json; using Newtonsoft.Json; namespace FirebaseAdmin.Messaging diff --git a/FirebaseAdmin/FirebaseAdmin/Messaging/BatchResponse.cs b/FirebaseAdmin/FirebaseAdmin/Messaging/BatchResponse.cs index 2f764757..34532bfe 100644 --- a/FirebaseAdmin/FirebaseAdmin/Messaging/BatchResponse.cs +++ b/FirebaseAdmin/FirebaseAdmin/Messaging/BatchResponse.cs @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System; using System.Collections.Generic; using System.Linq; using Google.Apis.Util; diff --git a/FirebaseAdmin/FirebaseAdmin/Messaging/CriticalSound.cs b/FirebaseAdmin/FirebaseAdmin/Messaging/CriticalSound.cs index 11555fec..83dc6beb 100644 --- a/FirebaseAdmin/FirebaseAdmin/Messaging/CriticalSound.cs +++ b/FirebaseAdmin/FirebaseAdmin/Messaging/CriticalSound.cs @@ -13,7 +13,6 @@ // limitations under the License. using System; -using System.Collections.Generic; using Newtonsoft.Json; namespace FirebaseAdmin.Messaging diff --git a/FirebaseAdmin/FirebaseAdmin/Messaging/MulticastMessage.cs b/FirebaseAdmin/FirebaseAdmin/Messaging/MulticastMessage.cs index c40063e0..35a77dfe 100644 --- a/FirebaseAdmin/FirebaseAdmin/Messaging/MulticastMessage.cs +++ b/FirebaseAdmin/FirebaseAdmin/Messaging/MulticastMessage.cs @@ -14,7 +14,6 @@ using System; using System.Collections.Generic; -using System.Linq; namespace FirebaseAdmin.Messaging { diff --git a/FirebaseAdmin/FirebaseAdmin/Messaging/WebpushConfig.cs b/FirebaseAdmin/FirebaseAdmin/Messaging/WebpushConfig.cs index b76d53ae..51d88b19 100644 --- a/FirebaseAdmin/FirebaseAdmin/Messaging/WebpushConfig.cs +++ b/FirebaseAdmin/FirebaseAdmin/Messaging/WebpushConfig.cs @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System; using System.Collections.Generic; using Newtonsoft.Json; diff --git a/README.md b/README.md index c1325d12..598c3775 100644 --- a/README.md +++ b/README.md @@ -59,18 +59,12 @@ We also welcome bug reports, feature requests, and code review feedback. Admin .NET SDK supports the following frameworks: -* .NET Framework 4.5+ (4.6.1+ recommended) -* netstandard 1.5 and 2.0 (2.0 recommended), providing .NET Core support +* .NET Framework 4.6.1+ +* .NET Standard 2.0, providing .NET Core support This is consistent with the frameworks supported by other .NET libraries associated with Google Cloud Platform. -Support for .NET Framework 4.5 and netstandard 1.5 is now deprecated. -Next major version of the Admin SDK will terminate support for these -frameworks. Developers are advised to upgrade their runtime frameworks -accordingly. - - ## Documentation * [Setup Guide](https://firebase.google.com/docs/admin/setup/)