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

Commitaf270ca

Browse files
authored
Merge pull request #3880 from Microsoft/merges/master-to-dev15.6-20171103-070045
Merge master to dev15.6
2 parentsc7e276a +d903cf6 commitaf270ca

File tree

5 files changed

+63
-59
lines changed

5 files changed

+63
-59
lines changed

‎PublishToBlob.proj‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project>
2+
3+
<!--
4+
5+
This is for the internal orchestrated build scenarios and will likely never be run on a
6+
developer's machine. The official build definition builds this file directly.
7+
8+
-->
9+
10+
<PropertyGroup>
11+
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
12+
<!-- This version should be kept in sync with `packages.config`-->
13+
<FeedTasksPackageVersion>1.0.0-prerelease-02121-01</FeedTasksPackageVersion>
14+
</PropertyGroup>
15+
16+
<ImportProject="$(MSBuildThisFileDirectory)packages\$(FeedTasksPackage).$(FeedTasksPackageVersion)\build\$(FeedTasksPackage).targets" />
17+
18+
<ItemGroup>
19+
<ItemsToPushInclude="$(MSBuildThisFileDirectory)artifacts\**\*.nupkg" />
20+
</ItemGroup>
21+
22+
<TargetName="Build">
23+
<PushToBlobFeedExpectedFeedUrl="$(ExpectedFeedUrl)"
24+
AccountKey="$(AccountKey)"
25+
ItemsToPush="@(ItemsToPush)"
26+
Overwrite="$(PublishOverwrite)" />
27+
</Target>
28+
29+
</Project>

‎build.cmd‎

Lines changed: 16 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ set TEST_VS_IDEUNIT_SUITE=0
7878
setINCLUDE_TEST_SPEC_NUNIT=
7979
setINCLUDE_TEST_TAGS=
8080

81-
setPUBLISH_VSIX=0
82-
setMYGET_APIKEY=
83-
8481
REM ------------------ Parse all arguments -----------------------
8582

8683
set_autoselect=1
@@ -206,7 +203,6 @@ if /i "%ARG%" == "microbuild" (
206203
setTEST_CORECLR_FSHARP_SUITE=0
207204
setTEST_VS_IDEUNIT_SUITE=1
208205
setCI=1
209-
setPUBLISH_VSIX=1
210206

211207
REM redirecting TEMP directories
212208
setTEMP=%~dp0%BUILD_CONFIG%\TEMP
@@ -375,10 +371,6 @@ if /i "%ARG%" == "init" (
375371
setBUILD_PROTO_WITH_CORECLR_LKG=1
376372
)
377373

378-
if /i [%ARG:~0,13%]== [MYGET_APIKEY:] (
379-
setMYGET_APIKEY=%ARG:~13%
380-
)
381-
382374
goto :EOF
383375
:: Note: "goto :EOF" returns from an in-batchfile "call" command
384376
:: in preference to returning from the entire batch file.
@@ -389,6 +381,19 @@ REM ------------------ Report config -----------------------
389381

390382
REM after this point, ARG variable should not be used, use only BUILD_* or TEST_*
391383

384+
REM all PB_* variables override any settings
385+
386+
REM if the `PB_SKIPTESTS` variable is set to 'true' then no tests should be built or run, even if explicitly specified
387+
if /i"%PB_SKIPTESTS%"=="true" (
388+
setTEST_NET40_COMPILERUNIT_SUITE=0
389+
setTEST_NET40_COREUNIT_SUITE=0
390+
setTEST_NET40_FSHARP_SUITE=0
391+
setTEST_NET40_FSHARPQA_SUITE=0
392+
setTEST_CORECLR_COREUNIT_SUITE=0
393+
setTEST_CORECLR_FSHARP_SUITE=0
394+
setTEST_VS_IDEUNIT_SUITE=0
395+
)
396+
392397
echo Build/Tests configuration:
393398
echo.
394399
echo BUILD_PROTO=%BUILD_PROTO%
@@ -404,6 +409,8 @@ echo BUILD_NUGET=%BUILD_NUGET%
404409
echo BUILD_CONFIG=%BUILD_CONFIG%
405410
echo BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN%
406411
echo.
412+
echo PB_SKIPTESTS=%PB_SKIPTESTS%
413+
echo.
407414
echo TEST_NET40_COMPILERUNIT_SUITE=%TEST_NET40_COMPILERUNIT_SUITE%
408415
echo TEST_NET40_COREUNIT_SUITE=%TEST_NET40_COREUNIT_SUITE%
409416
echo TEST_NET40_FSHARP_SUITE=%TEST_NET40_FSHARP_SUITE%
@@ -413,8 +420,6 @@ echo TEST_CORECLR_FSHARP_SUITE=%TEST_CORECLR_FSHARP_SUITE%
413420
echo TEST_VS_IDEUNIT_SUITE=%TEST_VS_IDEUNIT_SUITE%
414421
echo INCLUDE_TEST_SPEC_NUNIT=%INCLUDE_TEST_SPEC_NUNIT%
415422
echo INCLUDE_TEST_TAGS=%INCLUDE_TEST_TAGS%
416-
echo PUBLISH_VSIX=%PUBLISH_VSIX%
417-
echo MYGET_APIKEY=%MYGET_APIKEY%
418423
echo TEMP=%TEMP%
419424

420425
:: load Visual Studio 2017 developer command prompt if VS150COMNTOOLS is not set
@@ -478,43 +483,7 @@ if "%RestorePackages%"=="" (
478483

479484
@call src\update.cmd signonly
480485

481-
:: Check prerequisites
482-
ifnot"%VisualStudioVersion%"==""goto vsversionset
483-
ifexist"%VS150COMNTOOLS%\..\ide\devenv.exe"setVisualStudioVersion=15.0
484-
ifnot"%VisualStudioVersion%"==""goto vsversionset
485-
486-
ifnot"%VisualStudioVersion%"==""goto vsversionset
487-
ifexist"%VS150COMNTOOLS%\..\..\ide\devenv.exe"setVisualStudioVersion=15.0
488-
ifnot"%VisualStudioVersion%"==""goto vsversionset
489-
490-
ifexist"%VS140COMNTOOLS%\..\ide\devenv.exe"setVisualStudioVersion=14.0
491-
ifexist"%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe"setVisualStudioVersion=14.0
492-
ifexist"%ProgramFiles%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe"setVisualStudioVersion=14.0
493-
ifnot"%VisualStudioVersion%"==""goto vsversionset
494-
495-
ifexist"%VS120COMNTOOLS%\..\ide\devenv.exe"setVisualStudioVersion=12.0
496-
ifexist"%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe"setVisualStudioVersion=12.0
497-
ifexist"%ProgramFiles%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe"setVisualStudioVersion=12.0
498-
499-
:vsversionset
500-
if"%VisualStudioVersion%"==""echo Error: Could not find an installation of Visual Studio&&goto :failure
501-
502-
ifexist"%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" (
503-
set_msbuildexe="%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe"
504-
goto :havemsbuild
505-
)
506-
ifexist"%ProgramFiles(x86)%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe" (
507-
set_msbuildexe="%ProgramFiles(x86)%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe"
508-
goto :havemsbuild
509-
)
510-
ifexist"%ProgramFiles%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe" (
511-
set_msbuildexe="%ProgramFiles%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe"
512-
goto :havemsbuild
513-
)
514-
echo Error: Could not find MSBuild.exe.&&goto :failure
515-
goto :eof
516-
517-
:havemsbuild
486+
set_msbuildexe=%~dp0packages\RoslynTools.MSBuild.0.4.0-alpha\tools\msbuild\MSBuild.exe
518487
set_nrswitch=/nr:false
519488

520489
:: See <http://www.appveyor.com/docs/environment-variables>
@@ -931,17 +900,6 @@ if "%TEST_VS_IDEUNIT_SUITE%" == "1" (
931900
)
932901
)
933902

934-
REM ---------------- publish-vsix -----------------------
935-
936-
if"%PUBLISH_VSIX%"=="1" (
937-
ifnot"%MYGET_APIKEY%"=="" (
938-
powershell -noprofile -executionPolicy ByPass -file"%~dp0setup\publish-assets.ps1" -binariesPath"%~dp0%BUILD_CONFIG%" -branchName"%BUILD_SOURCEBRANCH%" -apiKey"%MYGET_APIKEY%"
939-
iferrorlevel1goto :failure
940-
)else (
941-
echo No MyGet API key specified, skipping package publish.
942-
)
943-
)
944-
945903
goto :success
946904
REM ------ exit -------------------------------------
947905
:failure

‎build.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,18 @@ if [ $_autoselect_tests -eq 1 ]; then
350350
fi
351351
fi
352352

353+
# If the `PB_SKIPTESTS` variable is set to 'true' then no tests should be built or run, even if explicitly specified
354+
if [$PB_SKIPTESTS-eq"true" ];then
355+
export TEST_NET40_COMPILERUNIT_SUITE=0
356+
export TEST_NET40_COREUNIT_SUITE=0
357+
export TEST_NET40_FSHARP_SUITE=0
358+
export TEST_NET40_FSHARPQA_SUITE=0
359+
export TEST_CORECLR_COREUNIT_SUITE=0
360+
export TEST_CORECLR_FSHARP_SUITE=0
361+
export TEST_PORTABLE_COREUNIT_SUITE=0
362+
export TEST_VS_IDEUNIT_SUITE=0
363+
fi
364+
353365
#
354366
# Report config
355367
#
@@ -367,6 +379,7 @@ printf "BUILD_SETUP=%s\n" "$BUILD_SETUP"
367379
printf"BUILD_CONFIG=%s\n""$BUILD_CONFIG"
368380
printf"BUILD_PUBLICSIGN=%s\n""$BUILD_PUBLICSIGN"
369381
printf"\n"
382+
printf"PB_SKIPTESTS=%s\n""$PB_SKIPTESTS"
370383
printf"TEST_NET40_COMPILERUNIT_SUITE=%s\n""$TEST_NET40_COMPILERUNIT_SUITE"
371384
printf"TEST_NET40_COREUNIT_SUITE=%s\n""$TEST_NET40_COREUNIT_SUITE"
372385
printf"TEST_NET40_FSHARP_SUITE=%s\n""$TEST_NET40_FSHARP_SUITE"

‎netci.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def static getBuildJobName(def configuration, def os) {
3838
def buildCommand='';
3939
def buildFlavor='';
4040

41-
if (configuration=="Release_fcs") {
41+
if (configuration=="Release_fcs"&& branch!="dev15.5") {
4242
// Build and test FCS NuGet package
4343
buildPath="./fcs/"
4444
buildFlavor=""

‎packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
<!-- Build infrastructure-->
1111
<packageid="MicroBuild.Core"version="0.2.0" />
1212
<packageid="MicroBuild.Core.Sentinel"version="1.0.0" />
13+
<packageid="RoslynTools.MSBuild"version="0.4.0-alpha" />
14+
15+
<!-- For the internal orchestrated build. This version should be kept in sync with `PublishToBlob.proj`-->
16+
<packageid="Microsoft.DotNet.Build.Tasks.Feed"version="1.0.0-prerelease-02121-01" />
1317

1418
<!-- Actual dependencies of FSharp.Compiler.dll and FSharp.Core.dll-->
1519
<packageid="System.Collections.Immutable"version="1.3.1" />

0 commit comments

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