Update ifdefs

src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Pbkdf2Util.cs

@@ -14,7 +14,7 @@ internal static class Pbkdf2Util
 
         private static IPbkdf2Provider GetPbkdf2Provider()
         {
-#if NETSTANDARD2_0 || NET462
+#if NETSTANDARD2_0 || NETFRAMEWORK
             // In priority order, our three implementations are Win8, Win7, and "other".
             if (OSVersionUtil.IsWindows8OrLater())
             {

src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs

@@ -37,7 +37,7 @@ public void RunTest_Normal_NetCore(string password, KeyDerivationPrf prf, int it
             }
 
             // Act & assert
-#if NET462
+#if NETFRAMEWORK
             TestProvider<ManagedPbkdf2Provider>(password, salt, prf, iterationCount, numBytesRequested, expectedValueAsBase64);
 #elif NETCOREAPP
             TestProvider<NetCorePbkdf2Provider>(password, salt, prf, iterationCount, numBytesRequested, expectedValueAsBase64);
@@ -53,7 +53,7 @@ public void RunTest_WithLongPassword_NetCore_FallbackToManaged()
             byte[] salt = Encoding.UTF8.GetBytes("salt");
             const string expectedDerivedKeyBase64 = "Sc+V/c3fiZq5Z5qH3iavAiojTsW97FAp2eBNmCQAwCNzA8hfhFFYyQLIMK65qPnBFHOHXQPwAxNQNhaEAH9hzfiaNBSRJpF9V4rpl02d5ZpI6cZbsQFF7TJW7XJzQVpYoPDgJlg0xVmYLhn1E9qMtUVUuXsBjOOdd7K1M+ZI00c=";
 
-#if NET462
+#if NETFRAMEWORK
             RunTest_WithLongPassword_Impl<ManagedPbkdf2Provider>(salt, expectedDerivedKeyBase64);
 #elif NETCOREAPP
             RunTest_WithLongPassword_Impl<NetCorePbkdf2Provider>(salt, expectedDerivedKeyBase64);
@@ -68,7 +68,7 @@ public void RunTest_WithLongPassword_NetCore()
             // salt longer than 8 bytes
             var salt = Encoding.UTF8.GetBytes("abcdefghijkl");
 
-#if NET462
+#if NETFRAMEWORK
             RunTest_WithLongPassword_Impl<ManagedPbkdf2Provider>(salt, "NGJtFzYUaaSxu+3ZsMeZO5d/qPJDUYW4caLkFlaY0cLSYdh1PN4+nHUVp4pUUubJWu3UeXNMnHKNDfnn8GMfnDVrAGTv1lldszsvUJ0JQ6p4+daQEYBc//Tj/ejuB3luwW0IinyE7U/ViOQKbfi5pCZFMQ0FFx9I+eXRlyT+I74=");
 #elif NETCOREAPP
             RunTest_WithLongPassword_Impl<NetCorePbkdf2Provider>(salt, "NGJtFzYUaaSxu+3ZsMeZO5d/qPJDUYW4caLkFlaY0cLSYdh1PN4+nHUVp4pUUubJWu3UeXNMnHKNDfnn8GMfnDVrAGTv1lldszsvUJ0JQ6p4+daQEYBc//Tj/ejuB3luwW0IinyE7U/ViOQKbfi5pCZFMQ0FFx9I+eXRlyT+I74=");

src/DataProtection/DataProtection/src/Managed/ManagedGenRandomImpl.cs

@@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.DataProtection.Managed
 {
     internal sealed unsafe class ManagedGenRandomImpl : IManagedGenRandom
     {
-#if NETSTANDARD2_0 || NET462
+#if NETSTANDARD2_0 || NETFRAMEWORK
         private static readonly RandomNumberGenerator _rng = RandomNumberGenerator.Create();
 #endif
         public static readonly ManagedGenRandomImpl Instance = new ManagedGenRandomImpl();
@@ -20,7 +20,7 @@ private ManagedGenRandomImpl()
         public byte[] GenRandom(int numBytes)
         {
             var bytes = new byte[numBytes];
-#if NETSTANDARD2_0 || NET462
+#if NETSTANDARD2_0 || NETFRAMEWORK
             _rng.GetBytes(bytes);
 #else
             RandomNumberGenerator.Fill(bytes);

src/Identity/Extensions.Core/src/PasswordHasher.cs

@@ -65,7 +65,7 @@ public PasswordHasher(IOptions<PasswordHasherOptions> optionsAccessor = null)
             _rng = options.Rng;
         }
 
-#if NETSTANDARD2_0 || NET462
+#if NETSTANDARD2_0 || NETFRAMEWORK
         // Compares two byte arrays for equality. The method is specifically written so that the loop is not optimized.
         [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
         private static bool ByteArraysEqual(byte[] a, byte[] b)
@@ -244,7 +244,7 @@ private static bool VerifyHashedPasswordV2(byte[] hashedPassword, string passwor
 
             // Hash the incoming password and verify it
             byte[] actualSubkey = KeyDerivation.Pbkdf2(password, salt, Pbkdf2Prf, Pbkdf2IterCount, Pbkdf2SubkeyLength);
-#if NETSTANDARD2_0 || NET462
+#if NETSTANDARD2_0 || NETFRAMEWORK
             return ByteArraysEqual(actualSubkey, expectedSubkey);
 #elif NETCOREAPP
             return CryptographicOperations.FixedTimeEquals(actualSubkey, expectedSubkey);
@@ -283,7 +283,7 @@ private static bool VerifyHashedPasswordV3(byte[] hashedPassword, string passwor
 
                 // Hash the incoming password and verify it
                 byte[] actualSubkey = KeyDerivation.Pbkdf2(password, salt, prf, iterCount, subkeyLength);
-#if NETSTANDARD2_0 || NET462
+#if NETSTANDARD2_0 || NETFRAMEWORK
                 return ByteArraysEqual(actualSubkey, expectedSubkey);
 #elif NETCOREAPP
                 return CryptographicOperations.FixedTimeEquals(actualSubkey, expectedSubkey);

src/Identity/Extensions.Core/src/Rfc6238AuthenticationService.cs

@@ -13,7 +13,7 @@ internal static class Rfc6238AuthenticationService
     {
         private static readonly TimeSpan _timestep = TimeSpan.FromMinutes(3);
         private static readonly Encoding _encoding = new UTF8Encoding(false, true);
-#if NETSTANDARD2_0 || NET462
+#if NETSTANDARD2_0 || NETFRAMEWORK
         private static readonly DateTime _unixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
         private static readonly RandomNumberGenerator _rng = RandomNumberGenerator.Create();
 #endif
@@ -22,7 +22,7 @@ internal static class Rfc6238AuthenticationService
         public static byte[] GenerateRandomKey()
         {
             byte[] bytes = new byte[20];
-#if NETSTANDARD2_0 || NET462
+#if NETSTANDARD2_0 || NETFRAMEWORK
             _rng.GetBytes(bytes);
 #else
             RandomNumberGenerator.Fill(bytes);
@@ -68,7 +68,7 @@ private static byte[] ApplyModifier(byte[] input, string modifier)
         // More info: https://tools.ietf.org/html/rfc6238#section-4
         private static ulong GetCurrentTimeStepNumber()
         {
-#if NETSTANDARD2_0 || NET462
+#if NETSTANDARD2_0 || NETFRAMEWORK
             var delta = DateTime.UtcNow - _unixEpoch;
 #else
             var delta = DateTimeOffset.UtcNow - DateTimeOffset.UnixEpoch;

src/Identity/Extensions.Core/src/UserManager.cs

@@ -42,7 +42,7 @@ public class UserManager<TUser> : IDisposable where TUser : class
             new Dictionary<string, IUserTwoFactorTokenProvider<TUser>>();
 
         private bool _disposed;
-#if NETSTANDARD2_0 || NET462
+#if NETSTANDARD2_0 || NETFRAMEWORK
         private static readonly RandomNumberGenerator _rng = RandomNumberGenerator.Create();
 #endif
         private readonly IServiceProvider _services;
@@ -2429,7 +2429,7 @@ private IUserRoleStore<TUser> GetUserRoleStore()
         private static string NewSecurityStamp()
         {
             byte[] bytes = new byte[20];
-#if NETSTANDARD2_0 || NET462
+#if NETSTANDARD2_0 || NETFRAMEWORK
             _rng.GetBytes(bytes);
 #else
             RandomNumberGenerator.Fill(bytes);

src/Mvc/perf/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.cs

@@ -13,7 +13,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
-#if !NET462
+#if !NETFRAMEWORK
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
 #endif
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
@@ -31,7 +31,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
-#if !NET462
+#if !NETFRAMEWORK
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
 #endif
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
@@ -59,7 +59,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
-#if !NET462
+#if !NETFRAMEWORK
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
 #endif
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
@@ -84,7 +84,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
-#if !NET462
+#if !NETFRAMEWORK
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
 #endif
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)

src/Mvc/perf/benchmarkapps/BasicApi/Startup.cs

@@ -64,7 +64,7 @@ public void ConfigureServices(IServiceCollection services)
 
             switch (databaseType.ToUpperInvariant())
             {
-#if !NET462
+#if !NETFRAMEWORK
                 case "MYSQL":
                     services
                         .AddEntityFrameworkMySql()

src/Mvc/perf/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.cs

@@ -14,7 +14,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
-#if !NET462
+#if !NETFRAMEWORK
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
 #endif
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)

src/Mvc/perf/benchmarkapps/BasicViews/Startup.cs

@@ -45,7 +45,7 @@ public void ConfigureServices(IServiceCollection services)
 
             switch (databaseType.ToUpperInvariant())
             {
-#if !NET462
+#if !NETFRAMEWORK
                 case "MYSQL":
                     services
                         .AddEntityFrameworkMySql()

src/Shared/CommandLineUtils/Utilities/DotNetMuxer.cs

@@ -4,7 +4,7 @@
 // System.AppContext.GetData is not available in these frameworks
 #nullable enable
 
-#if !NET451 && !NET452 && !NET46 && !NET462
+#if !NETFRAMEWORK
 
 using System;
 using System.Diagnostics;

src/Shared/OperatingSystem.cs

@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore
 {
     internal sealed class OperatingSystem
     {
-#if NET462
+#if NETFRAMEWORK
         private const bool _isBrowser = false;
 #else
         private static readonly bool _isBrowser = RuntimeInformation.IsOSPlatform(OSPlatform.Create("browser"));

src/Shared/test/Shared.Tests/PropertyHelperTest.cs

@@ -164,7 +164,7 @@ public void PropertyHelper_RefStructProperties()
             var helper = Assert.Single(PropertyHelper.GetProperties(obj.GetType().GetTypeInfo()));
             Assert.Equal("Prop5", helper.Name);
         }
-#elif NET46 || NET462
+#elif NETFRAMEWORK
 #else
 #error Unknown TFM - update the set of TFMs where we test for ref structs
 #endif
@@ -746,7 +746,7 @@ private class RefStructProperties
         private readonly ref struct MyRefStruct
         {
         }
-#elif NET46 || NET462
+#elif NETFRAMEWORK
 #else
 #error Unknown TFM - update the set of TFMs where we test for ref structs
 #endif

src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/WebSocketsTransport.cs

@@ -55,7 +55,7 @@ private async ValueTask<WebSocket> DefaultWebSocketFactory(WebSocketConnectionCo
             {
                 // Full Framework will throw when trying to set the User-Agent header
                 // So avoid setting it in netstandard2.0 and only set it in netstandard2.1 and higher
-#if !NETSTANDARD2_0 && !NET462
+#if !NETSTANDARD2_0 && !NETFRAMEWORK
                 webSocket.Options.SetRequestHeader("User-Agent", Constants.UserAgentHeader.ToString());
 #else
                 // Set an alternative user agent header on Full framework
@@ -276,7 +276,7 @@ private async Task StartReceiving(WebSocket socket)
 #if NETSTANDARD2_1 || NETCOREAPP
                     // Because we checked the CloseStatus from the 0 byte read above, we don't need to check again after reading
                     var receiveResult = await socket.ReceiveAsync(memory, CancellationToken.None);
-#elif NETSTANDARD2_0 || NET462
+#elif NETSTANDARD2_0 || NETFRAMEWORK
                     var isArray = MemoryMarshal.TryGetArray<byte>(memory, out var arraySegment);
                     Debug.Assert(isArray);
 

src/Testing/src/xunit/FrameworkSkipConditionAttribute.cs

@@ -32,7 +32,7 @@ private static bool CanRunOnThisFramework(RuntimeFrameworks excludedFrameworks)
                 return true;
             }
 
-#if NET462 || NET46
+#if NETFRAMEWORK
             if (excludedFrameworks.HasFlag(RuntimeFrameworks.Mono) &&
                 TestPlatformHelper.IsMono)
             {

src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommand.cs

@@ -88,7 +88,7 @@ protected override int Execute()
                 return loadContext.LoadFromAssemblyPath(assemblyPath);
             };
 
-#elif NET462
+#elif NETFRAMEWORK
             AppDomain.CurrentDomain.AssemblyResolve += (source, eventArgs) =>
             {
                 var assemblyName = new AssemblyName(eventArgs.Name);