Merge pull request #1 from dsyme/smoothdeveloper-dotnet-restore-only-… · dotnet/fsharp@a592486 · GitHub
Skip to content

Commit a592486

Browse files
smoothdevelopersmoothdeveloper
authored
Merge pull request #1 from dsyme/smoothdeveloper-dotnet-restore-only-if-coreclr-enabled
fix to build
2 parents 7c2518e + c257574 commit a592486

3 files changed

Lines changed: 36 additions & 10 deletions

File tree

‎DEVGUIDE.md‎

Lines changed: 4 additions & 3 deletions

‎build.cmd‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ exit /b 1
2626

2727
:ARGUMENTS_OK
2828

29+
set BUILD_PROTO_WITH_CORECLR_LKG=1
30+
2931
set BUILD_PROTO=0
3032
set BUILD_NET40=1
3133
set BUILD_CORECLR=0
@@ -100,6 +102,11 @@ if /i '%ARG%' == 'all' (
100102
set SKIP_EXPENSIVE_TESTS=0
101103
)
102104

105+
if /i '%ARG%' == 'protofx' (
106+
set BUILD_PROTO_WITH_CORECLR_LKG=0
107+
set BUILD_PROTO=1
108+
)
109+
103110
if /i '%ARG%' == 'microbuild' (
104111
set BUILD_PROTO=1
105112
set BUILD_NET40=1
@@ -257,6 +264,7 @@ REM after this point, ARG variable should not be used, use only BUILD_* or TEST_
257264
echo Build/Tests configuration:
258265
echo.
259266
echo BUILD_PROTO=%BUILD_PROTO%
267+
echo BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG%
260268
echo BUILD_NET40=%BUILD_NET40%
261269
echo BUILD_CORECLR=%BUILD_CORECLR%
262270
echo BUILD_PORTABLE=%BUILD_PORTABLE%
@@ -327,7 +335,7 @@ if '%RestorePackages%' == 'true' (
327335
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget\nuget.config
328336
@if ERRORLEVEL 1 echo Error: Nuget restore failed && goto :failure
329337
)
330-
if '%BUILD_CORECLR%' == '1' (
338+
if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
331339

332340
:: Restore the Tools directory
333341
call %~dp0init-tools.cmd
@@ -358,6 +366,10 @@ if '%BUILD_CORECLR%' == '1' (
358366
popd
359367

360368
)
369+
if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '0' (
370+
rmdir /s .\lkg\bin\debug
371+
)
372+
361373
rem copy targestfile into tools directory ... temporary fix until packaging complete.
362374
copy src\fsharp\FSharp.Build\Microsoft.FSharp.targets tools\Microsoft.FSharp.targets
363375
copy src\fsharp\FSharp.Build\Microsoft.Portable.FSharp.targets tools\Microsoft.Portable.FSharp.targets

‎src/FSharpSource.targets‎

Lines changed: 19 additions & 6 deletions

0 commit comments

Comments
 (0)