diff --git a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractFirebaseAuthTest.cs b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractFirebaseAuthTest.cs
index 67516795..13b0a9b4 100644
--- a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractFirebaseAuthTest.cs
+++ b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/AbstractFirebaseAuthTest.cs
@@ -93,7 +93,8 @@ public async Task CreateCustomTokenWithoutServiceAccount()
Credential = GoogleCredential.FromAccessToken(token),
ServiceAccountId = serviceAcct.Id,
ProjectId = serviceAcct.ProjectId,
- }, "IAMSignApp");
+ },
+ "IAMSignApp");
try
{
diff --git a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseAdmin.IntegrationTests.csproj b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseAdmin.IntegrationTests.csproj
index 2ac51960..624fcabb 100644
--- a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseAdmin.IntegrationTests.csproj
+++ b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseAdmin.IntegrationTests.csproj
@@ -9,15 +9,16 @@
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
diff --git a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/IntegrationTestUtils.cs b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/IntegrationTestUtils.cs
index 8b6af282..af807ec1 100644
--- a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/IntegrationTestUtils.cs
+++ b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/IntegrationTestUtils.cs
@@ -30,7 +30,8 @@ internal static class IntegrationTestUtils
Credential = GoogleCredential.FromFile(ServiceAccountFile),
};
return FirebaseApp.Create(options);
- }, true);
+ },
+ true);
public static FirebaseApp EnsureDefaultApp()
{
diff --git a/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAdmin.Snippets.csproj b/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAdmin.Snippets.csproj
index 3564f4d1..92a02278 100644
--- a/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAdmin.Snippets.csproj
+++ b/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAdmin.Snippets.csproj
@@ -1,21 +1,26 @@
- net462;net6.0;
+ net462;net6.0
false
true
../../stylecop_test.ruleset
-
+
+
+
+
+
+
-
+
all
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs
index b68c84f9..3d780f9d 100644
--- a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs
+++ b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs
@@ -18,6 +18,7 @@
using Xunit;
[assembly: CollectionBehavior(DisableTestParallelization = true)]
+
namespace FirebaseAdmin.Auth.Tests
{
public class FirebaseAuthTest : IDisposable
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj b/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj
index 45566a4b..3bf40915 100644
--- a/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj
+++ b/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj
@@ -15,16 +15,16 @@
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 d57d2a4c..aca5ea8a 100644
--- a/FirebaseAdmin/FirebaseAdmin.Tests/Messaging/MessageTest.cs
+++ b/FirebaseAdmin/FirebaseAdmin.Tests/Messaging/MessageTest.cs
@@ -60,7 +60,8 @@ public void DataMessage()
{
{ "topic", "test-topic" },
{ "data", new JObject() { { "k1", "v1" }, { "k2", "v2" } } },
- }, message);
+ },
+ message);
}
[Fact]
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/FirebaseTokenFactory.cs b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/FirebaseTokenFactory.cs
index 8d7dcac0..a534be4a 100644
--- a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/FirebaseTokenFactory.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/FirebaseTokenFactory.cs
@@ -28,6 +28,7 @@
"3003684e85e61cf15f13150008c81f0b75a252673028e530ea95d0c581378da8c6846526ab9597" +
"4c6d0bc66d2462b51af69968a0e25114bde8811e0d6ee1dc22d4a59eee6a8bba4712cba839652f" +
"badddb9c")]
+
namespace FirebaseAdmin.Auth.Jwt
{
///
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/IAMSigner.cs b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/IAMSigner.cs
index 7c9394c7..559667da 100644
--- a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/IAMSigner.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/IAMSigner.cs
@@ -56,8 +56,7 @@ public IAMSigner(
RetryOptions = retryOptions,
});
this.keyId = new Lazy>(
- async () => await DiscoverServiceAccountIdAsync(clientFactory)
- .ConfigureAwait(false), true);
+ async () => await DiscoverServiceAccountIdAsync(clientFactory).ConfigureAwait(false), true);
}
public string Algorithm => JwtUtils.AlgorithmRS256;
@@ -98,7 +97,8 @@ public virtual async Task GetKeyIdAsync(
+ "with service account credentials or specify a service account "
+ "ID with iam.serviceAccounts.signBlob permission. Please refer to "
+ "https://firebase.google.com/docs/auth/admin/create-custom-tokens for "
- + "more details on creating custom tokens.", e);
+ + "more details on creating custom tokens.",
+ e);
}
}
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/Multitenancy/Tenant.cs b/FirebaseAdmin/FirebaseAdmin/Auth/Multitenancy/Tenant.cs
index 91880b50..3f2eff94 100644
--- a/FirebaseAdmin/FirebaseAdmin/Auth/Multitenancy/Tenant.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Auth/Multitenancy/Tenant.cs
@@ -53,17 +53,17 @@ internal Tenant(TenantArgs args)
///
/// Gets the tenant display name.
///
- public string DisplayName => args.DisplayName;
+ public string DisplayName => this.args.DisplayName;
///
/// Gets a value indicating whether the email sign-in provider is enabled.
///
- public bool PasswordSignUpAllowed => args.PasswordSignUpAllowed ?? false;
+ public bool PasswordSignUpAllowed => this.args.PasswordSignUpAllowed ?? false;
///
/// Gets a value indicating whether the email link sign-in is enabled.
///
- public bool EmailLinkSignInEnabled => args.EmailLinkSignInEnabled ?? false;
+ public bool EmailLinkSignInEnabled => this.args.EmailLinkSignInEnabled ?? false;
private string ExtractResourceId(string resourceName)
{
diff --git a/FirebaseAdmin/FirebaseAdmin/FirebaseAdmin.csproj b/FirebaseAdmin/FirebaseAdmin/FirebaseAdmin.csproj
index 1cbc8bee..d6aa6d65 100644
--- a/FirebaseAdmin/FirebaseAdmin/FirebaseAdmin.csproj
+++ b/FirebaseAdmin/FirebaseAdmin/FirebaseAdmin.csproj
@@ -24,11 +24,11 @@
-
-
-
-
-
+
+
+
+
+
all
diff --git a/FirebaseAdmin/FirebaseAdmin/FirebaseApp.cs b/FirebaseAdmin/FirebaseAdmin/FirebaseApp.cs
index 3371a000..4818b2dc 100644
--- a/FirebaseAdmin/FirebaseAdmin/FirebaseApp.cs
+++ b/FirebaseAdmin/FirebaseAdmin/FirebaseApp.cs
@@ -27,6 +27,7 @@
"3003684e85e61cf15f13150008c81f0b75a252673028e530ea95d0c581378da8c6846526ab9597" +
"4c6d0bc66d2462b51af69968a0e25114bde8811e0d6ee1dc22d4a59eee6a8bba4712cba839652f" +
"badddb9c")]
+
namespace FirebaseAdmin
{
internal delegate TResult ServiceFactory()
diff --git a/FirebaseAdmin/FirebaseAdmin/Messaging/InstanceIdServiceResponse.cs b/FirebaseAdmin/FirebaseAdmin/Messaging/InstanceIdServiceResponse.cs
index 4ed4bb52..37ffedba 100644
--- a/FirebaseAdmin/FirebaseAdmin/Messaging/InstanceIdServiceResponse.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Messaging/InstanceIdServiceResponse.cs
@@ -20,12 +20,12 @@ internal class InstanceIdServiceResponse
///
/// Gets the number of errors returned by the operation.
///
- public int ErrorCount => Results?.Count(results => results.HasError) ?? 0;
+ public int ErrorCount => this.Results?.Count(results => results.HasError) ?? 0;
///
/// Gets the number of results returned by the operation.
///
- public int ResultCount => Results?.Count() ?? 0;
+ public int ResultCount => this.Results?.Count() ?? 0;
///
/// An instance Id response error.
@@ -41,7 +41,7 @@ internal class InstanceIdServiceResponseElement
///
/// Gets a value indicating whether this response element in the response array is an error, as an empty element indicates success.
///
- public bool HasError => !string.IsNullOrEmpty(Error);
+ public bool HasError => !string.IsNullOrEmpty(this.Error);
}
}
}
diff --git a/README.md b/README.md
index 598c3775..157d5b97 100644
--- a/README.md
+++ b/README.md
@@ -59,8 +59,9 @@ We also welcome bug reports, feature requests, and code review feedback.
Admin .NET SDK supports the following frameworks:
-* .NET Framework 4.6.1+
+* .NET Framework 4.6.2+
* .NET Standard 2.0, providing .NET Core support
+* .NET 6.0+
This is consistent with the frameworks supported by other .NET libraries
associated with Google Cloud Platform.