File tree Expand file tree Collapse file tree 5 files changed +12
-11
lines changed
FSharp.Compiler.Service.ProjectCracker Expand file tree Collapse file tree 5 files changed +12
-11
lines changed Original file line number Diff line number Diff line change @@ -281,13 +281,13 @@ Target "RunTests.NetCore" (fun _ ->
281
281
//use dotnet-mergenupkg to merge the .netcore nuget package into the default one
282
282
Target " Nuget.AddNetCore" ( fun _ ->
283
283
do
284
- let nupkg = sprintf " ../../../%s /FSharp.Compiler.Service.%s .nupkg" buildDir ( release.AssemblyVersion)
285
- let netcoreNupkg = sprintf " bin/Release/FSharp.Compiler.Service.%s .nupkg" ( release.AssemblyVersion)
284
+ let nupkg = sprintf " ../../../%s /FSharp.Compiler.Service.%s .nupkg" buildDir release.AssemblyVersion
285
+ let netcoreNupkg = sprintf " bin/Release/FSharp.Compiler.Service.%s .nupkg" release.AssemblyVersion
286
286
runCmdIn " src/fsharp/FSharp.Compiler.Service" " dotnet" " mergenupkg --source %s --other %s --framework netstandard1.6" nupkg netcoreNupkg
287
287
288
288
do
289
- let nupkg = sprintf " ../../../%s /FSharp.Compiler.Service.ProjectCracker.%s .nupkg" buildDir ( release.AssemblyVersion)
290
- let netcoreNupkg = sprintf " bin/Release/FSharp.Compiler.Service.ProjectCracker.%s .nupkg" ( release.AssemblyVersion)
289
+ let nupkg = sprintf " ../../../%s /FSharp.Compiler.Service.ProjectCracker.%s .nupkg" buildDir release.AssemblyVersion
290
+ let netcoreNupkg = sprintf " bin/Release/FSharp.Compiler.Service.ProjectCracker.%s .nupkg" release.AssemblyVersion
291
291
runCmdIn " src/fsharp/FSharp.Compiler.Service.ProjectCracker" " dotnet" " mergenupkg --source %s --other %s --framework netstandard1.6" nupkg netcoreNupkg
292
292
)
293
293
@@ -322,7 +322,11 @@ Target "All.NetFx" DoNothing
322
322
=?> ( " All.NetCore" , isDotnetSDKInstalled)
323
323
==> " All"
324
324
325
- " NuGet.NetFx"
325
+ " All.NetCore"
326
+ ==> " Nuget.AddNetCore"
327
+
328
+ " All.NetFx"
329
+ ==> " NuGet.NetFx"
326
330
=?> ( " Nuget.AddNetCore" , isDotnetSDKInstalled)
327
331
==> " NuGet"
328
332
Original file line number Diff line number Diff line change 18
18
../bin/v4.5/FSharp.Compiler.Service.dll ==> lib/net45
19
19
../bin/v4.5/FSharp.Compiler.Service.xml ==> lib/net45
20
20
../bin/v4.5/FSharp.Compiler.Service.?db ==> lib/net45
21
- ../bin/v4.5/FSharp.Compiler.Service.dll.?db ==> lib/net45
22
21
dependencies
23
22
System.Collections.Immutable >= LOCKEDVERSION
24
23
System.Reflection.Metadata >= LOCKEDVERSION
Original file line number Diff line number Diff line change 16
16
../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe ==> utilities/net45
17
17
../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe.config ==> utilities/net45
18
18
../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.?db ==> utilities/net45
19
- ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe.?db ==> utilities/net45
20
19
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll ==> lib/net45
21
20
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.xml ==> lib/net45
22
21
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.?db ==> lib/net45
23
- ../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll.?db ==> lib/net45
Original file line number Diff line number Diff line change 1
1
{
2
- "version" : " 7 .0.0" ,
2
+ "version" : " 8 .0.0" ,
3
3
"buildOptions" : {
4
4
"debugType" : " portable" ,
5
5
"emitEntryPoint" : false ,
36
36
"Microsoft.Build.Utilities.Core" : " 14.3.0" ,
37
37
"System.Runtime.Serialization.Json" : " 4.0.2" ,
38
38
"FSharp.Compiler.Service" : {
39
- "version" : " 7 .0.0" ,
39
+ "version" : " 8 .0.0" ,
40
40
"target" : " project"
41
41
}
42
42
},
Original file line number Diff line number Diff line change 1
1
{
2
- "version" : " 7 .0.0" ,
2
+ "version" : " 8 .0.0" ,
3
3
"buildOptions" : {
4
4
"debugType" : " portable" ,
5
5
"compilerName" : " fsc" ,
You can’t perform that action at this time.
0 commit comments