From 1c292e6e1ec20ba9b8a3427ddf4dece70698a54b Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Thu, 3 Dec 2020 23:07:35 -0800 Subject: [PATCH] Prepare to ship fcs 38.0.1 (#10592) * add check for system assemblies completion * add check for system assemblies completion * add check for system assemblies completion * merge issues * add FCS release definition links * Fix FSC nuget package dependencies. Use FSharp.Org tool Icon as package icon. (#10588) * src/fsharp/DotNetFrameworkDependencies.fs * System.Config * version * Update bframework refencing (#10502) * Fix release notes link * temp (#10506) Co-authored-by: Don Syme Co-authored-by: Brett V. Forsgren --- eng/Versions.props | 6 +- src/fsharp/DotNetFrameworkDependencies.fs | 580 +++++------------- .../FSharp.Compiler.Service.fsproj | 2 +- .../FSharp.Compiler.Service.Tests.fsproj | 5 + 4 files changed, 179 insertions(+), 414 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 978d3a9fc0f..e6b96add8bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,11 +28,11 @@ $(FSMajorVersion).$(FSMinorVersion).0.0 38 - $(FSMinorVersion) - $(FSBuildVersion) + 0 + 1 $(FSRevisionVersion) $(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion) - $(FCSMajorVersion)-$(FCSMinorVersion)-$(FCSBuildVersion) + $(FCSMajorVersion)$(FCSMinorVersion)$(FCSBuildVersion) 4.7.2 diff --git a/src/fsharp/DotNetFrameworkDependencies.fs b/src/fsharp/DotNetFrameworkDependencies.fs index fc925995e50..8b03f590787 100644 --- a/src/fsharp/DotNetFrameworkDependencies.fs +++ b/src/fsharp/DotNetFrameworkDependencies.fs @@ -314,7 +314,6 @@ module internal FSharp.Compiler.DotNetFrameworkDependencies yield "System.Data" yield "System.Drawing" yield "System.Core" - yield "System.Configuration" yield getFSharpCoreLibraryName if useFsiAuxLib then yield getFsiLibraryName @@ -385,415 +384,176 @@ module internal FSharp.Compiler.DotNetFrameworkDependencies // NOTE: duplicates are ok in this list // .NET Framework list - "mscorlib" - "netstandard" - "System.Runtime" - getFSharpCoreLibraryName - - "System" - "System.Xml" - "System.Runtime.Remoting" - "System.Runtime.Serialization.Formatters.Soap" - "System.Configuration" - "System.Data" - "System.Deployment" - "System.Design" - "System.Messaging" - "System.Drawing" - "System.Net" - "System.Web" - "System.Web.Services" - "System.Windows.Forms" - "System.Core" - "System.Runtime" - "System.Observable" - "System.Numerics" - "System.ValueTuple" - - // Additions for coreclr and portable profiles - "System.Collections" - "System.Collections.Concurrent" - "System.Console" - "System.Diagnostics.Debug" - "System.Diagnostics.Tools" - "System.Globalization" - "System.IO" - "System.Linq" - "System.Linq.Expressions" - "System.Linq.Queryable" - "System.Net.Requests" - "System.Reflection" - "System.Reflection.Emit" - "System.Reflection.Emit.ILGeneration" - "System.Reflection.Extensions" - "System.Resources.ResourceManager" - "System.Runtime.Extensions" - "System.Runtime.InteropServices" - "System.Runtime.InteropServices.PInvoke" - "System.Runtime.Numerics" - "System.Text.Encoding" - "System.Text.Encoding.Extensions" - "System.Text.RegularExpressions" - "System.Threading" - "System.Threading.Tasks" - "System.Threading.Tasks.Parallel" - "System.Threading.Thread" - "System.Threading.ThreadPool" - "System.Threading.Timer" - - "FSharp.Compiler.Interactive.Settings" - "Microsoft.Win32.Registry" - "System.Diagnostics.Tracing" - "System.Globalization.Calendars" - "System.Reflection.Primitives" - "System.Runtime.Handles" - "Microsoft.Win32.Primitives" - "System.IO.FileSystem" - "System.Net.Primitives" - "System.Net.Sockets" - "System.Private.Uri" - "System.AppContext" - "System.Buffers" - "System.Collections.Immutable" - "System.Diagnostics.DiagnosticSource" - "System.Diagnostics.Process" - "System.Diagnostics.TraceSource" - "System.Globalization.Extensions" - "System.IO.Compression" - "System.IO.Compression.ZipFile" - "System.IO.FileSystem.Primitives" - "System.Net.Http" - "System.Net.NameResolution" - "System.Net.WebHeaderCollection" - "System.ObjectModel" - "System.Reflection.Emit.Lightweight" - "System.Reflection.Metadata" - "System.Reflection.TypeExtensions" - "System.Runtime.InteropServices.RuntimeInformation" - "System.Runtime.Loader" - "System.Security.Claims" - "System.Security.Cryptography.Algorithms" - "System.Security.Cryptography.Cng" - "System.Security.Cryptography.Csp" - "System.Security.Cryptography.Encoding" - "System.Security.Cryptography.OpenSsl" - "System.Security.Cryptography.Primitives" - "System.Security.Cryptography.X509Certificates" - "System.Security.Principal" - "System.Security.Principal.Windows" - "System.Threading.Overlapped" - "System.Threading.Tasks.Extensions" - "System.Xml.ReaderWriter" - "System.Xml.XDocument" - - // .NET Core App 3.1 list - "Microsoft.CSharp" - "Microsoft.VisualBasic.Core" - "Microsoft.VisualBasic" - "Microsoft.Win32.Primitives" - "mscorlib" - "netstandard" - "System.AppContext" - "System.Buffers" - "System.Collections.Concurrent" - "System.Collections" - "System.Collections.Immutable" - "System.Collections.NonGeneric" - "System.Collections.Specialized" - "System.ComponentModel.Annotations" - "System.ComponentModel.DataAnnotations" - "System.ComponentModel" - "System.ComponentModel.EventBasedAsync" - "System.ComponentModel.Primitives" - "System.ComponentModel.TypeConverter" - "System.Configuration" - "System.Console" - "System.Core" - "System.Data.Common" - "System.Data.DataSetExtensions" - "System.Data" - "System.Diagnostics.Contracts" - "System.Diagnostics.Debug" - "System.Diagnostics.DiagnosticSource" - "System.Diagnostics.FileVersionInfo" - "System.Diagnostics.Process" - "System.Diagnostics.StackTrace" - "System.Diagnostics.TextWriterTraceListener" - "System.Diagnostics.Tools" - "System.Diagnostics.TraceSource" - "System.Diagnostics.Tracing" - "System" - "System.Drawing" - "System.Drawing.Primitives" - "System.Dynamic.Runtime" - "System.Globalization.Calendars" - "System.Globalization" - "System.Globalization.Extensions" - "System.IO.Compression.Brotli" - "System.IO.Compression" - "System.IO.Compression.FileSystem" - "System.IO.Compression.ZipFile" - "System.IO" - "System.IO.FileSystem" - "System.IO.FileSystem.DriveInfo" - "System.IO.FileSystem.Primitives" - "System.IO.FileSystem.Watcher" - "System.IO.IsolatedStorage" - "System.IO.MemoryMappedFiles" - "System.IO.Pipes" - "System.IO.UnmanagedMemoryStream" - "System.Linq" - "System.Linq.Expressions" - "System.Linq.Parallel" - "System.Linq.Queryable" - "System.Memory" - "System.Net" - "System.Net.Http" - "System.Net.HttpListener" - "System.Net.Mail" - "System.Net.NameResolution" - "System.Net.NetworkInformation" - "System.Net.Ping" - "System.Net.Primitives" - "System.Net.Requests" - "System.Net.Security" - "System.Net.ServicePoint" - "System.Net.Sockets" - "System.Net.WebClient" - "System.Net.WebHeaderCollection" - "System.Net.WebProxy" - "System.Net.WebSockets.Client" - "System.Net.WebSockets" - "System.Numerics" - "System.Numerics.Vectors" - "System.ObjectModel" - "System.Reflection.DispatchProxy" - "System.Reflection" - "System.Reflection.Emit" - "System.Reflection.Emit.ILGeneration" - "System.Reflection.Emit.Lightweight" - "System.Reflection.Extensions" - "System.Reflection.Metadata" - "System.Reflection.Primitives" - "System.Reflection.TypeExtensions" - "System.Resources.Reader" - "System.Resources.ResourceManager" - "System.Resources.Writer" - "System.Runtime.CompilerServices.Unsafe" - "System.Runtime.CompilerServices.VisualC" - "System.Runtime" - "System.Runtime.Extensions" - "System.Runtime.Handles" - "System.Runtime.InteropServices" - "System.Runtime.InteropServices.RuntimeInformation" - "System.Runtime.InteropServices.WindowsRuntime" - "System.Runtime.Intrinsics" - "System.Runtime.Loader" - "System.Runtime.Numerics" - "System.Runtime.Serialization" - "System.Runtime.Serialization.Formatters" - "System.Runtime.Serialization.Json" - "System.Runtime.Serialization.Primitives" - "System.Runtime.Serialization.Xml" - "System.Security.Claims" - "System.Security.Cryptography.Algorithms" - "System.Security.Cryptography.Csp" - "System.Security.Cryptography.Encoding" - "System.Security.Cryptography.Primitives" - "System.Security.Cryptography.X509Certificates" - "System.Security" - "System.Security.Principal" - "System.Security.SecureString" - "System.ServiceModel.Web" - "System.ServiceProcess" - "System.Text.Encoding.CodePages" - "System.Text.Encoding" - "System.Text.Encoding.Extensions" - "System.Text.Encodings.Web" - "System.Text.Json" - "System.Text.RegularExpressions" - "System.Threading.Channels" - "System.Threading" - "System.Threading.Overlapped" - "System.Threading.Tasks.Dataflow" - "System.Threading.Tasks" - "System.Threading.Tasks.Extensions" - "System.Threading.Tasks.Parallel" - "System.Threading.Thread" - "System.Threading.ThreadPool" - "System.Threading.Timer" - "System.Transactions" - "System.Transactions.Local" - "System.ValueTuple" - "System.Web" - "System.Web.HttpUtility" - "System.Windows" - "System.Xml" - "System.Xml.Linq" - "System.Xml.ReaderWriter" - "System.Xml.Serialization" - "System.Xml.XDocument" - "System.Xml.XmlDocument" - "System.Xml.XmlSerializer" - "System.Xml.XPath" - "System.Xml.XPath.XDocument" - "WindowsBase" - - // .NET 5.0 list - "System.Numerics" - "netstandard" - "Microsoft.CSharp" - "Microsoft.VisualBasic.Core" - "Microsoft.VisualBasic" - "Microsoft.Win32.Primitives" - "mscorlib" - "netstandard" - "System.AppContext" - "System.Buffers" - "System.Collections.Concurrent" - "System.Collections" - "System.Collections.Immutable" - "System.Collections.NonGeneric" - "System.Collections.Specialized" - "System.ComponentModel.Annotations" - "System.ComponentModel.DataAnnotations" - "System.ComponentModel" - "System.ComponentModel.EventBasedAsync" - "System.ComponentModel.Primitives" - "System.ComponentModel.TypeConverter" - "System.Configuration" - "System.Console" - "System.Core" - "System.Data.Common" - "System.Data.DataSetExtensions" - "System.Data" - "System.Diagnostics.Contracts" - "System.Diagnostics.Debug" - "System.Diagnostics.DiagnosticSource" - "System.Diagnostics.FileVersionInfo" - "System.Diagnostics.Process" - "System.Diagnostics.StackTrace" - "System.Diagnostics.TextWriterTraceListener" - "System.Diagnostics.Tools" - "System.Diagnostics.TraceSource" - "System.Diagnostics.Tracing" - "System" - "System.Drawing" - "System.Drawing.Primitives" - "System.Dynamic.Runtime" - "System.Formats.Asn1" - "System.Globalization.Calendars" - "System.Globalization" - "System.Globalization.Extensions" - "System.IO.Compression.Brotli" - "System.IO.Compression" - "System.IO.Compression.FileSystem" - "System.IO.Compression.ZipFile" - "System.IO" - "System.IO.FileSystem" - "System.IO.FileSystem.DriveInfo" - "System.IO.FileSystem.Primitives" - "System.IO.FileSystem.Watcher" - "System.IO.IsolatedStorage" - "System.IO.MemoryMappedFiles" - "System.IO.Pipes" - "System.IO.UnmanagedMemoryStream" - "System.Linq" - "System.Linq.Expressions" - "System.Linq.Parallel" - "System.Linq.Queryable" - "System.Memory" - "System.Net" - "System.Net.Http" - "System.Net.Http.Json" - "System.Net.HttpListener" - "System.Net.Mail" - "System.Net.NameResolution" - "System.Net.NetworkInformation" - "System.Net.Ping" - "System.Net.Primitives" - "System.Net.Requests" - "System.Net.Security" - "System.Net.ServicePoint" - "System.Net.Sockets" - "System.Net.WebClient" - "System.Net.WebHeaderCollection" - "System.Net.WebProxy" - "System.Net.WebSockets.Client" - "System.Net.WebSockets" - "System.Numerics" - "System.Numerics.Vectors" - "System.ObjectModel" - "System.Reflection.DispatchProxy" - "System.Reflection" - "System.Reflection.Emit" - "System.Reflection.Emit.ILGeneration" - "System.Reflection.Emit.Lightweight" - "System.Reflection.Extensions" - "System.Reflection.Metadata" - "System.Reflection.Primitives" - "System.Reflection.TypeExtensions" - "System.Resources.Reader" - "System.Resources.ResourceManager" - "System.Resources.Writer" - "System.Runtime.CompilerServices.Unsafe" - "System.Runtime.CompilerServices.VisualC" - "System.Runtime" - "System.Runtime.Extensions" - "System.Runtime.Handles" - "System.Runtime.InteropServices" - "System.Runtime.InteropServices.RuntimeInformation" - "System.Runtime.Intrinsics" - "System.Runtime.Loader" - "System.Runtime.Numerics" - "System.Runtime.Serialization" - "System.Runtime.Serialization.Formatters" - "System.Runtime.Serialization.Json" - "System.Runtime.Serialization.Primitives" - "System.Runtime.Serialization.Xml" - "System.Security.Claims" - "System.Security.Cryptography.Algorithms" - "System.Security.Cryptography.Csp" - "System.Security.Cryptography.Encoding" - "System.Security.Cryptography.Primitives" - "System.Security.Cryptography.X509Certificates" - "System.Security" - "System.Security.Principal" - "System.Security.SecureString" - "System.ServiceModel.Web" - "System.ServiceProcess" - "System.Text.Encoding.CodePages" - "System.Text.Encoding" - "System.Text.Encoding.Extensions" - "System.Text.Encodings.Web" - "System.Text.Json" - "System.Text.RegularExpressions" - "System.Threading.Channels" - "System.Threading" - "System.Threading.Overlapped" - "System.Threading.Tasks.Dataflow" - "System.Threading.Tasks" - "System.Threading.Tasks.Extensions" - "System.Threading.Tasks.Parallel" - "System.Threading.Thread" - "System.Threading.ThreadPool" - "System.Threading.Timer" - "System.Transactions" - "System.Transactions.Local" - "System.ValueTuple" - "System.Web" - "System.Web.HttpUtility" - "System.Windows" - "System.Xml" - "System.Xml.Linq" - "System.Xml.ReaderWriter" - "System.Xml.Serialization" - "System.Xml.XDocument" - "System.Xml.XmlDocument" - "System.Xml.XmlSerializer" - "System.Xml.XPath" - "System.Xml.XPath.XDocument" - "WindowsBase" + yield "mscorlib" + yield "netstandard" + yield "System" + yield getFSharpCoreLibraryName + yield "FSharp.Compiler.Interactive.Settings" + yield "Microsoft.CSharp" + yield "Microsoft.VisualBasic" + yield "Microsoft.VisualBasic.Core" + yield "Microsoft.Win32.Primitives" + yield "Microsoft.Win32.Registry" + yield "System.AppContext" + yield "System.Buffers" + yield "System.Collections" + yield "System.Collections.Concurrent" + yield "System.Collections.Immutable" + yield "System.Collections.NonGeneric" + yield "System.Collections.Specialized" + yield "System.ComponentModel" + yield "System.ComponentModel.Annotations" + yield "System.ComponentModel.DataAnnotations" + yield "System.ComponentModel.EventBasedAsync" + yield "System.ComponentModel.Primitives" + yield "System.ComponentModel.TypeConverter" + yield "System.Configuration" + yield "System.Console" + yield "System.Core" + yield "System.Data" + yield "System.Data.Common" + yield "System.Data.DataSetExtensions" + yield "System.Deployment" + yield "System.Design" + yield "System.Diagnostics.Contracts" + yield "System.Diagnostics.Debug" + yield "System.Diagnostics.DiagnosticSource" + yield "System.Diagnostics.FileVersionInfo" + yield "System.Diagnostics.Process" + yield "System.Diagnostics.StackTrace" + yield "System.Diagnostics.TextWriterTraceListener" + yield "System.Diagnostics.Tools" + yield "System.Diagnostics.TraceSource" + yield "System.Diagnostics.Tracing" + yield "System.Drawing" + yield "System.Drawing.Primitives" + yield "System.Dynamic.Runtime" + yield "System.Formats.Asn1" + yield "System.Globalization" + yield "System.Globalization.Calendars" + yield "System.Globalization.Extensions" + yield "System.IO" + yield "System.IO.Compression" + yield "System.IO.Compression.Brotli" + yield "System.IO.Compression.FileSystem" + yield "System.IO.Compression.ZipFile" + yield "System.IO.FileSystem" + yield "System.IO.FileSystem.DriveInfo" + yield "System.IO.FileSystem.Primitives" + yield "System.IO.FileSystem.Watcher" + yield "System.IO.IsolatedStorage" + yield "System.IO.MemoryMappedFiles" + yield "System.IO.Pipes" + yield "System.IO.UnmanagedMemoryStream" + yield "System.Linq" + yield "System.Linq.Expressions" + yield "System.Linq.Expressions" + yield "System.Linq.Parallel" + yield "System.Linq.Queryable" + yield "System.Memory" + yield "System.Messaging" + yield "System.Net" + yield "System.Net.Http" + yield "System.Net.Http.Json" + yield "System.Net.HttpListener" + yield "System.Net.Mail" + yield "System.Net.NameResolution" + yield "System.Net.NetworkInformation" + yield "System.Net.Ping" + yield "System.Net.Primitives" + yield "System.Net.Requests" + yield "System.Net.Security" + yield "System.Net.ServicePoint" + yield "System.Net.Sockets" + yield "System.Net.WebClient" + yield "System.Net.WebHeaderCollection" + yield "System.Net.WebProxy" + yield "System.Net.WebSockets" + yield "System.Net.WebSockets.Client" + yield "System.Numerics" + yield "System.Numerics.Vectors" + yield "System.ObjectModel" + yield "System.Observable" + yield "System.Private.Uri" + yield "System.Reflection" + yield "System.Reflection.DispatchProxy" + yield "System.Reflection.Emit" + yield "System.Reflection.Emit.ILGeneration" + yield "System.Reflection.Emit.Lightweight" + yield "System.Reflection.Extensions" + yield "System.Reflection.Metadata" + yield "System.Reflection.Primitives" + yield "System.Reflection.TypeExtensions" + yield "System.Resources.Reader" + yield "System.Resources.ResourceManager" + yield "System.Resources.Writer" + yield "System.Runtime" + yield "System.Runtime.CompilerServices.Unsafe" + yield "System.Runtime.CompilerServices.VisualC" + yield "System.Runtime.Extensions" + yield "System.Runtime.Handles" + yield "System.Runtime.InteropServices" + yield "System.Runtime.InteropServices.PInvoke" + yield "System.Runtime.InteropServices.RuntimeInformation" + yield "System.Runtime.InteropServices.WindowsRuntime" + yield "System.Runtime.Intrinsics" + yield "System.Runtime.Loader" + yield "System.Runtime.Numerics" + yield "System.Runtime.Remoting" + yield "System.Runtime.Serialization" + yield "System.Runtime.Serialization.Formatters" + yield "System.Runtime.Serialization.Formatters.Soap" + yield "System.Runtime.Serialization.Json" + yield "System.Runtime.Serialization.Primitives" + yield "System.Runtime.Serialization.Xml" + yield "System.Security" + yield "System.Security.Claims" + yield "System.Security.Cryptography.Algorithms" + yield "System.Security.Cryptography.Cng" + yield "System.Security.Cryptography.Csp" + yield "System.Security.Cryptography.Encoding" + yield "System.Security.Cryptography.OpenSsl" + yield "System.Security.Cryptography.Primitives" + yield "System.Security.Cryptography.X509Certificates" + yield "System.Security.Principal" + yield "System.Security.Principal.Windows" + yield "System.Security.SecureString" + yield "System.ServiceModel.Web" + yield "System.ServiceProcess" + yield "System.Text.Encoding" + yield "System.Text.Encoding.CodePages" + yield "System.Text.Encoding.Extensions" + yield "System.Text.Encodings.Web" + yield "System.Text.Json" + yield "System.Text.RegularExpressions" + yield "System.Threading" + yield "System.Threading.Channels" + yield "System.Threading.Overlapped" + yield "System.Threading.Tasks" + yield "System.Threading.Tasks.Dataflow" + yield "System.Threading.Tasks.Extensions" + yield "System.Threading.Tasks.Parallel" + yield "System.Threading.Thread" + yield "System.Threading.ThreadPool" + yield "System.Threading.Timer" + yield "System.Transactions" + yield "System.Transactions.Local" + yield "System.ValueTuple" + yield "System.Web" + yield "System.Web.HttpUtility" + yield "System.Web.Services" + yield "System.Windows" + yield "System.Windows.Forms" + yield "System.Xml" + yield "System.Xml.Linq" + yield "System.Xml.ReaderWriter" + yield "System.Xml.Serialization" + yield "System.Xml.XDocument" + yield "System.Xml.XmlDocument" + yield "System.Xml.XmlSerializer" + yield "System.Xml.XPath" + yield "System.Xml.XPath.XDocument" + yield "WindowsBase" ] // The set of references entered into the TcConfigBuilder for scripts prior to computing the load closure. diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index d8755259923..a107e214450 100644 --- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -20,7 +20,7 @@ FSharp.Compiler.Service.nuspec true The F# Compiler Services package For F# $(FSLanguageVersion) exposes additional functionality for implementing F# language bindings, additional tools based on the compiler or refactoring tools. The package also includes F# interactive service that can be used for embedding F# scripting into your applications. Contains code from the F# Software Foundation. - /blob/main/release-notes.md#FSharp-Compiler-Service-$(FSharpCompilerServiceReleaseNotesVersion) + https://github.com/dotnet/fsharp/blob/main/release-notes.md#FSharp-Compiler-Service-$(FSharpCompilerServiceReleaseNotesVersion) F#, fsharp, interactive, compiler, editor $(MSBuildThisFileDirectory)logo.png 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 e7d9d79f34d..6a6911e5b73 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj @@ -71,6 +71,11 @@ ParserTests.fs + Program.fs