Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3bdbbf8

Browse files
committed
update build tools to make it useful again, bump version
1 parent3800b76 commit3bdbbf8

File tree

8 files changed

+82
-3
lines changed

8 files changed

+82
-3
lines changed

‎CHANGELOG-fsharp.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
10.0.1
2+
* Switch to new versioning for F# compiler tools
3+
* add FSharp.Compiler.Tools.props back into nuget package
4+
15
4.1.34
26
* Use strong-name signed FSharp.Compiler.Interactive.Settings.dll in FSharp.Compiler.Tools package
37

‎FSharp.Compiler.Tools.Nuget/FSharp.Compiler.Tools.nuspec‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
FSharp.Compiler.Tools for F# 4.1
1515

1616
FSharp.Compiler.Tools built by F# Software Foundation
17-
This package includes the F# compiler and the F# Interactive.
17+
This package includes the F# compiler (fsc.exe), F# Interactive (fsi.exe, fsiAnyCpu.exe)
18+
and the MSBuild component (FSharp.Build.dll).
19+
20+
NOTE: the compiler executes with .NET Framework and/or Mono. It does not execute with .NET Core.
21+
For a compiler that executes with .NET Core use the .NET Core SDK, which includes an F# compiler.
1822
</description>
1923
<summary>FSharp.Compiler.Tools for F# 4.1 - This package includes the F# compiler and F# Interactive.</summary>
2024
<tags>F#, FSharp, FSharp.Core, fsi, fsc</tags>
@@ -56,6 +60,15 @@
5660
<!-- Microsoft.Portable.FSharp.targets: used in source tree-->
5761
<!-- Microsoft.Portable.FSharp.Targets: imported by project templates-->
5862
<filesrc="..\Release\net40\bin\Microsoft.Portable.FSharp.targets"target="tools\Microsoft.Portable.FSharp.Targets" />
59-
63+
<!-- Add auto-imported props to locate fsc and FSharp.Build-->
64+
<filesrc=".\build\FSharp.Compiler.Tools.props"target="build\FSharp.Compiler.Tools.props" />
65+
<filesrc=".\buildCrossTargeting\FSharp.Compiler.Tools.props"target="buildCrossTargeting\FSharp.Compiler.Tools.props" />
66+
67+
68+
<!-- Binary snapshots of FSharp.Build.dll needed to support use of FSharp.Compiler.Tools nuget with "dotnet", i.e. MSBuild-->
69+
<!-- This is because FSharp.Build.dll is not a .NET Standard component and we need different copies to plug into .NET Core MSBuild and.NET Framework MSBuild-->
70+
<filesrc=".\sdk\2.1.4\FSharp.Core.dll"target="tools\netcoreapp1.0\FSharp.Core.dll" />
71+
<filesrc=".\sdk\2.1.4\FSharp.Build.dll"target="tools\netcoreapp1.0\FSharp.Build.dll" />
72+
6073
</files>
6174
</package>
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<!--
2+
***********************************************************************************************
3+
FSharp.Compiler.Tools.props
4+
5+
WARNING: You CAN MODIFY this file, doesnt matter if you are not knowledgeable about MSBuild and
6+
without a backup copy.
7+
Incorrect changes to this file will make it impossible to load or build your projects
8+
from the command-line or the IDE.
9+
Just remove FSharp.Compiler.Tools package from nuget cache and re-restore.
10+
11+
***********************************************************************************************
12+
-->
13+
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
14+
<!-- ref https://github.com/dotnet/standard/blob/master/Microsoft.Packaging.Tools/tasks/targets/Microsoft.Packaging.Tools.targets#L12-->
15+
<!-- Condition here is a hack until https://github.com/dotnet/sdk/issues/534 is fixed-->
16+
<PropertyGroupCondition="'$(TargetFramework)' == '' and '$(TargetFrameworks)' == ''">
17+
<!-- when using the old SDK, override FSharpTargetsPath and PortableFSharpTargetsPath-->
18+
<FSharpTargetsPath>$(MSBuildThisFileDirectory)../tools/Microsoft.FSharp.Targets</FSharpTargetsPath>
19+
<PortableFSharpTargetsPath>$(MSBuildThisFileDirectory)../tools/Microsoft.Portable.FSharp.Targets</PortableFSharpTargetsPath>
20+
<FscToolPath>$(MSBuildThisFileDirectory)../tools</FscToolPath>
21+
<FscToolExe>fsc.exe</FscToolExe>
22+
<FscToolFullPath>$(MSBuildThisFileDirectory)../tools/fsc.exe</FscToolFullPath>
23+
</PropertyGroup>
24+
<Choose>
25+
<WhenCondition="'$(MSBuildRuntimeType)' == 'Core'">
26+
<PropertyGroup>
27+
<FscTaskAssemblyPath>$(MSBuildThisFileDirectory)../tools/netcoreapp1.0/FSharp.Build.dll</FscTaskAssemblyPath>
28+
</PropertyGroup>
29+
</When>
30+
<Otherwise>
31+
<PropertyGroup>
32+
<FscTaskAssemblyPath>$(MSBuildThisFileDirectory)../tools/FSharp.Build.dll</FscTaskAssemblyPath>
33+
</PropertyGroup>
34+
</Otherwise>
35+
</Choose>
36+
</Project>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!--
2+
***********************************************************************************************
3+
FSharp.Compiler.Tools.props
4+
5+
WARNING: You CAN MODIFY this file, doesnt matter if you are not knowledgeable about MSBuild and
6+
without a backup copy.
7+
Incorrect changes to this file will make it impossible to load or build your projects
8+
from the command-line or the IDE.
9+
Just remove FSharp.Compiler.Tools package from nuget cache and re-restore.
10+
11+
***********************************************************************************************
12+
-->
13+
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
14+
<!-- ref https://github.com/dotnet/standard/blob/master/Microsoft.Packaging.Tools/tasks/targets/Microsoft.Packaging.Tools.targets#L12-->
15+
<!-- Condition here is a hack until https://github.com/dotnet/sdk/issues/534 is fixed-->
16+
<PropertyGroupCondition="'$(TargetFramework)' == '' and '$(TargetFrameworks)' == ''">
17+
<FscTaskAssemblyPath>$(MSBuildThisFileDirectory)../tools/netcoreapp1.0/FSharp.Build.dll</FscTaskAssemblyPath>
18+
<FscToolPath>$(MSBuildThisFileDirectory)../tools</FscToolPath>
19+
<FscToolExe>fsc.exe</FscToolExe>
20+
<FscToolFullPath>$(MSBuildThisFileDirectory)../tools/fsc.exe</FscToolFullPath>
21+
</PropertyGroup>
22+
</Project>
260 KB
Binary file not shown.
4.17 MB
Binary file not shown.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
Contains binary snapshots of FSharp.Build.dll needed to support use of FSharp.Compiler.Tools nuget with "dotnet", i.e. MSBuild
3+
4+
This is because FSharp.Build.dll is not a .NET Standard component.

‎mono/appveyor.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# the version under development, update after a release
3-
$version='4.1.34'
3+
$version='10.0.1'
44

55
functionisVersionTag($tag){
66
$v=New-Object Version

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp