Use C# preprocessor directives (#1808)

AzureAD · Jul 16, 2022 · 7ed37da · 7ed37da
1 parent 955e823
commit 7ed37da
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 25 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -64,22 +64,7 @@
     <AdditionalFiles Include="..\..\.sonarlint\azuread_microsoft-identity-web\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <DefineConstants>$(DefineConstants);DOTNET_50_AND_ABOVE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
-    <DefineConstants>$(DefineConstants);DOTNET_472</DefineConstants>
-    <LangVersion>8.0</LangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
-    <DefineConstants>$(DefineConstants);DOTNET_462</DefineConstants>
-    <LangVersion>8.0</LangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <DefineConstants>$(DefineConstants);DOTNET_STANDARD_20</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 

diff --git a/src/Microsoft.Identity.Web.Certificate/CertificateDescription.cs b/src/Microsoft.Identity.Web.Certificate/CertificateDescription.cs
@@ -238,7 +238,7 @@ internal string? Container
         /// </summary>
         public string? Base64EncodedValue { get; set; }
 
-#if DOTNET_462 || DOTNET_STANDARD_20
+#if NET462 || NETSTANDARD2_0
         /// <summary>
         ///  Defines where and how to import the private key of an X.509 certificate.
         /// </summary>

diff --git a/src/Microsoft.Identity.Web.Certificate/DefaultCertificateLoader.cs b/src/Microsoft.Identity.Web.Certificate/DefaultCertificateLoader.cs
@@ -275,7 +275,7 @@ private static X509Certificate2 LoadFromPath(
             string certificateFileName,
             string? password = null)
         {
-#if DOTNET_462 || DOTNET_STANDARD_20
+#if NET462 || NETSTANDARD2_0
             return new X509Certificate2(
                 certificateFileName,
                 password,

diff --git a/src/Microsoft.Identity.Web/DownstreamWebApiSupport/DownstreamWebApi.cs b/src/Microsoft.Identity.Web/DownstreamWebApiSupport/DownstreamWebApi.cs
@@ -124,7 +124,7 @@ public async Task<HttpResponseMessage> CallWebApiForUserAsync(
             {
                 string error = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-#if DOTNET_50_AND_ABOVE
+#if NET5_0_OR_GREATER
                 throw new HttpRequestException($"{(int)response.StatusCode} {response.StatusCode} {error}", null, response.StatusCode);
 #else
                 throw new HttpRequestException($"{(int)response.StatusCode} {response.StatusCode} {error}");

diff --git a/src/Microsoft.Identity.Web/DownstreamWebApiSupport/DownstreamWebApiGenericExtensions.cs b/src/Microsoft.Identity.Web/DownstreamWebApiSupport/DownstreamWebApiGenericExtensions.cs
@@ -294,7 +294,7 @@ private static StringContent ConvertFromInput<TInput>(TInput input)
             {
                 string error = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-#if DOTNET_50_AND_ABOVE
+#if NET5_0_OR_GREATER
                 throw new HttpRequestException($"{(int)response.StatusCode} {response.StatusCode} {error}", null, response.StatusCode);
 #else
                 throw new HttpRequestException($"{(int)response.StatusCode} {response.StatusCode} {error}");

diff --git a/src/Microsoft.Identity.Web/JwtBearerMergedOptions.cs b/src/Microsoft.Identity.Web/JwtBearerMergedOptions.cs
@@ -19,7 +19,7 @@ public static void UpdateJwtBearerOptionsFromJwtBearerOptions(JwtBearerOptions j
                 jwtBearerMergedOptions.Authority = jwtBearerOptions.Authority;
             }
 
-#if DOTNET_50_AND_ABOVE
+#if NET5_0_OR_GREATER
             jwtBearerMergedOptions.AutomaticRefreshInterval = jwtBearerOptions.AutomaticRefreshInterval;
 #endif
 
@@ -72,7 +72,7 @@ public static void UpdateJwtBearerOptionsFromJwtBearerOptions(JwtBearerOptions j
 
             jwtBearerMergedOptions.IncludeErrorDetails = jwtBearerOptions.IncludeErrorDetails;
 
-#if DOTNET_50_AND_ABOVE
+#if NET5_0
             jwtBearerMergedOptions.MapInboundClaims = jwtBearerOptions.MapInboundClaims;
 #endif
 
@@ -81,7 +81,7 @@ public static void UpdateJwtBearerOptionsFromJwtBearerOptions(JwtBearerOptions j
                 jwtBearerMergedOptions.MetadataAddress = jwtBearerOptions.MetadataAddress;
             }
 
-#if DOTNET_50_AND_ABOVE
+#if NET5_0
             jwtBearerMergedOptions.RefreshInterval = jwtBearerOptions.RefreshInterval;
 #endif
 

diff --git a/...t.Identity.Web/WebAppExtensions/MicrosoftIdentityWebAppAuthenticationBuilderExtensions.cs b/...t.Identity.Web/WebAppExtensions/MicrosoftIdentityWebAppAuthenticationBuilderExtensions.cs
@@ -462,7 +462,7 @@ private static void PopulateOpenIdOptionsFromMergedOptions(
             options.DisableTelemetry = mergedOptions.DisableTelemetry;
             options.NonceCookie = mergedOptions.NonceCookie;
             options.UsePkce = mergedOptions.UsePkce;
-#if DOTNET_50_AND_ABOVE
+#if NET5_0_OR_GREATER
             options.AutomaticRefreshInterval = mergedOptions.AutomaticRefreshInterval;
             options.RefreshInterval = mergedOptions.RefreshInterval;
             options.MapInboundClaims = mergedOptions.MapInboundClaims;

diff --git a/tests/Microsoft.Identity.Web.Test/Certificates/CertificateDescriptionTests.cs b/tests/Microsoft.Identity.Web.Test/Certificates/CertificateDescriptionTests.cs
@@ -18,7 +18,7 @@ public void TestFromKeyVault(string keyVaultUrl, string certificateName)
             Assert.Equal(certificateName, certificateDescription.ReferenceOrValue);
             Assert.Equal(certificateName, certificateDescription.KeyVaultCertificateName);
             Assert.Equal(keyVaultUrl, certificateDescription.KeyVaultUrl);
-#if DOTNET_462
+#if NET462
             Assert.Equal(X509KeyStorageFlags.MachineKeySet, certificateDescription.X509KeyStorageFlags);
 #else
             Assert.Equal(X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.EphemeralKeySet, certificateDescription.X509KeyStorageFlags);