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

Commit1605352

Browse files
authored
Fix build and test issues (dotnet#4396)
1 parente7ce9cd commit1605352

File tree

8 files changed

+53
-13
lines changed

8 files changed

+53
-13
lines changed

‎build.cmd‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,10 @@ if /i "%BUILD_FCS%" == "1" (
459459
setNEEDS_DOTNET_CLI_TOOLS=1
460460
)
461461

462+
rem Decide if Proto need building
463+
ifNOTEXIST Proto\net40\bin\fsc.exe (
464+
setBUILD_PROTO=1
465+
)
462466

463467
echo Build/Tests configuration:
464468
echo.
@@ -658,8 +662,8 @@ set path=%~dp0Tools\dotnet20\;%path%
658662

659663
if"%NEEDS_DOTNET_CLI_TOOLS%"=="1" (
660664
:: Restore projects using dotnet CLI tool
661-
echo%_dotnet20exe% restore -v:d build-everything.proj%msbuildflags%%BUILD_DIAG%
662-
%_dotnet20exe% restore -v:d build-everything.proj%msbuildflags%%BUILD_DIAG%
665+
echo%_dotnet20exe% restore -v:d build-everything.proj-c Proto%msbuildflags%%BUILD_DIAG%
666+
%_dotnet20exe% restore -v:d build-everything.proj-c Proto%msbuildflags%%BUILD_DIAG%
663667
)
664668

665669

@@ -701,11 +705,6 @@ if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (
701705

702706
echo ---------------- Done with package restore, starting proto ------------------------
703707

704-
rem Decide if Proto need building
705-
ifNOTEXIST Proto\net40\bin\fsc.exe (
706-
setBUILD_PROTO=1
707-
)
708-
709708
rem Build Proto
710709
if"%BUILD_PROTO%"=="1" (
711710
rmdir /s /q Proto
@@ -1004,6 +1003,18 @@ if "%TEST_NET40_COREUNIT_SUITE%" == "1" (
10041003
echo"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Build.UnitTests.dll"!WHERE_ARG_NUNIT!
10051004
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Build.UnitTests.dll"!WHERE_ARG_NUNIT!
10061005

1006+
1007+
iferrorlevel1 (
1008+
echo -----------------------------------------------------------------
1009+
type"!OUTPUTFILE!"
1010+
echo -----------------------------------------------------------------
1011+
type"!ERRORFILE!"
1012+
echo -----------------------------------------------------------------
1013+
echo Error: Running tests net40-coreunit failed, see logs above -- FAILED
1014+
echo -----------------------------------------------------------------
1015+
goto :failure
1016+
)
1017+
10071018
echo"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Core.UnitTests.dll"!WHERE_ARG_NUNIT!
10081019
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Core.UnitTests.dll"!WHERE_ARG_NUNIT!
10091020

@@ -1030,10 +1041,17 @@ if "%TEST_CORECLR_COREUNIT_SUITE%" == "1" (
10301041
echo"%_dotnetcliexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Build.UnitTests\FSharp.Build.UnitTests.dll"!WHERE_ARG_NUNIT!
10311042
"%_dotnetcliexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Build.UnitTests\FSharp.Build.UnitTests.dll"!WHERE_ARG_NUNIT!
10321043

1044+
iferrorlevel1 (
1045+
echo -----------------------------------------------------------------
1046+
echo Error: Running tests coreclr-coreunit failed, see logs above-- FAILED
1047+
echo -----------------------------------------------------------------
1048+
goto :failure
1049+
)
1050+
10331051
echo"%_dotnetcliexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.UnitTests\FSharp.Core.UnitTests.dll"!WHERE_ARG_NUNIT!
10341052
"%_dotnetcliexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.UnitTests\FSharp.Core.UnitTests.dll"!WHERE_ARG_NUNIT!
10351053

1036-
ifERRORLEVEL1 (
1054+
iferrorlevel1 (
10371055
echo -----------------------------------------------------------------
10381056
echo Error: Running tests coreclr-coreunit failed, see logs above-- FAILED
10391057
echo -----------------------------------------------------------------

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<packageid="Microsoft.Build.Tasks.Core"version="14.3.0" />
2828

2929
<!-- Testing-->
30-
<packageid="FsCheck"version="2.6.2" />
30+
<packageid="FsCheck"version="3.0.0-alpha3" />
3131
<packageid="NUnit"version="3.5.0"targetFramework="net45" />
3232
<packageid="NUnit.Console"version="3.0.0"targetFramework="net45" />
3333
<packageid="NUnitLite"version="3.5.0"targetFramework="net45" />

‎src/FSharpSource.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050

5151
<PropertyGroup>
5252
<NugetLocalPackagesDir>$(FSharpSourcesRoot)\..\packages</NugetLocalPackagesDir>
53-
<FsCheckVersion>2.6.2</FsCheckVersion>
54-
<FsCheckFullVersion>2.6.2.0</FsCheckFullVersion>
53+
<FsCheckVersion>3.0.0-alpha3</FsCheckVersion>
54+
<FsCheckFullVersion>3.0.0.0</FsCheckFullVersion>
5555
<FsCheckLibDir>$(FSharpSourcesRoot)\..\packages\FsCheck.$(FsCheckVersion)\lib\</FsCheckLibDir>
5656
</PropertyGroup>
5757

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<addkey="disableSourceControlIntegration"value="true" />
5+
<addkey="DependencyVersion"value="Highest" />
6+
</solution>
7+
<packageSources>
8+
<addkey="artifacts"value="../../artifacts" />
9+
</packageSources>
10+
</configuration>

‎tests/FSharp.Build.UnitTests/project.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"Microsoft.Build":"15.1.548",
1212
"Microsoft.Build.Framework":"15.1.548",
1313
"Microsoft.Build.Tasks.Core":"15.1.548",
14+
"Testing.FSharp.Core":"4.2.4",
1415
"Microsoft.Build.Utilities.Core":"15.1.548"
1516
},
1617
"runtimes": {

‎tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<ReferenceInclude="FsCheck, Version=$(FsCheckFullVersion)"Condition=" '$(TargetDotnetProfile)' != 'portable47'">
5050
<SpecificVersion>true</SpecificVersion>
5151
<Private>True</Private>
52-
<HintPathCondition="'$(TargetDotnetProfile)' == 'net40'">$(FsCheckLibDir)\net45\FsCheck.dll</HintPath>
52+
<HintPathCondition="'$(TargetDotnetProfile)' == 'net40'">$(FsCheckLibDir)\net452\FsCheck.dll</HintPath>
5353
</Reference>
5454
<ReferenceInclude="System.ValueTuple">
5555
<HintPath>..\..\packages\System.ValueTuple.4.3.1\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<addkey="disableSourceControlIntegration"value="true" />
5+
<addkey="DependencyVersion"value="Highest" />
6+
</solution>
7+
<packageSources>
8+
<addkey="artifacts"value="../../artifacts" />
9+
</packageSources>
10+
</configuration>

‎tests/FSharp.Core.UnitTests/project.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"nunit":"3.5.0",
1010
"nunitlite":"3.5.0",
1111
"System.ValueTuple":"4.3.1",
12-
"FsCheck":"2.6.2",
12+
"FsCheck":"3.0.0-alpha3",
13+
"Testing.FSharp.Core":"4.2.4",
1314
"Microsoft.FSharp.TupleSample":"1.0.0-alpha-161112"
1415
},
1516
"runtimes": {

0 commit comments

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