Skip to content

Commit 3c5ac4a

Browse files
cloudRoutinecloudRoutine
committed
netcore build working again
1 parent 5f68276 commit 3c5ac4a

32 files changed

+2325
-16040
lines changed

‎.paket/PaketRestoreTask.deps.json

-110
This file was deleted.

‎.paket/PaketRestoreTask.dll

-6 KB
Binary file not shown.

‎.paket/paket.bootstrapper.exe

-48.5 KB
Binary file not shown.

‎.paket/paket.exe

-5.89 MB
Binary file not shown.

‎.paket/paket.exe.config

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<appSettings>
4+
<add key="Prerelease" value="True"/>
5+
</appSettings>
6+
</configuration>

‎FSharp.Editing.sln

-12
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{9B0032
77
ProjectSection(SolutionItems) = preProject
88
paket.dependencies = paket.dependencies
99
paket.lock = paket.lock
10-
.paket\Paket.Restore.targets = .paket\Paket.Restore.targets
1110
.paket\paket.targets = .paket\paket.targets
1211
EndProjectSection
1312
EndProject
@@ -52,17 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{0A9C
5251
scripts\XLinq.fsx = scripts\XLinq.fsx
5352
EndProjectSection
5453
EndProject
55-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcore", "netcore", "{59F8A114-BECB-4E99-A9D7-BD51159CE94A}"
56-
ProjectSection(SolutionItems) = preProject
57-
src\netcore\FSharp.Editing.Client\FSharp.Editing.Client.paket.references = src\netcore\FSharp.Editing.Client\FSharp.Editing.Client.paket.references
58-
src\netcore\FSharp.Editing.Core\FSharp.Editing.Core.paket.references = src\netcore\FSharp.Editing.Core\FSharp.Editing.Core.paket.references
59-
src\netcore\FSharp.Editing.Messages\FSharp.Editing.Messages.paket.references = src\netcore\FSharp.Editing.Messages\FSharp.Editing.Messages.paket.references
60-
src\netcore\FSharp.Editing\FSharp.Editing.paket.references = src\netcore\FSharp.Editing\FSharp.Editing.paket.references
61-
src\netcore\FSharp.Editing.ProjectInspector\FSharp.Editing.ProjectInspector.paket.references = src\netcore\FSharp.Editing.ProjectInspector\FSharp.Editing.ProjectInspector.paket.references
62-
src\netcore\FSharp.Editing.Server\FSharp.Editing.Server.paket.references = src\netcore\FSharp.Editing.Server\FSharp.Editing.Server.paket.references
63-
src\netcore\TestConsole\TestConsole.paket.references = src\netcore\TestConsole\TestConsole.paket.references
64-
EndProjectSection
65-
EndProject
6654
Global
6755
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6856
Debug|Any CPU = Debug|Any CPU

‎build.cmd

-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
@echo off
22

3-
.paket\paket.bootstrapper.exe
4-
if errorlevel 1 (
5-
exit /b %errorlevel%
6-
)
7-
83
.paket\paket.exe restore
94
if errorlevel 1 (
105
exit /b %errorlevel%

‎build.fsx

+8-14
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,13 @@ Target "UnitTests" (fun _ ->
133133
{ p with
134134
ShadowCopy = false
135135
TimeOut = TimeSpan.FromMinutes 20.
136-
//Framework = NUnit3Runtime.Net45
137136
Domain = NUnit3DomainModel.MultipleDomainModel
138-
//Workers = Some 1
139137
ResultSpecs = ["TestResults.xml"] }
140138
if isAppVeyorBuild then { param with Where = "cat != AppVeyorLongRunning" } else param)
141139
)
142140

143141

144-
let dotnetcliVersion = "1.0.1"
142+
let dotnetcliVersion = "2.0.0-preview2-005840"
145143

146144
let dotnetSDKPath = System.Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) </> "dotnetcore" </> dotnetcliVersion |> FullName
147145

@@ -211,11 +209,6 @@ let runCmdIn workDir exe =
211209
/// Execute a dotnet cli command
212210
let dotnet workDir = runCmdIn workDir "dotnet"
213211

214-
Target "DotnetRestoreTools" ^ fun _ ->
215-
DotNetCli.Restore ^ fun c ->
216-
{ c with Project = currentDirectory</>"tools"</> "tools.fsproj";ToolPath = dotnetExePath }
217-
218-
219212
#load "scripts/GenNetcore.fsx"
220213

221214
Target "DotnetGenerate" ^ fun _ ->
@@ -229,10 +222,11 @@ Target "DotnetRestore" ^ fun _ ->
229222
{ c with
230223
Project = proj
231224
ToolPath = dotnetExePath
232-
AdditionalArgs =
233-
[ "-s https://dotnet.myget.org/F/roslyn/api/v3/index.json"
234-
"-s https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json"
235-
]}
225+
//AdditionalArgs =
226+
//[ "-s https://dotnet.myget.org/F/roslyn/api/v3/index.json"
227+
// "-s https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json"
228+
//]}
229+
}
236230
with ex -> traceError ex.Message
237231

238232
Target "DotnetBuild" ^ fun _ ->
@@ -241,8 +235,8 @@ Target "DotnetBuild" ^ fun _ ->
241235
{ c with
242236
Project = proj
243237
ToolPath = dotnetExePath
244-
Configuration = "Release"
245-
AdditionalArgs = [ "/ds"; "/m"; (*"/pp"*) ]
238+
//Configuration = "Release"
239+
//AdditionalArgs = [ "/ds"; "/m"; (*"/pp"*) ]
246240
}
247241

248242

‎build.sh

+1-12
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@ if test "$OS" = "Windows_NT"
33
then
44
# use .Net
55

6-
.paket/paket.bootstrapper.exe
7-
exit_code=$?
8-
if [ $exit_code -ne 0 ]; then
9-
exit $exit_code
10-
fi
11-
126
.paket/paket.exe restore
137
exit_code=$?
148
if [ $exit_code -ne 0 ]; then
@@ -18,7 +12,7 @@ then
1812
packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
1913
else
2014
# use mono
21-
mono .paket/paket.bootstrapper.exe
15+
mono .paket/paket.exe
2216
exit_code=$?
2317
if [ $exit_code -ne 0 ]; then
2418
certificate_count=$(certmgr -list -c Trust | grep X.509 | wc -l)
@@ -36,10 +30,5 @@ else
3630
exit $exit_code
3731
fi
3832

39-
mono .paket/paket.exe restore
40-
exit_code=$?
41-
if [ $exit_code -ne 0 ]; then
42-
exit $exit_code
43-
fi
4433
mono packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
4534
fi

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "1.0.1"
3+
"version": "2.0.0-preview2-005840"
44
}
55
}

‎paket.dependencies

+24-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
source https://api.nuget.org/v3/index.json
22
source https://dotnet.myget.org/F/roslyn/api/v3/index.json
3-
#source https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json
3+
4+
45
redirects: force
56
content: none
6-
7+
framework: >= net45
78

89
nuget FSharp.Compiler.Service content: none
910
nuget FSharp.Core redirects: force, content: none
@@ -20,24 +21,43 @@ nuget Microsoft.CodeAnalysis.Workspaces.Common >= 3.0.0-beta1-61613-05
2021
nuget FSharp.Management
2122
nuget FSharp.Data
2223

24+
2325
group netcore
2426
source https://api.nuget.org/v3/index.json
27+
source https://dotnet.myget.org/F/roslyn/api/v3/index.json
28+
2529
redirects: on
2630
content: none
31+
framework: >= netstandard1.3
32+
2733

34+
nuget FSharp.NET.Sdk content: none
2835
nuget FSharp.Core
2936
nuget FSharp.Compiler.Service content: none
3037
nuget Suave redirects: force
38+
39+
nuget System.Runtime
3140
nuget System.IO.FileSystem
3241
nuget System.IO.FileSystem.Watcher
3342
nuget System.IO.FileSystem.Primitives
3443
nuget System.Reflection.TypeExtensions
3544
nuget System.Xml.XDocument
36-
nuget FSharp.NET.Sdk content: none
3745

38-
nuget System.Runtime
46+
nuget Microsoft.CodeAnalysis.Common >= 3.0.0-beta1-61613-05
47+
nuget Microsoft.CodeAnalysis.Features >= 3.0.0-beta1-61613-05
48+
nuget Microsoft.CodeAnalysis.Workspaces.Common >= 3.0.0-beta1-61613-05
49+
50+
51+
nuget Microsoft.Build >= 15.1
52+
nuget Microsoft.Build.Runtime >= 15.1
53+
nuget Newtonsoft.Json
54+
nuget wire
55+
56+
nuget Microsoft.Extensions.Logging.Abstractions
57+
3958
nuget Microsoft.NETCore.DotNetHostPolicy
4059
nuget Microsoft.NETCore.Runtime.CoreCLR
60+
4161
nuget System.Runtime.Loader
4262
nuget System.Runtime.Extensions
4363
nuget System.Runtime.InteropServices
@@ -62,8 +82,6 @@ group Build
6282
redirects: on
6383
content: none
6484

65-
nuget FSharp.Core
6685
nuget FAKE
6786
nuget FSharp.Formatting
68-
nuget Paket.Core
6987
github fsharp/FAKE modules/Octokit/Octokit.fsx

0 commit comments

Comments
 (0)