Change #if NET45 to #if NETFX

Author: mythz

src/Directory.Build.props

@@ -25,24 +25,16 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
-    <DefineConstants>$(DefineConstants);NETFX;NET45</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETFX;NET45;NET472</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>False</DelaySign>
     <AssemblyOriginatorKeyFile>../servicestack.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
-    <DefineConstants>$(DefineConstants);NETFX;NET472</DefineConstants>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_1</DefineConstants>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <DefineConstants>$(DefineConstants);NET6_0;NET6_0_OR_GREATER</DefineConstants>
   </PropertyGroup>

src/ServiceStack.Text/LicenseUtils.cs

@@ -666,7 +666,7 @@ public static bool VerifySignedHash(byte[] DataToVerify, byte[] SignedData, Syst
 
         public static LicenseKey VerifyLicenseKeyText(string licenseKeyText)
         {
-#if NET45 || NETCORE
+#if NETFX || NETCORE
             LicenseKey key;
             try
             {
@@ -686,7 +686,7 @@ public static LicenseKey VerifyLicenseKeyText(string licenseKeyText)
 
         private static void FromXml(this System.Security.Cryptography.RSA rsa, string xml)
         {
-#if NET45
+#if NETFX
             rsa.FromXmlString(xml);
 #else
             //throws PlatformNotSupportedException

src/ServiceStack.Text/PclExport.Net45.cs

@@ -1,4 +1,4 @@
-#if NET45
+#if NETFX
 using System;
 using System.Collections;
 using System.Collections.Concurrent;

src/ServiceStack.Text/PclExport.cs

@@ -27,7 +27,7 @@ public static class Platforms
         }
 
         public static PclExport Instance
-#if NET45
+#if NETFX
           = new Net45PclExport()
 #elif NETSTANDARD2_0
           = new NetStandardPclExport()

src/ServiceStack.Text/ReflectionOptimizer.Emit.cs

@@ -1,4 +1,4 @@
-#if NET45 || (NETCORE && !NETSTANDARD2_0)
+#if NETFX || (NETCORE && !NETSTANDARD2_0)
 
 using System;
 using System.Linq;

src/ServiceStack.Text/ReflectionOptimizer.cs

@@ -8,7 +8,7 @@ namespace ServiceStack.Text
     public abstract class ReflectionOptimizer
     {
         public static ReflectionOptimizer Instance =
-#if NET45 || (NETCORE && !NETSTANDARD2_0)
+#if NETFX || (NETCORE && !NETSTANDARD2_0)
             EmitReflectionOptimizer.Provider
 #else
             ExpressionReflectionOptimizer.Provider

tests/ServiceStack.Text.Benchmarks/MiniProfiler/FlowData.cs

@@ -1,4 +1,4 @@
-#if NET45
+#if NETFX
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Messaging;
 #else
@@ -16,7 +16,7 @@ namespace StackExchange.Profiling.Internal
     /// <typeparam name="T">The type of data to store.</typeparam>
     public class FlowData<T>
     {
-#if NET45
+#if NETFX
         // Key specific to this type.
 #pragma warning disable RCS1158 // Avoid static members in generic types.
         private static readonly string _key = typeof(FlowData<T>).FullName;

tests/ServiceStack.Text.Tests/RuntimeSerializationTests.cs

@@ -40,7 +40,7 @@ public class MetaType : IMeta
 
     public class RequestDto : IReturn<RequestDto> {}
 
-#if NET45
+#if NETFX
     [Serializable]
     public class SerialiazableType { }
 #endif