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

Commit1b10996

Browse files
authored
Elide portable libraries from OSS build (#3193)
* remove portables* temp* remove bin from profiles paths* reorder setup build* Ensure nuget is built prior to setup* remove portable customizations from targets* fix ci_part1
1 parent9ffcc02 commit1b10996

File tree

17 files changed

+120
-14413
lines changed

17 files changed

+120
-14413
lines changed

‎build-everything.proj‎

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj" />
2828
</ItemGroup>
2929

30-
<ItemGroupCondition="'$(BUILD_PORTABLE)'=='1'">
31-
<ProjectsWithPortableFrameworksInclude="src/fsharp/FSharp.Core/FSharp.Core.fsproj" />
32-
</ItemGroup>
33-
3430
<ItemGroupCondition="'$(BUILD_VS)'=='1'">
3531
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-src-build.proj" />
3632
<ProjectsWithNet40Include="vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj" />
@@ -57,10 +53,6 @@
5753
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
5854
</ItemGroup>
5955

60-
<ItemGroupCondition="'$(TEST_PORTABLE_COREUNIT_SUITE)'=='1' and ('$(TargetDotnetProfile)' == 'portable7' or '$(TargetDotnetProfile)' == 'portable78' or '$(TargetDotnetProfile)' == 'portable259')" >
61-
<ProjectsWithPortableFrameworksInclude="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
62-
</ItemGroup>
63-
6456
<ItemGroupCondition="'$(TEST_NET40_COMPILERUNIT_SUITE)'=='1'" >
6557
<ProjectsWithNet40Include="src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj"/>
6658
</ItemGroup>
@@ -86,38 +78,24 @@
8678

8779
<TargetName="Build">
8880
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
89-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
90-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
91-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
92-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
93-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=xamarinmacmobile;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
94-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=monoandroid10+monotouch10+xamarinios10;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
9581
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
96-
<MSBuildProjects="@(SetupProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
9782
<MSBuildProjects="@(NugetProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);" />
83+
<MSBuildProjects="@(SetupProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
9884
</Target>
9985

10086
<TargetName="Rebuild">
10187
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
10288
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
103-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
104-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
105-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
106-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
10789
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
108-
<MSBuildProjects="@(SetupProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
10990
<MSBuildProjects="@(NugetProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);" />
91+
<MSBuildProjects="@(SetupProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
11092
</Target>
11193

11294
<TargetName="Clean">
11395
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
11496
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
115-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
116-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
117-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
118-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
11997
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
120-
<MSBuildProjects="@(SetupProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
12198
<MSBuildProjects="@(NugetProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);" />
99+
<MSBuildProjects="@(SetupProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
122100
</Target>
123101
</Project>

‎build.cmd‎

Lines changed: 7 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ echo Build and run a subset of test suites
1717
echo.
1818
echo Usage:
1919
echo.
20-
echo build.cmd^<all^|net40^|coreclr^|pcls^|vs^>
20+
echo build.cmd^<all^|net40^|coreclr^|vs^>
2121
echo^<proto^|protofx^>
2222
echo^<ci^|ci_part1^|ci_part2^|ci_part3^|ci_part4^|microbuild^|nuget^>
2323
echo^<debug^|release^>
2424
echo^<diag^|publicsign^>
25-
echo^<test^|test-net40-coreunit^|test-coreclr-coreunit^|test-compiler-unit^|test-pcl-coreunit^|test-net40-ideunit^|test-net40-fsharp^|test-coreclr-fsharp^|test-net40-fsharpqa^>
25+
echo^<test^|test-net40-coreunit^|test-coreclr-coreunit^|test-compiler-unit^|test-net40-ideunit^|test-net40-fsharp^|test-coreclr-fsharp^|test-net40-fsharpqa^>
2626
echo^<include tag^>
2727
echo^<init^>
2828
echo.
@@ -59,7 +59,6 @@ set BUILD_PHASE=1
5959
setBUILD_NET40=0
6060
setBUILD_NET40_FSHARP_CORE=0
6161
setBUILD_CORECLR=0
62-
setBUILD_PORTABLE=0
6362
setBUILD_VS=0
6463
setBUILD_CONFIG=release
6564
setBUILD_CONFIG_LOWERCASE=release
@@ -72,7 +71,6 @@ set TEST_NET40_FSHARP_SUITE=0
7271
setTEST_NET40_FSHARPQA_SUITE=0
7372
setTEST_CORECLR_COREUNIT_SUITE=0
7473
setTEST_CORECLR_FSHARP_SUITE=0
75-
setTEST_PORTABLE_COREUNIT_SUITE=0
7674
setTEST_VS_IDEUNIT_SUITE=0
7775
setINCLUDE_TEST_SPEC_NUNIT=
7876
setINCLUDE_TEST_TAGS=
@@ -116,10 +114,6 @@ if /i "%_autoselect_tests%" == "1" (
116114
setTEST_CORECLR_COREUNIT_SUITE=1
117115
)
118116

119-
if /i"%BUILD_PORTABLE%"=="1" (
120-
setTEST_PORTABLE_COREUNIT_SUITE=1
121-
)
122-
123117
if /i"%BUILD_VS%"=="1" (
124118
setTEST_VS_IDEUNIT_SUITE=1
125119
)
@@ -152,11 +146,6 @@ if /i "%ARG%" == "coreclr" (
152146
setBUILD_CORECLR=1
153147
)
154148

155-
if /i"%ARG%"=="pcls" (
156-
set_autoselect=0
157-
setBUILD_PORTABLE=1
158-
)
159-
160149
if /i"%ARG%"=="vs" (
161150
set_autoselect=0
162151
setBUILD_NET40=1
@@ -176,7 +165,6 @@ if /i "%ARG%" == "all" (
176165
setBUILD_PROTO_WITH_CORECLR_LKG=1
177166
setBUILD_NET40=1
178167
setBUILD_CORECLR=1
179-
setBUILD_PORTABLE=1
180168
setBUILD_VS=1
181169
setBUILD_SETUP=%FSC_BUILD_SETUP%
182170
setBUILD_NUGET=1
@@ -190,7 +178,6 @@ if /i "%ARG%" == "microbuild" (
190178
setBUILD_NET40_FSHARP_CORE=1
191179
setBUILD_PROTO_WITH_CORECLR_LKG=1
192180
setBUILD_CORECLR=1
193-
setBUILD_PORTABLE=1
194181
setBUILD_VS=1
195182
setBUILD_SETUP=%FSC_BUILD_SETUP%
196183
setBUILD_NUGET=1
@@ -201,7 +188,6 @@ if /i "%ARG%" == "microbuild" (
201188
setTEST_NET40_FSHARPQA_SUITE=1
202189
setTEST_CORECLR_COREUNIT_SUITE=0
203190
setTEST_CORECLR_FSHARP_SUITE=0
204-
setTEST_PORTABLE_COREUNIT_SUITE=1
205191
setTEST_VS_IDEUNIT_SUITE=1
206192
setCI=1
207193
setPUBLISH_VSIX=1
@@ -217,7 +203,6 @@ if /i "%ARG%" == "nuget" (
217203
setBUILD_PROTO=1
218204
setBUILD_NET40_FSHARP_CORE=1
219205
setBUILD_PROTO_WITH_CORECLR_LKG=1
220-
setBUILD_PORTABLE=1
221206
setBUILD_CORECLR=1
222207
setBUILD_NUGET=1
223208
)
@@ -229,10 +214,12 @@ if /i "%ARG%" == "ci_part1" (
229214
REM what we do
230215
setBUILD_PROTO=1
231216
setBUILD_NET40=1
217+
setBUILD_PROTO_WITH_CORECLR_LKG=1
232218
setBUILD_NET40_FSHARP_CORE=1
233-
setBUILD_PORTABLE=1
234219
setBUILD_VS=1
220+
setBUILD_CORECLR=1
235221
setBUILD_SETUP=%FSC_BUILD_SETUP%
222+
setBUILD_NUGET=1
236223
setTEST_VS_IDEUNIT_SUITE=1
237224
setCI=1
238225
)
@@ -257,7 +244,6 @@ if /i "%ARG%" == "ci_part3" (
257244
setBUILD_PROTO=1
258245
setBUILD_CORECLR=1
259246
setBUILD_NET40_FSHARP_CORE=1
260-
setBUILD_PORTABLE=1
261247
setBUILD_NUGET=1
262248
setTEST_CORECLR_FSHARP_SUITE=1
263249
setTEST_CORECLR_COREUNIT_SUITE=1
@@ -271,11 +257,9 @@ if /i "%ARG%" == "ci_part4" (
271257
setBUILD_PROTO=1
272258
setBUILD_NET40=1
273259
setBUILD_NET40_FSHARP_CORE=1
274-
setBUILD_PORTABLE=1
275260

276261
setTEST_NET40_COMPILERUNIT_SUITE=1
277262
setTEST_NET40_FSHARPQA_SUITE=1
278-
setTEST_PORTABLE_COREUNIT_SUITE=1
279263
setCI=1
280264
)
281265

@@ -314,7 +298,6 @@ if /i "%ARG%" == "test-all" (
314298
setBUILD_NET40=1
315299
setBUILD_NET40_FSHARP_CORE=1
316300
setBUILD_CORECLR=1
317-
setBUILD_PORTABLE=1
318301
setBUILD_VS=1
319302
setBUILD_SETUP=%FSC_BUILD_SETUP%
320303
setBUILD_NUGET=1
@@ -323,7 +306,6 @@ if /i "%ARG%" == "test-all" (
323306
setTEST_NET40_COREUNIT_SUITE=1
324307
setTEST_NET40_FSHARP_SUITE=1
325308
setTEST_NET40_FSHARPQA_SUITE=1
326-
setTEST_PORTABLE_COREUNIT_SUITE=1
327309
setTEST_CORECLR_COREUNIT_SUITE=1
328310
setTEST_VS_IDEUNIT_SUITE=1
329311
)
@@ -332,7 +314,6 @@ if /i "%ARG%" == "test-net40-fsharpqa" (
332314
set_autoselect=0
333315
setBUILD_NET40=1
334316
setBUILD_NET40_FSHARP_CORE=1
335-
setBUILD_PORTABLE=1
336317
setTEST_NET40_FSHARPQA_SUITE=1
337318
)
338319

@@ -348,7 +329,6 @@ if /i "%ARG%" == "test-net40-ideunit" (
348329
setBUILD_NET40=1
349330
setBUILD_NET40_FSHARP_CORE=1
350331
setBUILD_VS=1
351-
setBUILD_PORTABLE=1
352332
setTEST_VS_IDEUNIT_SUITE=1
353333
)
354334

@@ -365,17 +345,10 @@ if /i "%ARG%" == "test-coreclr-coreunit" (
365345
setTEST_CORECLR_COREUNIT_SUITE=1
366346
)
367347

368-
if /i"%ARG%"=="test-pcl-coreunit" (
369-
set_autoselect=0
370-
setBUILD_PORTABLE=1
371-
setTEST_PORTABLE_COREUNIT_SUITE=1
372-
)
373-
374348
if /i"%ARG%"=="test-net40-fsharp" (
375349
set_autoselect=0
376350
setBUILD_NET40=1
377351
setBUILD_NET40_FSHARP_CORE=1
378-
setBUILD_PORTABLE=1
379352
setTEST_NET40_FSHARP_SUITE=1
380353
)
381354

@@ -417,9 +390,9 @@ echo BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG%
417390
echo BUILD_NET40=%BUILD_NET40%
418391
echo BUILD_NET40_FSHARP_CORE=%BUILD_NET40_FSHARP_CORE%
419392
echo BUILD_CORECLR=%BUILD_CORECLR%
420-
echo BUILD_PORTABLE=%BUILD_PORTABLE%
421393
echo BUILD_VS=%BUILD_VS%
422394
echo BUILD_SETUP=%BUILD_SETUP%
395+
echo BUILD_NUGET=%BUILD_NUGET%
423396
echo BUILD_CONFIG=%BUILD_CONFIG%
424397
echo BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN%
425398
echo.
@@ -429,7 +402,6 @@ echo TEST_NET40_FSHARP_SUITE=%TEST_NET40_FSHARP_SUITE%
429402
echo TEST_NET40_FSHARPQA_SUITE=%TEST_NET40_FSHARPQA_SUITE%
430403
echo TEST_CORECLR_COREUNIT_SUITE=%TEST_CORECLR_COREUNIT_SUITE%
431404
echo TEST_CORECLR_FSHARP_SUITE=%TEST_CORECLR_FSHARP_SUITE%
432-
echo TEST_PORTABLE_COREUNIT_SUITE=%TEST_PORTABLE_COREUNIT_SUITE%
433405
echo TEST_VS_IDEUNIT_SUITE=%TEST_VS_IDEUNIT_SUITE%
434406
echo INCLUDE_TEST_SPEC_NUNIT=%INCLUDE_TEST_SPEC_NUNIT%
435407
echo INCLUDE_TEST_TAGS=%INCLUDE_TEST_TAGS%
@@ -568,15 +540,6 @@ if "%RestorePackages%" == "true" (
568540
)
569541
)
570542

571-
if"%BUILD_NUGET%"=="1" (
572-
:: Copy the net20 and net40 build directory for nuget building
573-
md%~dp0%BUILD_CONFIG%\dotnet20\bin
574-
copy /Y%~dp0packages\FSharp.Core.4.1.17\lib\net20\*.*%~dp0%BUILD_CONFIG%\dotnet20\bin
575-
576-
md%~dp0%BUILD_CONFIG%\dotnet40\bin
577-
copy /Y%~dp0packages\FSharp.Core.4.1.17\lib\net40\*.*%~dp0%BUILD_CONFIG%\dotnet40\bin
578-
)
579-
580543
if"%BUILD_PROTO_WITH_CORECLR_LKG%"=="1" (
581544
:: Restore the Tools directory
582545
call%~dp0init-tools.cmd
@@ -701,7 +664,7 @@ echo SNEXE64: %SNEXE64%
701664
echo ILDASM:%ILDASM%
702665
echo
703666

704-
if"%TEST_NET40_COMPILERUNIT_SUITE%"=="0"if"%TEST_NET40_COREUNIT_SUITE%"=="0"if"%TEST_PORTABLE_COREUNIT_SUITE%"=="0"if"%TEST_CORECLR_COREUNIT_SUITE%"=="0"if"%TEST_VS_IDEUNIT_SUITE%"=="0"if"%TEST_NET40_FSHARP_SUITE%"=="0"if"%TEST_NET40_FSHARPQA_SUITE%"=="0"goto :success
667+
if"%TEST_NET40_COMPILERUNIT_SUITE%"=="0"if"%TEST_NET40_COREUNIT_SUITE%"=="0"if"%TEST_CORECLR_COREUNIT_SUITE%"=="0"if"%TEST_VS_IDEUNIT_SUITE%"=="0"if"%TEST_NET40_FSHARP_SUITE%"=="0"if"%TEST_NET40_FSHARPQA_SUITE%"=="0"goto :success
705668

706669
echo ---------------- Done with update, starting tests -----------------------
707670

@@ -860,37 +823,6 @@ if "%TEST_NET40_COREUNIT_SUITE%" == "1" (
860823
)
861824
)
862825

863-
REM ---------------- portable-coreunit -----------------------
864-
865-
if"%TEST_PORTABLE_COREUNIT_SUITE%"=="1" (
866-
867-
setOUTPUTARG=
868-
setERRORARG=
869-
setOUTPUTFILE=
870-
setERRORFILE=
871-
setXMLFILE=!RESULTSDIR!\test-portable-coreunit-results.xml
872-
if"%CI%"=="1" (
873-
setOUTPUTFILE=!RESULTSDIR!\test-portable-coreunit-output.log
874-
setERRORFILE=!RESULTSDIR!\test-portable-coreunit-errors.log
875-
setERRORARG=--err:"!ERRORFILE!"
876-
setOUTPUTARG=--output:"!OUTPUTFILE!"
877-
)
878-
879-
echo"!NUNIT3_CONSOLE!" /framework:V4.0 /result="!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! /work="!FSCBINPATH!""!FSCBINPATH!\..\..\portable7\bin\FSharp.Core.Unittests.dll""!FSCBINPATH!\..\..\portable47\bin\FSharp.Core.Unittests.dll""!FSCBINPATH!\..\..\portable78\bin\FSharp.Core.Unittests.dll""!FSCBINPATH!\..\..\portable259\bin\FSharp.Core.Unittests.dll"!WHERE_ARG_NUNIT!
880-
"!NUNIT3_CONSOLE!" /framework:V4.0 /result="!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! /work="!FSCBINPATH!""!FSCBINPATH!\..\..\portable7\bin\FSharp.Core.Unittests.dll""!FSCBINPATH!\..\..\portable47\bin\FSharp.Core.Unittests.dll""!FSCBINPATH!\..\..\portable78\bin\FSharp.Core.Unittests.dll""!FSCBINPATH!\..\..\portable259\bin\FSharp.Core.Unittests.dll"!WHERE_ARG_NUNIT!
881-
882-
iferrorlevel1 (
883-
echo -----------------------------------------------------------------
884-
type"!OUTPUTFILE!"
885-
echo -----------------------------------------------------------------
886-
type"!ERRORFILE!"
887-
echo -----------------------------------------------------------------
888-
echo Error: Running tests portable-coreunit failed, see logs above -- FAILED
889-
echo -----------------------------------------------------------------
890-
goto :failure
891-
)
892-
)
893-
894826
REM ---------------- coreclr-coreunit -----------------------
895827

896828
if"%TEST_CORECLR_COREUNIT_SUITE%"=="1" (

‎packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful-->
4242
<packageid="FSharp.Compiler.Tools"version="4.1.5"/>
4343

44-
<!--FSharp.Core is used to get the net20 and net40 buildsof FSharp.Core.dll-->
45-
<packageid="FSharp.Core"version="4.1.17"/>
44+
<!--Frozen portable library versionsof FSharp.Core.dll(simply a renamed fsharp.core.4.1.18-->
45+
<packageid="Microsoft.Portable.FSharp.Core"version="4.1.18"/>
4646

4747
<!-- FSharp.Data is used in some of the scripts ued for the coreclr build-->
4848
<packageid="FSharp.Data"version="2.2.5" />

0 commit comments

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