Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ private async Task VerifySignatureAsync(
var keys = await this.keySource.GetPublicKeysAsync(cancellationToken)
.ConfigureAwait(false);
var verified = keys.Any(key =>
#if NETSTANDARD1_5 || NETSTANDARD2_0
#if NETSTANDARD1_5 || NETSTANDARD2_0 || NET461
key.Id == keyId && key.RSA.VerifyHash(
hash, signature, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1)
#elif NET45
Expand Down
4 changes: 2 additions & 2 deletions FirebaseAdmin/FirebaseAdmin/Auth/Jwt/HttpPublicKeySource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
using Google.Apis.Http;
using Google.Apis.Util;

#if NETSTANDARD1_5 || NETSTANDARD2_0
#if NETSTANDARD1_5 || NETSTANDARD2_0 || NET461
using RSAKey = System.Security.Cryptography.RSA;
#elif NET45
using RSAKey = System.Security.Cryptography.RSACryptoServiceProvider;
Expand Down Expand Up @@ -132,7 +132,7 @@ private IReadOnlyList<PublicKey> ParseKeys(DeserializedResponseInfo<Dictionary<s
{
var x509cert = new X509Certificate2(Encoding.UTF8.GetBytes(entry.Value));
RSAKey rsa;
#if NETSTANDARD1_5 || NETSTANDARD2_0
#if NETSTANDARD1_5 || NETSTANDARD2_0 || NET461
rsa = x509cert.GetRSAPublicKey();
#elif NET45
rsa = (RSAKey)x509cert.PublicKey.Key;
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAdmin/FirebaseAdmin/Auth/Jwt/PublicKey.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#if NETSTANDARD1_5 || NETSTANDARD2_0
#if NETSTANDARD1_5 || NETSTANDARD2_0 || NET461
using RSAKey = System.Security.Cryptography.RSA;
#elif NET45
using RSAKey = System.Security.Cryptography.RSACryptoServiceProvider;
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAdmin/FirebaseAdmin/FirebaseAdmin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Version>1.16.0</Version>
<TargetFrameworks>netstandard1.5;netstandard2.0;net45</TargetFrameworks>
<TargetFrameworks>netstandard1.5;netstandard2.0;net45;net461</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.5;netstandard2.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,18 @@ We also welcome bug reports, feature requests, and code review feedback.

Admin .NET SDK supports the following frameworks:

* .NET Framework 4.5+
* netstandard 1.5 and 2.0, providing .NET Core support
* .NET Framework 4.5+ (4.6.1+ recommended)
* netstandard 1.5 and 2.0 (2.0 recommended), 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/)
Expand Down