Skip to content

Commit

Permalink
Added net462 target
Browse files Browse the repository at this point in the history
  • Loading branch information
@brentschmaltz
Brent Schmaltz authored and brentschmaltz committed Apr 5, 2023
1 parent a153e57 commit 614642a
Show file tree
Hide file tree
Showing 40 changed files with 80 additions and 74 deletions.
2 changes: 1 addition & 1 deletion build/targets.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<SrcTargets>net45;net461;net472;netstandard2.0;net6.0</SrcTargets>
<SrcTargets>net45;net461;net462;net472;netstandard2.0;net6.0</SrcTargets>
<SrcStandardTargets>netstandard2.0</SrcStandardTargets>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion build/targetsTest.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TestTargets>net452;net461;net472;netcoreapp2.1;net6.0</TestTargets>
<TestTargets>net452;net461;net462;net472;netcoreapp2.1;net6.0</TestTargets>
<TestOnlyCoreTargets>netcoreapp2.1</TestOnlyCoreTargets>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
<ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net6.0'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net6.0'">
<PackageReference Include="System.Text.Encoding" Version="$(SystemTextEncoding)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWeb)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJson)" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.IdentityModel.Logging/IdentityModelTelemetryUtil.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ public static class IdentityModelTelemetryUtil
"ID_NET45";
#elif NET461
"ID_NET461";
#elif NET462
"ID_NET462";
#elif NET472
"ID_NET472";
#elif NETSTANDARD2_0
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...ntityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
<ProjectReference Include="..\System.IdentityModel.Tokens.Jwt\System.IdentityModel.Tokens.Jwt.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'netstandard2.0'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Text.Encoding" Version="$(SystemTextEncoding)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWeb)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJson)" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...el.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
<ProjectReference Include="..\..\src\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net6.0'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net6.0'">
<PackageReference Include="System.Text.Encoding" Version="$(SystemTextEncoding)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWeb)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJson)" />
Expand Down
2 changes: 1 addition & 1 deletion ...dentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PackageReference Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentVersion)" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition="'$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.IdentityModel.TestExtensions/Microsoft.IdentityModel.TestExtensions.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ProjectReference Include="..\System.IdentityModel.Tokens.Jwt\System.IdentityModel.Tokens.Jwt.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.IdentityModel.Tokens/AsymmetricAdapter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using System.Reflection;
#endif

#if NET461 || NET472 || NETSTANDARD2_0 || NET6_0
#if NET461 || NET462 || NET472 || NETSTANDARD2_0 || NET6_0
using System.Security.Cryptography.X509Certificates;
#endif

Expand Down Expand Up @@ -215,7 +215,7 @@ private void InitializeUsingRsa(RSA rsa, string algorithm)
}
#endif

#if NET461 || NET472 || NETSTANDARD2_0 || NET6_0
#if NET461 || NET462 || NET472 || NETSTANDARD2_0 || NET6_0
if (algorithm.Equals(SecurityAlgorithms.RsaSsaPssSha256) ||
algorithm.Equals(SecurityAlgorithms.RsaSsaPssSha256Signature) ||
algorithm.Equals(SecurityAlgorithms.RsaSsaPssSha384) ||
Expand Down Expand Up @@ -321,7 +321,7 @@ private bool VerifyWithECDsaWithLength(byte[] bytes, int start, int length, byte
}

#region NET61+ related code
#if NET461 || NET472 || NETSTANDARD2_0 || NET6_0
#if NET461 || NET462 || NET472 || NETSTANDARD2_0 || NET6_0

// HasAlgorithmName was introduced into Net46
internal AsymmetricAdapter(SecurityKey key, string algorithm, HashAlgorithm hashAlgorithm, HashAlgorithmName hashAlgorithmName, bool requirePrivateKey)
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.IdentityModel.Tokens/AsymmetricSignatureProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ private static PrivateKeyStatus FoundPrivateKey(SecurityKey key)
return PrivateKeyStatus.Unknown;
}

#if NET461 || NET472 || NETSTANDARD2_0 || NET6_0
#if NET461 || NET462 || NET472 || NETSTANDARD2_0 || NET6_0
/// <summary>
/// Creating a Signature requires the use of a <see cref="HashAlgorithm"/>.
/// This method returns the <see cref="HashAlgorithmName"/>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.IdentityModel.Tokens/CryptoProviderFactory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ public virtual SignatureProvider CreateForVerifying(SecurityKey key, string algo
return CreateSignatureProvider(key, algorithm, false, cacheProvider);
}

#if NET461 || NET472 || NETSTANDARD2_0 || NET6_0
#if NET461 || NET462 || NET472 || NETSTANDARD2_0 || NET6_0
/// <summary>
/// Creates a <see cref="HashAlgorithm"/> for a specific algorithm.
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.IdentityModel.Tokens/ECDsaAdapter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ internal ECDsa CreateECDsa(JsonWebKey jsonWebKey, bool usePrivateKey)
return CreateECDsaFunction(jsonWebKey, usePrivateKey);
}

#if NET45 || NET461 || NETSTANDARD2_0
#if NET45 || NET461 || NET462 || NETSTANDARD2_0
/// <summary>
/// Creates an ECDsa object using the <paramref name="jsonWebKey"/> and <paramref name="usePrivateKey"/>.
/// 'ECParameters' structure is available in .NET Framework 4.7+, .NET Standard 1.6+, and .NET Core 1.0+.
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\..\build\common.props" />

Expand All @@ -12,7 +12,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<DefineConstants>$(DefineConstants);TRACE;DESKTOP;HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_ASYNC;HAVE_BIG_INTEGER;HAVE_BINARY_FORMATTER;HAVE_BINARY_SERIALIZATION;HAVE_BINARY_EXCEPTION_SERIALIZATION;HAVE_CAS;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_CONCURRENT_COLLECTIONS;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_DYNAMIC;HAVE_EMPTY_TYPES;HAVE_ENTITY_FRAMEWORK;HAVE_EXPRESSIONS;HAVE_FAST_REVERSE;HAVE_FSHARP_TYPES;HAVE_FULL_REFLECTION;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_INOTIFY_PROPERTY_CHANGING;HAVE_ISET;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_EMIT;HAVE_REGEX_TIMEOUTS;HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_XML_DOCUMENT;HAVE_XML_DOCUMENT_TYPE;HAVE_CONCURRENT_DICTIONARY;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>

Expand All @@ -39,13 +39,13 @@
<PackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngVersion)" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'netstandard2.0'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Text.Encoding" Version="$(SystemTextEncoding)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWeb)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJson)" />
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.IdentityModel.Tokens/RsaCryptoServiceProviderProxy.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public bool VerifyData(byte[] input, object hash, byte[] signature)
return _rsa.VerifyData(input, hash, signature);
}

#if NET461 || NET472 || NETSTANDARD2_0
#if NET461 || NET462 || NET472 || NETSTANDARD2_0
/// <summary>
/// Verifies that a digital signature is valid by determining the hash value in the signature using the provided public key and comparing it to the hash value of the provided data.
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.IdentityModel.Tokens/RsaSecurityKey.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public override bool HasPrivateKey
{
// imitate signing
byte[] hash = new byte[20];
#if NET461 || NET472 || NETSTANDARD2_0 || NET6_0
#if NET461 || NET462 || NET472 || NETSTANDARD2_0 || NET6_0
Rsa.SignData(hash, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
#else
if (Rsa is RSACryptoServiceProvider rsaCryptoServiceProvider)
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.IdentityModel.Tokens/SupportedAlgorithms.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ internal static class SupportedAlgorithms
SecurityAlgorithms.EcdhEsA256kw
};

#if NET461 || NET472 || NETSTANDARD2_0 || NET6_0
#if NET461 || NET462 || NET472 || NETSTANDARD2_0 || NET6_0
/// <summary>
/// Creating a Signature requires the use of a <see cref="HashAlgorithm"/>.
/// This method returns the <see cref="HashAlgorithmName"/>
Expand Down Expand Up @@ -339,7 +339,7 @@ private static bool IsSupportedRsaPss(SecurityKey key)
// RSA-PSS is not available on .NET 4.5
LogHelper.LogInformation(LogMessages.IDX10692);
return false;
#elif NET461 || NET472 || NETSTANDARD2_0 || NET6_0
#elif NET461 || NET462 || NET472 || NETSTANDARD2_0 || NET6_0
// RSACryptoServiceProvider doesn't support RSA-PSS
if (key is RsaSecurityKey rsa && rsa.Rsa is RSACryptoServiceProvider)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.IdentityModel.Tokens/Utility.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public static bool IsHttps(Uri uri)
{
return false;
}
#if NET461
#if NET461 || NET462
return uri.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase); //Uri.UriSchemeHttps is internal in dnxcore
#else
return uri.Scheme.Equals(Uri.UriSchemeHttps, StringComparison.OrdinalIgnoreCase);
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.IdentityModel.Tokens/X509SecurityKey.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public AsymmetricAlgorithm PrivateKey
{
if (!_privateKeyAvailabilityDetermined)
{
#if NET461 || NET472 || NETSTANDARD2_0 || NET6_0
#if NET461 || NET462 || NET472 || NETSTANDARD2_0 || NET6_0
_privateKey = RSACertificateExtensions.GetRSAPrivateKey(Certificate);
#else
_privateKey = Certificate.PrivateKey;
Expand All @@ -105,7 +105,7 @@ public AsymmetricAlgorithm PublicKey
{
if (_publicKey == null)
{
#if NET461 || NET472 || NETSTANDARD2_0 || NET6_0
#if NET461 || NET462 || NET472 || NETSTANDARD2_0 || NET6_0
_publicKey = RSACertificateExtensions.GetRSAPublicKey(Certificate);
#else
_publicKey = Certificate.PublicKey.Key;
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.IdentityModel.Validators/Microsoft.IdentityModel.Validators.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<ProjectReference Include="..\System.IdentityModel.Tokens.Jwt\System.IdentityModel.Tokens.Jwt.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...rosoft.IdentityModel.Abstractions.Tests/Microsoft.IdentityModel.Abstractions.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<ProjectReference Include="..\..\src\Microsoft.IdentityModel.Abstractions\Microsoft.IdentityModel.Abstractions.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.IdentityModel.JsonWebTokens.Tests/JsonWebTokenHandlerTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2029,7 +2029,7 @@ public static TheoryData<CreateTokenTheoryData> CreateJWSUsingSecurityTokenDescr
},
ExpectedException = ExpectedException.SecurityTokenException("IDX14116:")
},
#if NET461 || NET472 || NET_CORE
#if NET461 || NET462 || NET472 || NET_CORE
// RsaPss is not supported on .NET < 4.6
new CreateTokenTheoryData
{
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.IdentityModel.Logging.Tests/Microsoft.IdentityModel.Logging.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ProjectReference Include="..\Microsoft.IdentityModel.TestUtils\Microsoft.IdentityModel.TestUtils.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...rotocols.OpenIdConnect.Tests/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<ProjectReference Include="..\Microsoft.IdentityModel.Tokens.Tests\Microsoft.IdentityModel.Tokens.Tests.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

Expand Down
3 changes: 3 additions & 0 deletions test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectMessageTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,9 @@ public void OidcCreateAuthenticationRequestUrl(string testId, OpenIdConnectMessa
#elif NET461
if (!message.SkuTelemetryValue.Equals("ID_NET461"))
context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NET461");
#elif NET462
if (!message.SkuTelemetryValue.Equals("ID_NET462"))
context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NET462");
#elif NET472
if (!message.SkuTelemetryValue.Equals("ID_NET472"))
context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NET472");
Expand Down
4 changes: 2 additions & 2 deletions ....SignedHttpRequest.Tests/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<ProjectReference Include="..\Microsoft.IdentityModel.TestUtils\Microsoft.IdentityModel.TestUtils.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestTestUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public static class SignedHttpRequestTestUtils
{ JwtHeaderParameterNames.Kid, Base64UrlEncoder.Encode(new JsonWebKey(DefaultJwkEcdsa.ToString(Formatting.None)).ComputeJwkThumbprint()) },
};

#if NET452 || NET461
#if NET452 || NET461 || NET462
internal static JObject DefaultJwkEcdsa => new JObject
{
{ "kty", "EC" },
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.IdentityModel.Protocols.Tests/Microsoft.IdentityModel.Protocols.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<ProjectReference Include="..\Microsoft.IdentityModel.TestUtils\Microsoft.IdentityModel.TestUtils.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.IdentityModel.SampleTests/Microsoft.IdentityModel.SampleTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<PackageReference Include="Microsoft.Azure.KeyVault.Cryptography" Version="$(MicrosoftAzureKeyVaultCryptographyVersion)" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472'">
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

Expand Down
Loading

0 comments on commit 614642a

Please sign in to comment.