no FS_RESHAPED_REFLECTION

FSharp.Profiles.props

@@ -19,12 +19,9 @@
     <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONFIGURATION</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
-<<<<<<< HEAD
-    <DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
-=======
     <DefineConstants>$(DefineConstants);FX_REDUCED_EXCEPTIONS</DefineConstants>
->>>>>>> wip
     <DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_RESHAPED_GLOBALIZATION</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_RESHAPED_MSBUILD</DefineConstants>
     <OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
   </PropertyGroup>

src/absil/illib.fs

@@ -253,7 +253,10 @@ module Option =
     let attempt (f: unit -> 'T) = try Some (f()) with _ -> None
 
 module List = 
+<<<<<<< HEAD
 
+=======
+>>>>>>> no FS_RESHAPED_REFLECTION
     let sortWithOrder (c: IComparer<'T>) elements = List.sortWith (Order.toFunction c) elements
 
     let splitAfter n l = 
@@ -1261,7 +1264,6 @@ type LayeredMultiMap<'Key, 'Value when 'Key : equality and 'Key : comparison>(co
 
 [<AutoOpen>]
 module Shim =
-
     type IFileSystem = 
 
         /// A shim over File.ReadAllBytes

src/absil/ilwrite.fs

@@ -3035,6 +3035,7 @@ module FileSystemUtilites =
     open System
     open System.Reflection
     open System.Globalization
+
     let progress = try System.Environment.GetEnvironmentVariable("FSharp_DebugSetFilePermissions") <> null with _ -> false
     let setExecutablePermission (filename: string) =
 

src/fsharp/FSharp.Core/prim-types.fs

@@ -527,6 +527,10 @@ namespace Microsoft.FSharp.Core
                 (# "throw" (e :> System.Exception) : nativeptr<'T> #)     
 
         open IntrinsicOperators
+<<<<<<< HEAD
+=======
+
+>>>>>>> no FS_RESHAPED_REFLECTION
         [<CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1034:NestedTypesShouldNotBeVisible")>]  // nested module OK
         module IntrinsicFunctions =        
 
@@ -4483,7 +4487,7 @@ namespace Microsoft.FSharp.Core
         module OperatorIntrinsics =
 
             open System.Collections
-
+            
             let notStarted() = raise (new System.InvalidOperationException(SR.GetString(SR.enumerationNotStarted)))
             let alreadyFinished() = raise (new System.InvalidOperationException(SR.GetString(SR.enumerationAlreadyFinished)))
 

src/fsharp/FSharp.Core/quotations.fs

@@ -1127,7 +1127,7 @@ module Patterns =
         let argtyps : Type list = argTypes |> inst tyargs
         let retType : Type = retType |> inst tyargs |> removeVoid
         typ.GetProperty(propName, staticOrInstanceBindingFlags, null, retType, Array.ofList argtyps, null) |> checkNonNullResult ("propName", String.Format(SR.GetString(SR.QfailedToBindProperty), propName)) // fxcop may not see "propName" as an arg
-
+    
     let bindField (tc, fldName, tyargs) =
         let typ = mkNamedType (tc, tyargs)
         typ.GetField(fldName, staticOrInstanceBindingFlags) |> checkNonNullResult ("fldName", String.Format(SR.GetString(SR.QfailedToBindField), fldName)) // fxcop may not see "fldName" as an arg

src/fsharp/FSharp.Core/reflect.fs

@@ -26,7 +26,6 @@ module internal ReflectionUtils =
 
 [<AutoOpen>]
 module internal Impl =
-
     let getBindingFlags allowAccess = ReflectionUtils.toBindingFlags (defaultArg allowAccess false)
 
     let inline checkNonNull argName (v: 'T) =
@@ -62,7 +61,6 @@ module internal Impl =
         match getInstancePropertyInfo(typ, propName, bindingFlags) with
         | null -> None
         | prop -> Some(fun (obj: obj) -> prop.GetValue (obj, instancePropertyFlags ||| bindingFlags, null, null, null))
-
     //-----------------------------------------------------------------
     // ATTRIBUTE DECOMPILATION
 

src/fsharp/FSharp.Core/seq.fs

@@ -1159,7 +1159,6 @@ namespace Microsoft.FSharp.Collections
         [<CompiledName("CountBy")>]
         let countBy (projection:'T->'Key) (source:seq<'T>) =
             checkNonNull "source" source
-
             if typeof<'Key>.IsValueType
                 then mkDelayedSeq (fun () -> countByValueType projection source)
                 else mkDelayedSeq (fun () -> countByRefType   projection source)

src/utils/sformat.fs

@@ -386,7 +386,7 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl
 
             // Analyze an object to see if it the representation
             // of an F# value.
-            let GetValueInfoOfObject (bindingFlags:BindingFlags) (obj : obj) =
+            let GetValueInfoOfObject (bindingFlags:BindingFlags) (obj : obj) = 
               match obj with 
               | null -> ObjectValue(obj)
               | _ -> 
@@ -454,7 +454,7 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl
         let string_of_int (i:int) = i.ToString()
 
         let typeUsesSystemObjectToString (ty:System.Type) =
-            try
+            try 
                 let methInfo = ty.GetMethod("ToString",BindingFlags.Public ||| BindingFlags.Instance,null,[| |],null)
                 methInfo.DeclaringType = typeof<System.Object>
             with e -> false
@@ -1127,7 +1127,7 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl
                            let basicL = LayoutOps.objL obj  // This buries an obj in the layout, rendered at squash time via a leafFormatter.
                                                             // If the leafFormatter was directly here, then layout leaves could store strings.
                            match obj with 
-                           | _ when opts.ShowProperties ->
+                           | _ when opts.ShowProperties ->                  
                               let props = ty.GetProperties(BindingFlags.GetField ||| BindingFlags.Instance ||| BindingFlags.Public)
                               let fields = ty.GetFields(BindingFlags.Instance ||| BindingFlags.Public) |> Array.map (fun i -> i :> MemberInfo)
                               let propsAndFields = 
@@ -1143,11 +1143,7 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl
 
                               // massively reign in deep printing of properties 
                               let nDepth = depthLim/10
-#if NETSTANDARD
-                              Array.Sort((propsAndFields),{ new IComparer<MemberInfo> with member this.Compare(p1,p2) = compare (p1.Name) (p2.Name) } )
-#else
-                              Array.Sort((propsAndFields :> Array),{ new System.Collections.IComparer with member this.Compare(p1,p2) = compare ((p1 :?> MemberInfo).Name) ((p2 :?> MemberInfo).Name) } )
-#endif
+                              Array.Sort((propsAndFields :> Array),{ new System.Collections.IComparer with member this.Compare(p1,p2) = compare ((p1 :?> MemberInfo).Name) ((p2 :?> MemberInfo).Name) } );
 
                               if propsAndFields.Length = 0 || (nDepth <= 0) then basicL 
                               else basicL --- 

src/utils/sformat.fsi

@@ -336,7 +336,6 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl
         val output_any: writer:TextWriter -> value:'T * Type -> unit
 
 #if FSHARP_CORE   // FSharp.Core.dll: Most functions aren't needed in FSharp.Core.dll, but we add one entry for printf
-
         val anyToStringForPrintf: options:FormatOptions -> bindingFlags:System.Reflection.BindingFlags -> value:'T * Type -> string
 #else
         val asTaggedTextWriter: writer: TextWriter -> TaggedTextWriter

tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Reflection/FSharpReflection.fs

@@ -1032,7 +1032,7 @@ type FSharpTypeTests() =
 
     // Regression for 5588, Reflection: unit is still treated as a record type, but only if you pass BindingFlags.NonPublic
     [<Test>]
-    member __.``IsRecord.Regression5588``() =
+    member __.``IsRecord.Regression5588``() =    
         // negative
         Assert.IsFalse(FSharpType.IsRecord(typeof<unit>))
         Assert.IsFalse( FSharpType.IsRecord(typeof<unit>, System.Reflection.BindingFlags.NonPublic) )

tests/FSharp.Core.UnitTests/LibraryTestFx.fs

@@ -67,7 +67,7 @@ module SurfaceArea =
         // get current FSharp.Core
         let asm = 
             typeof<int list>.Assembly
-
+        
         // public types only
         let types =
             asm.GetExportedTypes()

tests/fsharp/core/quotes/test.fsx

@@ -2309,16 +2309,28 @@ module ReflectedDefinitionOnTypesWithImplicitCodeGen =
 
       // This type has an implicit IComparable implementation, it is not accessible as a reflected definition
       type U = A of int | B of string | C of System.DateTime 
+<<<<<<< HEAD
+=======
+
+>>>>>>> no FS_RESHAPED_REFLECTION
       for m in typeof<U>.GetMethods(System.Reflection.BindingFlags.DeclaredOnly) do 
           check "celnwer33" (Quotations.Expr.TryGetReflectedDefinition(m).IsNone) true
 
       // This type has some implicit codegen
       exception X of string * int
+<<<<<<< HEAD
+=======
+
+>>>>>>> no FS_RESHAPED_REFLECTION
       for m in typeof<X>.GetMethods(System.Reflection.BindingFlags.DeclaredOnly) do 
           check "celnwer34" (Quotations.Expr.TryGetReflectedDefinition(m).IsNone) true
 
       // This type has an implicit IComparable implementation, it is not accessible as a reflected definition
       [<Struct>] type SR = { x:int; y:string; z:System.DateTime }
+<<<<<<< HEAD
+=======
+
+>>>>>>> no FS_RESHAPED_REFLECTION
       for m in typeof<SR>.GetMethods(System.Reflection.BindingFlags.DeclaredOnly) do 
           check "celnwer35" (Quotations.Expr.TryGetReflectedDefinition(m).IsNone) true
 

tests/fsharp/core/subtype/test.fsx

@@ -1725,7 +1725,10 @@ module InliningOnSubTypes1 =
         (x1, x2)
     do check "clkewlijwlkw" (f()) (13, 17) 
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> no FS_RESHAPED_REFLECTION
 module StructUnionSingleCase = 
     [<Struct>]
     type S = S