FSF - FSharp.Compiler.Service (34.0)

nightroman · Jan 23, 2020 · 180c370 · 180c370
1 parent 405b286
commit 180c370
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 16 deletions.
diff --git a/FSharpFar/.build.ps1 b/FSharpFar/.build.ps1
@@ -49,8 +49,14 @@ task Clean {
 }
 
 task Markdown {
-	function Convert-Markdown($Name) {pandoc.exe --standalone --from=gfm "--output=$Name.htm" "--metadata=pagetitle=$Name" "$Name.md"}
-	exec { Convert-Markdown README }
+	assert (Test-Path $env:MarkdownCss)
+	exec { pandoc.exe @(
+		'README.md'
+		'--output=README.htm'
+		'--from=gfm'
+		'--self-contained', "--css=$env:MarkdownCss"
+		'--standalone', "--metadata=pagetitle=$ModuleName"
+	)}
 }
 
 task Version {
@@ -74,38 +80,39 @@ task Meta -Inputs .build.ps1, History.txt -Outputs src/Directory.Build.props -Jo
 }
 
 task Package Markdown, {
-	$toHome = "z\tools\FarHome"
-	$toFarNet = "z\tools\FarHome\FarNet"
-	$toModule = "$toHome\FarNet\Modules\$ModuleName"
+	$toModule = "z\tools\FarHome\FarNet\Modules\$ModuleName"
 	$fromModule = "$FarHome\FarNet\Modules\$ModuleName"
 
 	remove z
 	$null = mkdir $toModule
 
-	Copy-Item -Destination $toHome @(
+	# package: logo
+	Copy-Item -Destination z ..\Zoo\FarNetLogo.png
+
+	# FarHome: required here by FCS, available for F# modules
+	Copy-Item -Destination "z\tools\FarHome" @(
 		"$FarHome\FSharp.Core.dll"
 		"$FarHome\FSharp.Core.optdata"
 		"$FarHome\FSharp.Core.sigdata"
 	)
 
-	Copy-Item -Destination $toFarNet @(
+	# FarNet: available for F# modules
+	Copy-Item -Destination "z\tools\FarHome\FarNet" @(
 		"$FarHome\FarNet\FarNet.FSharp.dll"
 		"$FarHome\FarNet\FarNet.FSharp.xml"
 	)
 
+	# module
 	Copy-Item -Destination $toModule @(
 		'README.htm'
 		'History.txt'
 		'LICENSE.txt'
 		"$fromModule\$ModuleName.dll"
 		"$fromModule\FSharp.Compiler.Service.dll"
+		"$fromModule\System.Buffers.dll"
 		"$fromModule\System.Reflection.Metadata.dll"
 		"$fromModule\System.ValueTuple.dll"
 	)
-
-	# icon
-	$null = mkdir z\images
-	Copy-Item ..\Zoo\FarNetLogo.png z\images
 }
 
 #! dotnet made assembly: FileVersion is null (@1); so we used this command:
@@ -137,7 +144,7 @@ https://raw.githubusercontent.com/nightroman/FarNet/master/Install-FarNet.en.txt
 		<authors>Roman Kuzmin</authors>
 		<owners>Roman Kuzmin</owners>
 		<projectUrl>https://github.com/nightroman/FarNet/tree/master/FSharpFar</projectUrl>
-		<icon>images\FarNetLogo.png</icon>
+		<icon>FarNetLogo.png</icon>
 		<license type="expression">BSD-3-Clause</license>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<summary>$text</summary>

diff --git a/FSharpFar/History.txt b/FSharpFar/History.txt
@@ -2,6 +2,10 @@ https://www.nuget.org/packages/FarNet.FSharpFar
 Far Manager 3.0.5048
 FarNet 5.2.20
 
+= 1.9.13 =
+
+FSharp.Compiler.Service (34.0)
+
 = 1.9.12 =
 
 FSharp.Compiler.Service (33.0.1)

diff --git a/FSharpFar/LICENSE.txt b/FSharpFar/LICENSE.txt
@@ -1,5 +1,5 @@
 FarNet module FSharpFar for Far Manager
-Copyright (c) 2016-2019 Roman Kuzmin
+Copyright (c) 2016-2020 Roman Kuzmin
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/FSharpFar/paket.lock b/FSharpFar/paket.lock
@@ -3,12 +3,14 @@ COPY-LOCAL: FALSE
 RESTRICTION: == net461
 NUGET
   remote: https://www.nuget.org/api/v2
-    FSharp.Compiler.Service (33.0.1)
+    FSharp.Compiler.Service (34.0)
       FSharp.Core (>= 4.6.2)
+      System.Buffers (>= 4.5)
       System.Collections.Immutable (>= 1.5)
       System.Reflection.Metadata (>= 1.6)
       System.ValueTuple (>= 4.4)
     FSharp.Core (4.7)
+    System.Buffers (4.5)
     System.Collections.Immutable (1.5)
     System.Reflection.Metadata (1.6)
       System.Collections.Immutable (>= 1.5)

diff --git a/FSharpFar/src/FSharpFar/FSharpFar.fsproj b/FSharpFar/src/FSharpFar/FSharpFar.fsproj
@@ -68,6 +68,7 @@
     <Delete Files="$(MyOutDir)\$(AssemblyName).pdb" Condition="'$(Configuration)' == 'Release'" />
     <Copy DestinationFolder="$(MyOutDir)" SkipUnchangedFiles="true" SourceFiles="..\..\packages\FSharp.Compiler.Service\lib\$(TargetFramework)\FSharp.Compiler.Service.dll; ..\..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll" />
     <Copy DestinationFolder="$(MyOutDir)" SkipUnchangedFiles="true" SourceFiles="..\..\packages\System.ValueTuple\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll" />
+    <Copy DestinationFolder="$(MyOutDir)" SkipUnchangedFiles="true" SourceFiles="..\..\packages\System.Buffers\lib\netstandard2.0\System.Buffers.dll" />
     <Copy DestinationFolder="$(FarHome)" SkipUnchangedFiles="true" SourceFiles="..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll; ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.optdata; ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.sigdata" />
   </Target>
 </Project>
diff --git a/Install-FarNet.en.txt b/Install-FarNet.en.txt
@@ -20,7 +20,7 @@ Far Manager
 
 Microsoft Visual C++ 2008 SP1 Redistributable Package (x64) or (x86)
 
-	The links keeps changing, so search for it...
+	Search the internet, sources may change.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 = DOWNLOAD AND INSTALL WITH PowerShell v2.0+ =

diff --git a/Install-FarNet.ru.txt b/Install-FarNet.ru.txt
@@ -19,7 +19,7 @@ Far Manager
 
 Microsoft Visual C++ 2008 SP1 Redistributable Package (x64) or (x86)
 
-	The links keeps changing, so search for it...
+	Найдите в интернете, источники могут меняться.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 = ЗАГРУЗКА И УСТАНОВКА С ПОМОЩЬЮ PowerShell v2.0+ =