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

Commit8a96a49

Browse files
authored
Merge pull request #3879 from Microsoft/merges/dev15.5-to-dev15.6-20171103-070041
Merge dev15.5 to dev15.6
2 parentsaf270ca +e8c4ce1 commit8a96a49

File tree

6 files changed

+43
-11
lines changed

6 files changed

+43
-11
lines changed

‎build.cmd‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ rem Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt
44
setlocalenableDelayedExpansion
55

66
:ARGUMENTS_VALIDATION
7-
8-
if /I"%1"=="--help" (goto :USAGE)
7+
if /I"%1"=="--help" (goto :USAGE)
98
if /I"%1"=="/help" (goto :USAGE)
109
if /I"%1"=="/h" (goto :USAGE)
1110
if /I"%1"=="/?" (goto :USAGE)
1211
goto :ARGUMENTS_OK
1312

13+
1414
:USAGE
1515

1616
echo Build and run a subset of test suites
@@ -92,6 +92,10 @@ for %%i in (%BUILD_FSC_DEFAULT%) do ( call :PROCESS_ARG %%i )
9292

9393
REM apply defaults
9494

95+
if /i"%_buildexit%"=="1" (
96+
exit /B%_buildexitvalue%
97+
)
98+
9599
if /i"%_autoselect%"=="1" (
96100
setBUILD_NET40_FSHARP_CORE=1
97101
setBUILD_NET40=1
@@ -129,6 +133,12 @@ set ARG2=%~2
129133
if"%ARG%"=="1"if"%2"=="" (set ARG=default)
130134
if"%2"==""ifnot"%ARG%"=="default"goto :EOF
131135

136+
rem Do no work
137+
if /i"%ARG%"=="none" (
138+
set_buildexit=1
139+
set_buildexitvalue=0
140+
)
141+
132142
if /i"%ARG%"=="net40-lib" (
133143
set_autoselect=0
134144
setBUILD_NET40_FSHARP_CORE=1

‎build.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ do
138138
"nobuild")
139139
export BUILD_PHASE=0
140140
;;
141+
"none")
142+
_autoselect=0
143+
export _buildexit=1
144+
export _buildexitVALUE=0
145+
;;
141146
"all")
142147
_autoselect=0
143148
export BUILD_PROTO=1
@@ -320,6 +325,10 @@ do
320325
esac
321326
done
322327

328+
if [$_buildexit-eq 1 ];then
329+
exit$_buildexitvalue
330+
fi
331+
323332
# Apply defaults, if necessary.
324333
if [$_autoselect-eq 1 ];then
325334
export BUILD_NET40=1

‎netci.groovy‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def static getBuildJobName(def configuration, def os) {
2121
// Linux
2222
configurations= ['Release','Release_fcs' ];
2323
}
24+
2425
configurations.each {configuration->
2526

2627
def lowerConfiguration= configuration.toLowerCase()
@@ -68,7 +69,7 @@ def static getBuildJobName(def configuration, def os) {
6869
build_args="net40"
6970
}
7071
else {
71-
build_args="ci"
72+
build_args="none"
7273
}
7374
}
7475

@@ -102,13 +103,14 @@ ${buildPath}build.cmd ${buildFlavor} ${build_args}""")
102103
Utilities.setMachineAffinity(newJob, os, affinity)
103104
Utilities.standardJobSetup(newJob, project, isPullRequest,"*/${branch}")
104105

105-
106-
Utilities.addArchival(newJob,"tests/TestResults/*.*","", skipIfNoTestFiles,false)
107-
if (configuration=="Release_fcs") {
108-
Utilities.addArchival(newJob,"Release/**")
109-
}
110-
else {
111-
Utilities.addArchival(newJob,"${buildFlavor}/**")
106+
if (build_args!="none") {
107+
Utilities.addArchival(newJob,"tests/TestResults/*.*","", skipIfNoTestFiles,false)
108+
if (configuration=="Release_fcs") {
109+
Utilities.addArchival(newJob,"Release/fcs/**")
110+
}
111+
else {
112+
Utilities.addArchival(newJob,"${buildFlavor}/**")
113+
}
112114
}
113115
if (isPullRequest) {
114116
Utilities.addGithubPRTriggerForBranch(newJob, branch,"${os}${configuration} Build")

‎vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<GeneratedModuleName>Microsoft.VisualStudio.FSharp.LanguageService.Strings</GeneratedModuleName>
6868
</EmbeddedResource>
6969
<CompileInclude="AssemblyInfo.fs" />
70+
<CompileInclude="LanguageServiceConstants.fs" />
7071
<CompileInclude="Error.fs" />
7172
<CompileInclude="Vs.fs" />
7273
<CompileInclude="Colorize.fs" />
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
2+
3+
namespaceMicrosoft.VisualStudio.FSharp.LanguageService
4+
5+
[<RequireQualifiedAccess>]
6+
moduleinternalLanguageServiceConstants=
7+
8+
/// "F#"
9+
[<Literal>]
10+
letFSharpLanguageName="F#"

‎vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ type internal ProjectSitesAndFiles() =
274274
ifnot(isNull project)then
275275
for referencein project.ProjectReferencesdo
276276
letproject= workspace.CurrentSolution.GetProject(reference.ProjectId)
277-
ifnot(isNull project)then
277+
ifnot(isNull project)&& project.Language= LanguageServiceConstants.FSharpLanguageNamethen
278278
letsiteProvider= provideProjectSiteProvider(workspace, project, serviceProvider, projectOptionsTable)
279279
letreferenceProject= workspace.ProjectTracker.GetProject(reference.ProjectId)
280280
letoutputPath= referenceProject.BinOutputPath

0 commit comments

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