Revert 2 fixes that build for .NET framework

dotnet · Mar 6, 2024 · 84c469f · 84c469f
1 parent 386ec50
commit 84c469f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/src/libraries/Common/src/System/Resources/ResourceWriter.cs b/src/libraries/Common/src/System/Resources/ResourceWriter.cs
@@ -488,7 +488,11 @@ private static ResourceTypeCode FindTypeCode(object? value, List<string> types)
                 if (typeName.StartsWith("ResourceTypeCode.", StringComparison.Ordinal))
                 {
                     typeName = typeName.Substring(17);  // Remove through '.'
+#if NETCOREAPP
                     ResourceTypeCode typeCode = Enum.Parse<ResourceTypeCode>(typeName);
+#else
+                    ResourceTypeCode typeCode = (ResourceTypeCode)Enum.Parse(typeof(ResourceTypeCode), typeName);
+#endif
                     return typeCode;
                 }
             }

diff --git a/src/libraries/System.Text.Encodings.Web/src/System/Text/Encodings/Web/ThrowHelper.cs b/src/libraries/System.Text.Encodings.Web/src/System/Text/Encodings/Web/ThrowHelper.cs
@@ -22,7 +22,7 @@ internal static void ThrowArgumentOutOfRangeException(ExceptionArgument argument
 
         private static string GetArgumentName(ExceptionArgument argument)
         {
-            Debug.Assert(Enum.IsDefined(argument),
+            Debug.Assert(Enum.IsDefined(typeof(ExceptionArgument), argument),
                 "The enum value is not defined, please check the ExceptionArgument Enum.");
 
             return argument.ToString();

diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.cs b/src/tasks/AotCompilerTask/MonoAOTCompiler.cs
@@ -373,7 +373,7 @@ private bool ProcessAndValidateArguments()
 
         if (!Enum.TryParse(Mode, true, out parsedAotMode))
         {
-            Log.LogError($"Unknown Mode value: {Mode}. '{nameof(Mode)}' must be one of: {string.Join(",", Enum.GetNames<MonoAotMode>())}");
+            Log.LogError($"Unknown Mode value: {Mode}. '{nameof(Mode)}' must be one of: {string.Join(",", Enum.GetNames(typeof(MonoAotMode)))}");
             return false;
         }
 

diff --git a/src/tasks/Microsoft.NET.WebAssembly.Webcil/WasmModuleReader.cs b/src/tasks/Microsoft.NET.WebAssembly.Webcil/WasmModuleReader.cs
@@ -101,7 +101,7 @@ private bool DoVisitSection(out bool shouldStop)
         shouldStop = false;
         byte code = _reader.ReadByte();
         Section section = (Section)code;
-        if (!Enum.IsDefined(section))
+        if (!Enum.IsDefined(typeof(Section), section))
             return false;
         uint sectionSize = ReadULEB128();
 

diff --git a/src/tasks/WasmAppBuilder/EmccCompile.cs b/src/tasks/WasmAppBuilder/EmccCompile.cs
@@ -75,7 +75,7 @@ private bool ExecuteActual()
 
             if (!Enum.TryParse(OutputMessageImportance, ignoreCase: true, out MessageImportance messageImportance))
             {
-                Log.LogError($"Invalid value for OutputMessageImportance={OutputMessageImportance}. Valid values: {string.Join(", ", Enum.GetNames<MessageImportance>())}");
+                Log.LogError($"Invalid value for OutputMessageImportance={OutputMessageImportance}. Valid values: {string.Join(", ", Enum.GetNames(typeof(MessageImportance)))}");
                 return false;
             }