diff --git a/DEVGUIDE.md b/DEVGUIDE.md index f3b388c164..b1fc999f49 100644 --- a/DEVGUIDE.md +++ b/DEVGUIDE.md @@ -170,7 +170,7 @@ For **Release**: 1. The `update.cmd` script adds required strong name validation skips, and NGens the compiler and libraries. This requires admin privileges. 1. The compiler binaries produced are "private" and strong-named signed with a test key. -1. Some additional tools are required to build the compiler, notably `fslex.exe`, `fsyacc.exe`, `FSharp.PowerPack.Build.Tasks.dll`, `FsSrGen.exe`, `FSharp.SRGen.Build.Tasks.dll`, and the other tools found in the `lkg` directory. +1. Some additional tools are required to build the compiler, notably `fslex.exe`, `fsyacc.exe`, `FSharp.PowerPack.Build.Tasks.dll` and the other tools found in the `lkg` directory. 1. The overall bootstrapping process executes as follows - We first need an existing F# compiler. We use the one in the `lkg` directory. Let's assume this compiler has an `FSharp.Core.dll` with version X. - We use this compiler to compile the source in this distribution, to produce a "proto" compiler, dropped to the `proto` directory. When run, this compiler still relies on `FSharp.Core.dll` with version X. diff --git a/lkg/FSharp-14.0.23413.0/bin/FSharp.Core/README.txt b/lkg/FSharp-14.0.23413.0/bin/FSharp.Core/README.txt index 3291a21e72..7843fe1dd6 100644 --- a/lkg/FSharp-14.0.23413.0/bin/FSharp.Core/README.txt +++ b/lkg/FSharp-14.0.23413.0/bin/FSharp.Core/README.txt @@ -1,3 +1,3 @@ -The copy of FSharp.Core in this directory is version 2.0.50726.900, required by FSharp.SRGen.Build.Tasks.dll and other legacy Power Pack libraries in the parent directory. +The copy of FSharp.Core in this directory is version 2.0.50726.900, required by legacy Power Pack libraries in the parent directory. This copy of FSharp.Core.dll should not be referenced as an LKG, it is present merely as a workaround to enable the legacy libraries to work without needing to update the GAC. \ No newline at end of file diff --git a/lkg/FSharp-14.0.23413.0/bin/FSharp.SRGen.Build.Tasks.dll b/lkg/FSharp-14.0.23413.0/bin/FSharp.SRGen.Build.Tasks.dll deleted file mode 100644 index 9556f1b30e..0000000000 Binary files a/lkg/FSharp-14.0.23413.0/bin/FSharp.SRGen.Build.Tasks.dll and /dev/null differ diff --git a/lkg/FSharp-14.0.23413.0/bin/FSharp.SRGen.targets b/lkg/FSharp-14.0.23413.0/bin/FSharp.SRGen.targets deleted file mode 100644 index 5e9362cdd2..0000000000 --- a/lkg/FSharp-14.0.23413.0/bin/FSharp.SRGen.targets +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - ProcessFsSrGen;$(PrepareForBuildDependsOn) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - \ No newline at end of file diff --git a/lkg/FSharp-14.0.23413.0/bin/FindUnusedResources.exe b/lkg/FSharp-14.0.23413.0/bin/FindUnusedResources.exe deleted file mode 100644 index 3375cf2243..0000000000 Binary files a/lkg/FSharp-14.0.23413.0/bin/FindUnusedResources.exe and /dev/null differ diff --git a/lkg/FSharp-14.0.23413.0/bin/FsSrGen.exe b/lkg/FSharp-14.0.23413.0/bin/FsSrGen.exe deleted file mode 100644 index d0cc465cf8..0000000000 Binary files a/lkg/FSharp-14.0.23413.0/bin/FsSrGen.exe and /dev/null differ diff --git a/packages.config b/packages.config index 14439234ef..299102cd42 100644 --- a/packages.config +++ b/packages.config @@ -12,6 +12,7 @@ - + + diff --git a/src/FSharpSource.Settings.targets b/src/FSharpSource.Settings.targets index ccc53d04c9..1f10e32f6f 100644 --- a/src/FSharpSource.Settings.targets +++ b/src/FSharpSource.Settings.targets @@ -93,7 +93,6 @@ $(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin - $(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin $(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin $(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin fsi.exe diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets index 6d725547f9..c213789708 100644 --- a/src/FSharpSource.targets +++ b/src/FSharpSource.targets @@ -132,6 +132,9 @@ 2.0.3 2.0.3.0 $(FSharpSourcesRoot)\..\packages\FsCheck.$(FsCheckVersion)\lib\ + 3.0.0 + 3.0.0 + $(FSharpSourcesRoot)\..\packages\fssrgen.$(FsSrGenVersion)\lib\net46 @@ -230,6 +233,7 @@ $(DefineConstants);NO_LOADER_OPTIMIZATION $(DefineConstants);SILVERLIGHT_COMPILER_FSHARP_CORE $(DefineConstants);I_DONT_KNOW_HOW_TO_DO_THIS_YET + $(DefineConstants);NETSTANDARD1_5 profile7 false @@ -826,7 +830,6 @@ ValidateConfiguration;$(CompileDependsOn);CustomCopyLocalFiles $(OutputPath)$(AssemblyName).xml - false @@ -865,7 +868,7 @@ - + LIBRARY 58;75 false - False DEBUG;TRACE;$(DefineConstants) v4.5 true diff --git a/vsintegration/tests/unittests/Resources.MockTypeProviders/EmptyAssembly/EmptyAssembly.fsproj b/vsintegration/tests/unittests/Resources.MockTypeProviders/EmptyAssembly/EmptyAssembly.fsproj index 146a33ec40..a8ed618543 100644 --- a/vsintegration/tests/unittests/Resources.MockTypeProviders/EmptyAssembly/EmptyAssembly.fsproj +++ b/vsintegration/tests/unittests/Resources.MockTypeProviders/EmptyAssembly/EmptyAssembly.fsproj @@ -14,7 +14,6 @@ Library EmptyAssembly LIBRARY - False 58;75 false DEBUG;TRACE;$(DefineConstants)