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 _ ->
281281//use dotnet-mergenupkg to merge the .netcore nuget package into the default one
282282Target " Nuget.AddNetCore" ( fun _ ->
283283 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
286286 runCmdIn " src/fsharp/FSharp.Compiler.Service" " dotnet" " mergenupkg --source %s --other %s --framework netstandard1.6" nupkg netcoreNupkg
287287
288288 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
291291 runCmdIn " src/fsharp/FSharp.Compiler.Service.ProjectCracker" " dotnet" " mergenupkg --source %s --other %s --framework netstandard1.6" nupkg netcoreNupkg
292292)
293293
@@ -322,7 +322,11 @@ Target "All.NetFx" DoNothing
322322 =?> ( " All.NetCore" , isDotnetSDKInstalled)
323323 ==> " All"
324324
325- " NuGet.NetFx"
325+ " All.NetCore"
326+ ==> " Nuget.AddNetCore"
327+
328+ " All.NetFx"
329+ ==> " NuGet.NetFx"
326330 =?> ( " Nuget.AddNetCore" , isDotnetSDKInstalled)
327331 ==> " NuGet"
328332
Original file line number Diff line number Diff line change 1818 ../bin/v4.5/FSharp.Compiler.Service.dll ==> lib/net45
1919 ../bin/v4.5/FSharp.Compiler.Service.xml ==> lib/net45
2020 ../bin/v4.5/FSharp.Compiler.Service.?db ==> lib/net45
21- ../bin/v4.5/FSharp.Compiler.Service.dll.?db ==> lib/net45
2221dependencies
2322 System.Collections.Immutable >= LOCKEDVERSION
2423 System.Reflection.Metadata >= LOCKEDVERSION
Original file line number Diff line number Diff line change 1616 ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe ==> utilities/net45
1717 ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe.config ==> utilities/net45
1818 ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.?db ==> utilities/net45
19- ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe.?db ==> utilities/net45
2019 ../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll ==> lib/net45
2120 ../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.xml ==> lib/net45
2221 ../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 11{
2- "version" : " 7 .0.0" ,
2+ "version" : " 8 .0.0" ,
33 "buildOptions" : {
44 "debugType" : " portable" ,
55 "emitEntryPoint" : false ,
3636 "Microsoft.Build.Utilities.Core" : " 14.3.0" ,
3737 "System.Runtime.Serialization.Json" : " 4.0.2" ,
3838 "FSharp.Compiler.Service" : {
39- "version" : " 7 .0.0" ,
39+ "version" : " 8 .0.0" ,
4040 "target" : " project"
4141 }
4242 },
Original file line number Diff line number Diff line change 11{
2- "version" : " 7 .0.0" ,
2+ "version" : " 8 .0.0" ,
33 "buildOptions" : {
44 "debugType" : " portable" ,
55 "compilerName" : " fsc" ,
You can’t perform that action at this time.
0 commit comments