diff --git a/fcs/Directory.Build.props b/fcs/Directory.Build.props index 7988ee2f36..abee855626 100644 --- a/fcs/Directory.Build.props +++ b/fcs/Directory.Build.props @@ -32,6 +32,6 @@ $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools fsi.exe 4.6.2 - net461 + net472 diff --git a/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj b/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj index 9e3ecf6a10..c50caf98fa 100644 --- a/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj +++ b/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj @@ -29,5 +29,7 @@ + + \ No newline at end of file diff --git a/fcs/FSharp.Compiler.Service.Tests/CSharp_Analysis/CSharp_Analysis.csproj b/fcs/FSharp.Compiler.Service.Tests/CSharp_Analysis/CSharp_Analysis.csproj index 6bded08333..0930f725c7 100644 --- a/fcs/FSharp.Compiler.Service.Tests/CSharp_Analysis/CSharp_Analysis.csproj +++ b/fcs/FSharp.Compiler.Service.Tests/CSharp_Analysis/CSharp_Analysis.csproj @@ -1,7 +1,7 @@  - net461;netstandard2.0 + net472;netstandard2.0 $(FcsTargetNetFxFramework);netstandard2.0 false $(NoWarn);0067;1591 diff --git a/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj index 7f3b33ad92..18520ae615 100644 --- a/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj +++ b/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj @@ -106,6 +106,8 @@ + + \ No newline at end of file diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index 2264357ff1..0c22bd1577 100644 --- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -294,7 +294,7 @@ ReferenceResolution/ReferenceResolver.fs - + ReferenceResolution/SimulatedMSBuildReferenceResolver.fs @@ -739,6 +739,10 @@ + + + + diff --git a/fcs/RELEASE_NOTES.md b/fcs/RELEASE_NOTES.md index a369172506..f3b894abdb 100644 --- a/fcs/RELEASE_NOTES.md +++ b/fcs/RELEASE_NOTES.md @@ -1,3 +1,8 @@ +#### 37.0.1 + +This release is a packaging fix release that updates the .Net Framework TFM requirement from 4.6.1 to 4.7.2, to be +in line with the new dependencies on Microsoft.Build.Framework, Microsoft.Build.Tasks.Core and Microsoft.Build.Utilities.Core + #### 37.0.0 This release bring a number of new changes, including a massive enhancement to SemanticClassification types thanks to @cartermp. diff --git a/fcs/docsrc/content/ja/compiler.fsx b/fcs/docsrc/content/ja/compiler.fsx index 5b2885fac7..fbb7f9a1e5 100644 --- a/fcs/docsrc/content/ja/compiler.fsx +++ b/fcs/docsrc/content/ja/compiler.fsx @@ -8,7 +8,7 @@ language: ja --- *) (*** hide ***) -#I "../../../../artifacts/bin/fcs/Release/net461" +#I "../../../../artifacts/bin/fcs/Release/net472" (** コンパイラの組み込み ==================== diff --git a/fcs/docsrc/content/ja/corelib.fsx b/fcs/docsrc/content/ja/corelib.fsx index 31b9ab2a42..044842b01a 100644 --- a/fcs/docsrc/content/ja/corelib.fsx +++ b/fcs/docsrc/content/ja/corelib.fsx @@ -8,7 +8,7 @@ language: ja --- *) (*** hide ***) -#I "../../../../artifacts/bin/fcs/net461" +#I "../../../../artifacts/bin/fcs/net472" (** コンパイラサービス: FSharp.Core.dll についてのメモ ================================================== diff --git a/fcs/docsrc/content/ja/editor.fsx b/fcs/docsrc/content/ja/editor.fsx index 70da7c6c5f..0c3a58a961 100644 --- a/fcs/docsrc/content/ja/editor.fsx +++ b/fcs/docsrc/content/ja/editor.fsx @@ -9,7 +9,7 @@ language: ja *) (*** hide ***) -#I "../../../../artifacts/bin/fcs/Release/net461" +#I "../../../../artifacts/bin/fcs/Release/net472" (** コンパイラサービス: エディタサービス ==================================== diff --git a/fcs/docsrc/content/ja/filesystem.fsx b/fcs/docsrc/content/ja/filesystem.fsx index 9157ffd1d0..fd11fcfb38 100644 --- a/fcs/docsrc/content/ja/filesystem.fsx +++ b/fcs/docsrc/content/ja/filesystem.fsx @@ -8,7 +8,7 @@ language: ja --- *) (*** hide ***) -#I "../../../../artifacts/bin/fcs/Release/net461" +#I "../../../../artifacts/bin/fcs/Release/net472" (** コンパイラサービス: ファイルシステム仮想化 ========================================== diff --git a/fcs/docsrc/content/ja/interactive.fsx b/fcs/docsrc/content/ja/interactive.fsx index 34e86dc27e..7fbf3bdbe2 100644 --- a/fcs/docsrc/content/ja/interactive.fsx +++ b/fcs/docsrc/content/ja/interactive.fsx @@ -8,7 +8,7 @@ language: ja --- *) (*** hide ***) -#I "../../../../artifacts/bin/fcs/Release/net461" +#I "../../../../artifacts/bin/fcs/Release/net472" (** インタラクティブサービス: F# Interactiveの組み込み ================================================== diff --git a/fcs/docsrc/content/ja/project.fsx b/fcs/docsrc/content/ja/project.fsx index 2cfc847f48..7a4874a9ef 100644 --- a/fcs/docsrc/content/ja/project.fsx +++ b/fcs/docsrc/content/ja/project.fsx @@ -8,7 +8,7 @@ language: ja --- *) (*** hide ***) -#I "../../../../artifacts/bin/fcs/Release/net461" +#I "../../../../artifacts/bin/fcs/Release/net472" (** コンパイラサービス: プロジェクトの分析 ====================================== diff --git a/fcs/docsrc/content/ja/symbols.fsx b/fcs/docsrc/content/ja/symbols.fsx index 84bac9e137..45b4a2c586 100644 --- a/fcs/docsrc/content/ja/symbols.fsx +++ b/fcs/docsrc/content/ja/symbols.fsx @@ -8,7 +8,7 @@ language: ja --- *) (*** hide ***) -#I "../../../../artifacts/bin/fcs/Release/net461" +#I "../../../../artifacts/bin/fcs/Release/net472" (** コンパイラサービス: シンボルの処理 ================================== diff --git a/fcs/docsrc/content/ja/tokenizer.fsx b/fcs/docsrc/content/ja/tokenizer.fsx index 6731501088..11c2396b17 100644 --- a/fcs/docsrc/content/ja/tokenizer.fsx +++ b/fcs/docsrc/content/ja/tokenizer.fsx @@ -8,7 +8,7 @@ language: ja --- *) (*** hide ***) -#I "../../../../artifacts/bin/fcs/Release/net461" +#I "../../../../artifacts/bin/fcs/Release/net472" (** コンパイラサービス:F#トークナイザを使用する ============================================ diff --git a/fcs/docsrc/content/ja/untypedtree.fsx b/fcs/docsrc/content/ja/untypedtree.fsx index a558bf132a..3408320125 100644 --- a/fcs/docsrc/content/ja/untypedtree.fsx +++ b/fcs/docsrc/content/ja/untypedtree.fsx @@ -8,7 +8,7 @@ language: ja --- *) (*** hide ***) -#I "../../../../artifacts/bin/fcs/Release/net461" +#I "../../../../artifacts/bin/fcs/Release/net472" (** コンパイラサービス:型無し構文木の処理 ====================================== diff --git a/tests/service/AssemblyContentProviderTests.fs b/tests/service/AssemblyContentProviderTests.fs index c80842d9f8..2063d5edf7 100644 --- a/tests/service/AssemblyContentProviderTests.fs +++ b/tests/service/AssemblyContentProviderTests.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/AssemblyReaderShim.fs b/tests/service/AssemblyReaderShim.fs index 71ad67809d..1fee2cda10 100644 --- a/tests/service/AssemblyReaderShim.fs +++ b/tests/service/AssemblyReaderShim.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/CSharpProjectAnalysis.fs b/tests/service/CSharpProjectAnalysis.fs index 5c0d2474b9..e35cc599b7 100644 --- a/tests/service/CSharpProjectAnalysis.fs +++ b/tests/service/CSharpProjectAnalysis.fs @@ -1,8 +1,8 @@  #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive #r "../../bin/v4.5/CSharp_Analysis.dll" -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/EditorTests.fs b/tests/service/EditorTests.fs index 6c50d1e890..b3e1eb5683 100644 --- a/tests/service/EditorTests.fs +++ b/tests/service/EditorTests.fs @@ -19,8 +19,8 @@ // Use F# Interactive. This only works for FSHarp.Compiler.Service.dll which has a public API #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/ExprTests.fs b/tests/service/ExprTests.fs index 0d20a9a26a..b2890cfcbd 100644 --- a/tests/service/ExprTests.fs +++ b/tests/service/ExprTests.fs @@ -1,7 +1,7 @@  #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/FileSystemTests.fs b/tests/service/FileSystemTests.fs index 59bb29f055..5833e5b68b 100644 --- a/tests/service/FileSystemTests.fs +++ b/tests/service/FileSystemTests.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/FscTests.fs b/tests/service/FscTests.fs index bcd1cb2cba..0fef5be242 100644 --- a/tests/service/FscTests.fs +++ b/tests/service/FscTests.fs @@ -1,7 +1,7 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/FsiTests.fs b/tests/service/FsiTests.fs index 39ff624fbf..081dbfd2ae 100644 --- a/tests/service/FsiTests.fs +++ b/tests/service/FsiTests.fs @@ -1,7 +1,7 @@  #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/InteractiveCheckerTests.fs b/tests/service/InteractiveCheckerTests.fs index f03127bb8a..7e53a4493a 100644 --- a/tests/service/InteractiveCheckerTests.fs +++ b/tests/service/InteractiveCheckerTests.fs @@ -1,7 +1,7 @@  #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/MultiProjectAnalysisTests.fs b/tests/service/MultiProjectAnalysisTests.fs index 9ee1f798ba..1629eb4326 100644 --- a/tests/service/MultiProjectAnalysisTests.fs +++ b/tests/service/MultiProjectAnalysisTests.fs @@ -1,7 +1,7 @@  #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/PerfTests.fs b/tests/service/PerfTests.fs index ffffa412a3..208c41b54a 100644 --- a/tests/service/PerfTests.fs +++ b/tests/service/PerfTests.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/ProjectAnalysisTests.fs b/tests/service/ProjectAnalysisTests.fs index 110db85e4f..5c774f5f75 100644 --- a/tests/service/ProjectAnalysisTests.fs +++ b/tests/service/ProjectAnalysisTests.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/ScriptOptionsTests.fs b/tests/service/ScriptOptionsTests.fs index a43731db32..ba40dde511 100644 --- a/tests/service/ScriptOptionsTests.fs +++ b/tests/service/ScriptOptionsTests.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/ServiceUntypedParseTests.fs b/tests/service/ServiceUntypedParseTests.fs index 18c7f7318d..6d078dfe93 100644 --- a/tests/service/ServiceUntypedParseTests.fs +++ b/tests/service/ServiceUntypedParseTests.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/StructureTests.fs b/tests/service/StructureTests.fs index 028e05e4b3..293777cb81 100644 --- a/tests/service/StructureTests.fs +++ b/tests/service/StructureTests.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/Symbols.fs b/tests/service/Symbols.fs index b0932e9075..b450b7fd6b 100644 --- a/tests/service/Symbols.fs +++ b/tests/service/Symbols.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/TokenizerTests.fs b/tests/service/TokenizerTests.fs index 6dea464054..8fb6be0ee8 100644 --- a/tests/service/TokenizerTests.fs +++ b/tests/service/TokenizerTests.fs @@ -1,7 +1,7 @@  #if INTERACTIVE -#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net472/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else