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

Commit85674e1

Browse files
committed
fix mono build
1 parent21f055c commit85674e1

File tree

34 files changed

+222
-340
lines changed

34 files changed

+222
-340
lines changed

‎CHANGELOG-fsharp.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
4.1.31
2+
* Integrate visualfsharp master to 31ec0e0fb
3+
* Remove .NET Core version of compiler in FSharp.Compiler.Tools (now only for .NET Framework and Mono)
4+
5+
4.1.30
6+
* Integrate visualfsharp master to 94c7fe1f15811d9c57c26d49cc2309883b83d338
7+
18
4.1.29
29
* Integrate visualfsharp master to d903cf6277e40646563f24bbe2790e8a292d5f9b
310

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
FSharp.Compiler.Tools built by F# Software Foundation
1717
This package includes the F# compiler and the F# Interactive.
1818
</description>
19-
<summary>FSharp.Compiler.Tools for F# 4.1 - This package includes the F# compiler andtheF# Interactive.</summary>
19+
<summary>FSharp.Compiler.Tools for F# 4.1 - This package includes the F# compiler and F# Interactive.</summary>
2020
<tags>F#, FSharp, FSharp.Core, fsi, fsc</tags>
2121
</metadata>
2222
<files>
@@ -58,16 +58,5 @@
5858
<!-- Microsoft.Portable.FSharp.Targets: imported by project templates-->
5959
<filesrc="..\Release\net40\bin\Microsoft.Portable.FSharp.targets"target="tools\Microsoft.Portable.FSharp.Targets" />
6060

61-
<filesrc="..\Release\net40\bin\Microsoft.Build.dll"target="tools\Microsoft.Build.dll" />
62-
<filesrc="..\Release\net40\bin\Microsoft.Build.Engine.dll"target="tools\Microsoft.Build.Engine.dll" />
63-
<filesrc="..\Release\net40\bin\Microsoft.Build.Framework.dll"target="tools\Microsoft.Build.Framework.dll" />
64-
<filesrc="..\Release\net40\bin\Microsoft.Build.Tasks.v12.0.dll"target="tools\Microsoft.Build.Tasks.v12.0.dll" />
65-
<filesrc="..\Release\net40\bin\Microsoft.Build.Utilities.v12.0.dll"target="tools\Microsoft.Build.Utilities.v12.0.dll" />
66-
67-
<!-- Add fsc published as framework dependent netcoreapp-->
68-
<filesrc="..\Release\netcoreapp1.0\bin\**"target="build\netcoreapp1.0" />
69-
<!-- Add auto-imported props to locate fsc and FSharp.Build-->
70-
<filesrc=".\build\FSharp.Compiler.Tools.props"target="build\FSharp.Compiler.Tools.props" />
71-
<filesrc=".\buildCrossTargeting\FSharp.Compiler.Tools.props"target="buildCrossTargeting\FSharp.Compiler.Tools.props" />
7261
</files>
7362
</package>

‎FSharp.Compiler.Tools.Nuget/build/FSharp.Compiler.Tools.props‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎FSharp.Compiler.Tools.Nuget/build/netcoreapp1.0/fsc.deps.json‎

Lines changed: 0 additions & 101 deletions
This file was deleted.

‎FSharp.Compiler.Tools.Nuget/build/netcoreapp1.0/fsc.runtimeconfig.json‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎FSharp.Compiler.Tools.Nuget/buildCrossTargeting/FSharp.Compiler.Tools.props‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎FSharp.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Tests.FSharpSuite",
3131
EndProject
3232
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.UnitTests","tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj","{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
3333
EndProject
34-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
34+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.Unittests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Compiler","Compiler","{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
3737
EndProject

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include$(topsrcdir)mono/config.make
22

3-
.PHONY: restore
3+
.PHONY: restore build
44

55
restore:
66
MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config
@@ -27,7 +27,7 @@ build:
2727
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
2828
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
2929
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
30-
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
30+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj
3131
mkdir -p$(Configuration)/fsharp30/net40/bin
3232
mkdir -p$(Configuration)/fsharp31/net40/bin
3333
mkdir -p$(Configuration)/fsharp40/net40/bin

‎appveyor.yml‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
1-
os:Visual Studio 2015
2-
3-
environment:
4-
CLI_VERSION:1.0.0-preview2-003156
5-
6-
install:
7-
-ps:$env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
8-
-ps:mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
9-
-ps:Invoke-WebRequest -Uri "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
10-
-ps:'& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version $env:CLI_VERSION -InstallDir $env:DOTNET_INSTALL_DIR'
11-
-ps:$env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
1+
os:Visual Studio 2017
122

133
init:
144
-git config --global core.autocrlf input
155

166
build_script:
177
-cmd:dotnet --info
188
-cmd:build.bat
19-
-cmd:build-netcore.bat
209
-ps:.\mono\appveyor.ps1
2110

2211
test:off

‎build-everything.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@
5454
<!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++-->
5555

5656
<ItemGroupCondition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" >
57-
<ProjectsWithNet40Include="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>
57+
<ProjectsWithNet40Include="tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj"/>
5858
<ProjectsWithNet40Include="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
5959
</ItemGroup>
6060

6161
<ItemGroupCondition="'$(TEST_CORECLR_COREUNIT_SUITE)'=='1'">
62-
<ProjectsWithCoreClrInclude="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>
62+
<ProjectsWithCoreClrInclude="tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj"/>
6363
<ProjectsWithCoreClrInclude="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
6464
</ItemGroup>
6565

0 commit comments

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