diff --git a/eng/Versions.props b/eng/Versions.props index 975921770ed..2e8a2a8f2ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,34 +85,15 @@ https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json; + 4.5.1 5.0.0 - 4.3.0 - 4.3.0 - 4.0.0 - 4.3.0 - 4.3.0 1.6.0 - 4.3.0 - 4.3.0 - 4.3.0 4.5.5 - 4.3.0 - 4.3.1 - 4.3.0 + 4.7.0 5.0.0 - 4.3.0 - 1.5.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 4.11.1 - 4.3.0 - 4.3.0 6.0.0 4.5.0 @@ -205,6 +186,7 @@ 1.0.0 1.1.33 + 0.13.2 2.16.5 4.3.0.0 1.0.30 diff --git a/src/Compiler/AbstractIL/ilreflect.fs b/src/Compiler/AbstractIL/ilreflect.fs index 86787b11f00..1b30f20529f 100644 --- a/src/Compiler/AbstractIL/ilreflect.fs +++ b/src/Compiler/AbstractIL/ilreflect.fs @@ -163,7 +163,7 @@ type TypeBuilder with if logRefEmitCalls then printfn "typeBuilder%d.CreateType()" (abs <| hash typB) - typB.CreateTypeInfo().AsType() + typB.CreateTypeInfo() :> Type member typB.DefineNestedTypeAndLog(name, attrs) = let res = typB.DefineNestedType(name, attrs) @@ -1902,7 +1902,7 @@ let rec buildMethodPass2 cenv tref (typB: TypeBuilder) emEnv (mdef: ILMethodDef) let genArgs = getGenericArgumentsOfMethod methB let emEnv = - envPushTyvars emEnv (Array.append (getGenericArgumentsOfType (typB.AsType())) genArgs) + envPushTyvars emEnv (Array.append (getGenericArgumentsOfType typB) genArgs) buildGenParamsPass1b cenv emEnv genArgs mdef.GenericParams @@ -1965,7 +1965,7 @@ let rec buildMethodPass3 cenv tref modB (typB: TypeBuilder) emEnv (mdef: ILMetho let methB = envGetMethB emEnv mref let emEnv = - envPushTyvars emEnv (Array.append (getGenericArgumentsOfType (typB.AsType())) (getGenericArgumentsOfMethod methB)) + envPushTyvars emEnv (Array.append (getGenericArgumentsOfType typB) (getGenericArgumentsOfMethod methB)) if not (Array.isEmpty (mdef.Return.CustomAttrs.AsArray())) then let retB = methB.DefineParameterAndLog(0, ParameterAttributes.Retval, null) @@ -2091,8 +2091,7 @@ let buildEventPass3 cenv (typB: TypeBuilder) emEnv (eventDef: ILEventDef) = //---------------------------------------------------------------------------- let buildMethodImplsPass3 cenv _tref (typB: TypeBuilder) emEnv (mimpl: ILMethodImplDef) = - let bodyMethInfo = - convMethodRef cenv emEnv (typB.AsType()) mimpl.OverrideBy.MethodRef // doc: must be MethodBuilder + let bodyMethInfo = convMethodRef cenv emEnv typB mimpl.OverrideBy.MethodRef // doc: must be MethodBuilder let (OverridesSpec (mref, dtyp)) = mimpl.Overrides let declMethTI = convType cenv emEnv dtyp @@ -2213,7 +2212,7 @@ and buildTypeTypeDef cenv emEnv modB (typB: TypeBuilder) nesting tdef = let rec buildTypeDefPass1b cenv nesting emEnv (tdef: ILTypeDef) = let tref = mkRefForNestedILTypeDef ILScopeRef.Local (nesting, tdef) let typB = envGetTypB emEnv tref - let genArgs = getGenericArgumentsOfType (typB.AsType()) + let genArgs = getGenericArgumentsOfType typB let emEnv = envPushTyvars emEnv genArgs // Parent may reference types being defined, so has to come after it's Pass1 creation tdef.Extends @@ -2232,7 +2231,7 @@ let rec buildTypeDefPass1b cenv nesting emEnv (tdef: ILTypeDef) = let rec buildTypeDefPass2 cenv nesting emEnv (tdef: ILTypeDef) = let tref = mkRefForNestedILTypeDef ILScopeRef.Local (nesting, tdef) let typB = envGetTypB emEnv tref - let emEnv = envPushTyvars emEnv (getGenericArgumentsOfType (typB.AsType())) + let emEnv = envPushTyvars emEnv (getGenericArgumentsOfType typB) // add interface impls tdef.Implements |> convTypes cenv emEnv @@ -2262,7 +2261,7 @@ let rec buildTypeDefPass2 cenv nesting emEnv (tdef: ILTypeDef) = let rec buildTypeDefPass3 cenv nesting modB emEnv (tdef: ILTypeDef) = let tref = mkRefForNestedILTypeDef ILScopeRef.Local (nesting, tdef) let typB = envGetTypB emEnv tref - let emEnv = envPushTyvars emEnv (getGenericArgumentsOfType (typB.AsType())) + let emEnv = envPushTyvars emEnv (getGenericArgumentsOfType typB) // add method bodies, properties, events tdef.Methods |> Seq.iter (buildMethodPass3 cenv tref modB typB emEnv) tdef.Properties.AsList() |> List.iter (buildPropertyPass3 cenv tref typB emEnv) diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj index b76cfa836a0..ea73cd1ad77 100644 --- a/src/Compiler/FSharp.Compiler.Service.fsproj +++ b/src/Compiler/FSharp.Compiler.Service.fsproj @@ -1,4 +1,4 @@ - + @@ -56,25 +56,9 @@ - - - - - - - - - - - - - - - - @@ -432,8 +416,8 @@ - - + + @@ -501,25 +485,9 @@ - - - - - - - - - - - - - - - - diff --git a/src/Compiler/FSharp.Compiler.Service.nuspec b/src/Compiler/FSharp.Compiler.Service.nuspec index 14b5b08926a..c7b55ebb613 100644 --- a/src/Compiler/FSharp.Compiler.Service.nuspec +++ b/src/Compiler/FSharp.Compiler.Service.nuspec @@ -11,25 +11,9 @@ - - - - - - - - - - - - - - - - diff --git a/src/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj b/src/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj index f4b0c73ffd5..c08df3ef8f9 100644 --- a/src/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj +++ b/src/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj @@ -32,8 +32,4 @@ - - - - diff --git a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj index d114fe9ae33..cc742ad17bc 100644 --- a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj +++ b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj @@ -48,26 +48,10 @@ - - - - - - - - - - - - - - - - diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets index cd0d98ec64a..af1998e9bbe 100644 --- a/src/fsc/fsc.targets +++ b/src/fsc/fsc.targets @@ -43,13 +43,9 @@ - - - - diff --git a/src/fsi/fsi.targets b/src/fsi/fsi.targets index 9280dcc36f4..dcd34a0ee86 100644 --- a/src/fsi/fsi.targets +++ b/src/fsi/fsi.targets @@ -57,15 +57,4 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj index 30e2e9c933c..fae9537443b 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj @@ -174,6 +174,8 @@ + + diff --git a/tests/FSharp.Test.Utilities/CompilerAssert.fs b/tests/FSharp.Test.Utilities/CompilerAssert.fs index 78c3f4c820b..bbb2856344d 100644 --- a/tests/FSharp.Test.Utilities/CompilerAssert.fs +++ b/tests/FSharp.Test.Utilities/CompilerAssert.fs @@ -11,7 +11,9 @@ open FSharp.Compiler.IO open FSharp.Compiler.CodeAnalysis open FSharp.Compiler.Diagnostics open FSharp.Compiler.Text +#if NETCOREAPP open System.Runtime.Loader +#endif open FSharp.Test.Utilities open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.CSharp diff --git a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj index 4a59284d053..18112cbc161 100644 --- a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj +++ b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj @@ -58,7 +58,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj index 9ba7d1306ce..7885ef99ad2 100644 --- a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj +++ b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj @@ -32,7 +32,7 @@ - + diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj index 7f30aa71776..299bf973853 100644 --- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj +++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj @@ -21,7 +21,7 @@ - + diff --git a/tests/fsharp/FSharpSuite.Tests.fsproj b/tests/fsharp/FSharpSuite.Tests.fsproj index 9223265e7e4..494e8225a73 100644 --- a/tests/fsharp/FSharpSuite.Tests.fsproj +++ b/tests/fsharp/FSharpSuite.Tests.fsproj @@ -118,7 +118,7 @@ - + diff --git a/tests/fsharp/core/math/numbers/test.fsx b/tests/fsharp/core/math/numbers/test.fsx index dfdc2b005a3..d9b8eb2edd7 100644 --- a/tests/fsharp/core/math/numbers/test.fsx +++ b/tests/fsharp/core/math/numbers/test.fsx @@ -3,10 +3,6 @@ module Core_math_numbers #endif -#if NETCOREAPP -open CoreClrUtilities -#endif - #light #nowarn "49";; #nowarn "44";; diff --git a/tests/fsharp/core/printing/testLoadFile2.fsx b/tests/fsharp/core/printing/testLoadFile2.fsx index 0135662d80b..d5ea4e8af36 100644 --- a/tests/fsharp/core/printing/testLoadFile2.fsx +++ b/tests/fsharp/core/printing/testLoadFile2.fsx @@ -1,7 +1,3 @@ -#if NETCOREAPP -open CoreClrUtilities -#endif - #light let x1 = 1 let x2 = "hello" diff --git a/tests/fsharp/core/unicode/kanji-unicode-utf16.fs b/tests/fsharp/core/unicode/kanji-unicode-utf16.fs index 5e0256ad2e5..22d1258c32a 100644 Binary files a/tests/fsharp/core/unicode/kanji-unicode-utf16.fs and b/tests/fsharp/core/unicode/kanji-unicode-utf16.fs differ diff --git a/tests/fsharp/coreclr_utilities.fs b/tests/fsharp/coreclr_utilities.fs deleted file mode 100644 index d49310ca4ac..00000000000 --- a/tests/fsharp/coreclr_utilities.fs +++ /dev/null @@ -1,163 +0,0 @@ -[] -module CoreClrUtilities - - open System - open System.Reflection - open System.Runtime.InteropServices - - type System.Delegate with - static member CreateDelegate(delegateType, methodInfo : System.Reflection.MethodInfo) = methodInfo.CreateDelegate(delegateType) - static member CreateDelegate(delegateType, obj : obj, methodInfo : System.Reflection.MethodInfo) = methodInfo.CreateDelegate(delegateType, obj) - -#if !INTERACTIVE - module internal UnsafeNativeMethods = - [] - extern System.IntPtr GetCommandLine(); -#endif - -#if !INTERACTIVE - type System.Environment with - static member GetCommandLineArgs() = - let cl = - let c = UnsafeNativeMethods.GetCommandLine() - if c = IntPtr.Zero then "" - else Marshal.PtrToStringUni(c) - cl.Split(' ') -#endif - - let commit (results : _[]) = - match results with - | [||] -> null - | [| m |] -> m - | _ -> raise (AmbiguousMatchException()) - - [] - type BindingFlags = - | DeclaredOnly = 2 - | Instance = 4 - | Static = 8 - | Public = 16 - | NonPublic = 32 - - [] - type MemberType = - | None = 0x00 - | Constructor = 0x01 - | Event = 0x02 - | Field = 0x04 - | Method = 0x08 - | Property = 0x10 - | TypeInfo = 0x20 - | NestedType = 0x80 - - - let mapMemberType (c:System.Reflection.MemberInfo) = - let mapIsMethodOrConstructor = - match c with - | :? System.Reflection.MethodBase as c -> if c.IsConstructor then MemberType.Constructor else MemberType.Method - |_ -> MemberType.None - - let mapIsEvent = match c with | :? System.Reflection.EventInfo as c -> MemberType.Event |_ -> MemberType.None - let mapIsField = match c with | :? System.Reflection.FieldInfo as c -> MemberType.Field |_ -> MemberType.None - let mapIsProperty = match c with | :? System.Reflection.PropertyInfo as c -> MemberType.Property |_ -> MemberType.None - let mapIsTypeInfoOrNested = - match c with - | :? System.Reflection.TypeInfo as c -> if c.IsNested then MemberType.NestedType else MemberType.TypeInfo - |_ -> MemberType.None - mapIsMethodOrConstructor ||| mapIsEvent ||| mapIsField ||| mapIsProperty ||| mapIsTypeInfoOrNested - - - let inline hasFlag (flag : BindingFlags) f = (f &&& flag) = flag - let isDeclaredFlag f = hasFlag BindingFlags.DeclaredOnly f - let isPublicFlag f = hasFlag BindingFlags.Public f - let isStaticFlag f = hasFlag BindingFlags.Static f - let isInstanceFlag f = hasFlag BindingFlags.Instance f - let isNonPublicFlag f = hasFlag BindingFlags.NonPublic f - - let isAcceptable bindingFlags isStatic isPublic = - // 1. check if member kind (static\instance) was specified in flags - ((isStaticFlag bindingFlags && isStatic) || (isInstanceFlag bindingFlags && not isStatic)) && - // 2. check if member accessibility was specified in flags - ((isPublicFlag bindingFlags && isPublic) || (isNonPublicFlag bindingFlags && not isPublic)) - - let publicFlags = BindingFlags.Public ||| BindingFlags.Instance ||| BindingFlags.Static - - - type System.Reflection.MemberInfo with - member this.GetCustomAttributes(inherits:bool) : obj[] = downcast box(CustomAttributeExtensions.GetCustomAttributes(this, inherits) |> Seq.toArray) - member this.GetCustomAttributes(attrTy:Type) : obj[] = downcast box(CustomAttributeExtensions.GetCustomAttributes(this, attrTy) |> Seq.toArray) - member this.GetCustomAttributes(attrTy, inherits) : obj[] = downcast box(CustomAttributeExtensions.GetCustomAttributes(this, attrTy, inherits) |> Seq.toArray) - member this.MemberType = mapMemberType this - - type System.Reflection.MethodInfo with - member this.GetCustomAttributes(inherits:bool) : obj[] = downcast box(CustomAttributeExtensions.GetCustomAttributes(this, inherits) |> Seq.toArray) - member this.GetCustomAttributes(attrTy:Type) : obj[] = downcast box(CustomAttributeExtensions.GetCustomAttributes(this, attrTy) |> Seq.toArray) - member this.GetCustomAttributes(attrTy, inherits) : obj[] = downcast box(CustomAttributeExtensions.GetCustomAttributes(this, attrTy, inherits) |> Seq.toArray) - member this.MemberType = mapMemberType this - - type System.Reflection.PropertyInfo with - member this.GetCustomAttributes(inherits:bool) : obj[] = downcast box(CustomAttributeExtensions.GetCustomAttributes(this, inherits) |> Seq.toArray) - member this.GetCustomAttributes(attrTy:Type) : obj[] = downcast box(CustomAttributeExtensions.GetCustomAttributes(this, attrTy) |> Seq.toArray) - member this.GetCustomAttributes(attrTy, inherits) : obj[] = downcast box(CustomAttributeExtensions.GetCustomAttributes(this, attrTy, inherits) |> Seq.toArray) - member this.MemberType = mapMemberType this - - type System.Reflection.Assembly with - member this.GetCustomAttributes() : obj[] = downcast box(CustomAttributeExtensions.GetCustomAttributes(this) |> Seq.toArray) - member this.GetCustomAttributes(attrTy, _inherits) : obj[] = downcast box(CustomAttributeExtensions.GetCustomAttributes(this, attrTy) |> Seq.toArray) - member this.GetTypes() = - this.DefinedTypes - |> Seq.map (fun ti -> ti.AsType()) - |> Seq.toArray - - type System.Threading.Thread with - member this.CurrentCulture - with get () = System.Globalization.CultureInfo.CurrentCulture - and set culture = System.Globalization.CultureInfo.CurrentCulture <- culture - - type System.Type with - - member this.Assembly = this.GetTypeInfo().Assembly - // use different sources based on Declared flag - member this.GetConstructor(_bindingFlags, _binder, argsT:Type[], _parameterModifiers) = this.GetConstructor(argsT) - member this.GetConstructor(parameterTypes : Type[]) = - this.GetTypeInfo().DeclaredConstructors - |> Seq.filter (fun ci -> - not ci.IsStatic && //exclude type initializer - ( - let parameters = ci.GetParameters() - (parameters.Length = parameterTypes.Length) && - (parameterTypes, parameters) ||> Array.forall2 (fun ty pi -> pi.ParameterType.Equals ty) - ) - ) - |> Seq.toArray - |> commit - member this.GetCustomAttributes(attrTy, inherits) : obj[] = downcast box(CustomAttributeExtensions.GetCustomAttributes(this.GetTypeInfo(), attrTy, inherits) |> Seq.toArray) - member this.GetGenericParameterConstraints() = this.GetTypeInfo().GetGenericParameterConstraints() - member this.GetMethods(bindingFlags) = - (if isDeclaredFlag bindingFlags then this.GetTypeInfo().DeclaredMethods else this.GetRuntimeMethods()) - |> Seq.filter (fun m -> isAcceptable bindingFlags m.IsStatic m.IsPublic) - |> Seq.toArray - member this.GetMethods() = this.GetMethods(publicFlags) - member this.GetMethod(name, ?bindingFlags) = - let bindingFlags = defaultArg bindingFlags publicFlags - this.GetMethods(bindingFlags) - |> Array.filter(fun m -> m.Name = name) - |> commit - member this.GetMethod(name, _bindingFlags, _binder, argsT:Type[], _parameterModifiers) = - this.GetMethod(name, argsT) - member this.GetProperties(?bindingFlags) = - let bindingFlags = defaultArg bindingFlags publicFlags - (if isDeclaredFlag bindingFlags then this.GetTypeInfo().DeclaredProperties else this.GetRuntimeProperties()) - |> Seq.filter (fun pi-> - let mi = match pi.GetMethod with | null -> pi.SetMethod | _ -> pi.GetMethod - if mi = null then false - else isAcceptable bindingFlags mi.IsStatic mi.IsPublic - ) - |> Seq.toArray - member this.GetProperty(name, ?bindingFlags) = - let bindingFlags = defaultArg bindingFlags publicFlags - this.GetProperties(bindingFlags) - |> Array.filter (fun pi -> pi.Name = name) - |> commit - member this.IsGenericType = this.GetTypeInfo().IsGenericType - member this.IsValueType = this.GetTypeInfo().IsValueType diff --git a/tests/fsharp/readme.md b/tests/fsharp/readme.md index 43ba0b0ad0f..1180f0aac97 100644 --- a/tests/fsharp/readme.md +++ b/tests/fsharp/readme.md @@ -6,7 +6,7 @@ The tests are NUNIT test cases. They test a very wide range of compiler, interac The bulk of the test cases are enumerated in tests.fs, these are the old cambridge test suite. They build on a test-suite ported from windows batch files. They run the compiler and fsi as seperate processes, when built for the coreclr it runs the coreclr versions using dotnet.exe -The framework and utilities can be found in test-framework.fs, single-test.fs, coreclr_utilities.fs. +The framework and utilities can be found in test-framework.fs, single-test.fs. test cases look similar to: ```` diff --git a/tests/fsharp/single-test.fs b/tests/fsharp/single-test.fs index 699019c2fe5..3e1ab4390bc 100644 --- a/tests/fsharp/single-test.fs +++ b/tests/fsharp/single-test.fs @@ -213,7 +213,7 @@ let singleTestBuildAndRunCore cfg copyFiles p languageVersion = let loadSources = [] let useSources = [] let extraSources = ["testlib.fsi";"testlib.fs";"test.mli";"test.ml";"test.fsi";"test.fs";"test2.fsi";"test2.fs";"test.fsx";"test2.fsx"] - let utilitySources = [__SOURCE_DIRECTORY__ ++ "coreclr_utilities.fs"] + let utilitySources = [] let referenceItems = if String.IsNullOrEmpty(copyFiles) then [] else [copyFiles] let framework = "net7.0" diff --git a/vsintegration/Directory.Build.targets b/vsintegration/Directory.Build.targets index 6a81ccae0eb..21ec3caa91f 100644 --- a/vsintegration/Directory.Build.targets +++ b/vsintegration/Directory.Build.targets @@ -12,7 +12,6 @@ - diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index 3dedf85d8e8..156c187769d 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -173,7 +173,6 @@ - diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/ProjectBase.files b/vsintegration/src/FSharp.ProjectSystem.Base/ProjectBase.files index ca2426e7221..e62f4521719 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/ProjectBase.files +++ b/vsintegration/src/FSharp.ProjectSystem.Base/ProjectBase.files @@ -27,9 +27,6 @@ $(FSharpSourcesRoot)\..\packages\Microsoft.Build.Tasks.Core.$(MicrosoftBuildTasksCoreVersion)\lib\net46\Microsoft.Build.Tasks.Core.dll - - $(FSharpSourcesRoot)\..\packages\System.IO.Compression.$(SystemIoCompressionVersion)\lib\net46\System.IO.Compression.dll -