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

Commite801b65

Browse files
author
dotnet-automerge-bot
authored
Merge pull requestdotnet#5763 from Microsoft/merges/master-to-dev16.0
Merge master to dev16.0
2 parentsb9819e6 +de616c6 commite801b65

File tree

2 files changed

+114
-116
lines changed

2 files changed

+114
-116
lines changed

‎.vsts-pr.yaml‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
phases:
2-
-phase:Linux
3-
queue:
4-
name:Hosted Linux Preview
5-
timeoutInMinutes:90
6-
parallel:2
1+
jobs:
2+
-job:Linux
3+
pool:
4+
vmImage:ubuntu-16.04
5+
timeoutInMinutes:90
6+
strategy:
7+
maxParallel:2
78
matrix:
89
release_default:
910
_command:./mono/cibuild.sh
@@ -13,20 +14,21 @@ phases:
1314
# _command: ./fcs/build.sh
1415
# _args: Build
1516
steps:
16-
-script:$(_command) $(_args)
17-
-task:PublishBuildArtifacts@1
18-
inputs:
19-
PathtoPublish:'$(Build.SourcesDirectory)/tests/TestResults'
20-
ArtifactName:'Linux $(_command) $(_args)'
21-
publishLocation:Container
22-
continueOnError:true
23-
condition:failed()
17+
-script:$(_command) $(_args)
18+
-task:PublishBuildArtifacts@1
19+
inputs:
20+
PathtoPublish:'$(Build.SourcesDirectory)/tests/TestResults'
21+
ArtifactName:'Linux $(_command) $(_args)'
22+
publishLocation:Container
23+
continueOnError:true
24+
condition:failed()
2425

25-
-phase:Windows
26-
queue:
27-
name:Hosted VS2017
28-
timeoutInMinutes:90
29-
parallel:7
26+
-job:Windows
27+
pool:
28+
vmImage:vs2017-win2016
29+
timeoutInMinutes:90
30+
strategy:
31+
maxParallel:7
3032
matrix:
3133
ci_part1:
3234
_command:build.cmd
@@ -50,11 +52,11 @@ phases:
5052
_command:fcs\build.cmd
5153
_args:TestAndNuget
5254
steps:
53-
-script:$(_command) $(_args)
54-
-task:PublishBuildArtifacts@1
55-
inputs:
56-
PathtoPublish:'$(Build.SourcesDirectory)\tests\TestResults'
57-
ArtifactName:'Windows $(_command) $(_args)'
58-
publishLocation:Container
59-
continueOnError:true
60-
condition:failed()
55+
-script:$(_command) $(_args)
56+
-task:PublishBuildArtifacts@1
57+
inputs:
58+
PathtoPublish:'$(Build.SourcesDirectory)\tests\TestResults'
59+
ArtifactName:'Windows $(_command) $(_args)'
60+
publishLocation:Container
61+
continueOnError:true
62+
condition:failed()

‎.vsts-signed.yaml‎

Lines changed: 85 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,96 @@
1-
queue:
2-
name:VSEng-MicroBuildVS2017
1+
jobs:
2+
-job:Full_Signed
3+
pool:
4+
name:VSEng-MicroBuildVS2017
35
timeoutInMinutes:300
4-
demands:
5-
-visualstudio
6-
-DotNetFramework
7-
-msbuild
6+
variables:
7+
MSBuildConfiguration:'Release'
8+
steps:
9+
# Install Signing Plugin
10+
-task:ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1
11+
displayName:Install Signing Plugin
12+
inputs:
13+
signType:real
14+
condition:and(succeeded(), in(variables['PB_SignType'], 'test', 'real'))
815

9-
variables:
10-
MSBuildConfiguration:'Release'
16+
# Install Swix Plugin
17+
-task:ms-vseng.MicroBuildTasks.32f78468-e895-4f47-962c-58a699361df8.MicroBuildSwixPlugin@1
18+
displayName:Install Swix Plugin
1119

12-
steps:
13-
# Install Signing Plugin
14-
-task:ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1
15-
displayName:Install Signing Plugin
16-
inputs:
17-
signType:real
18-
condition:and(succeeded(), in(variables['PB_SignType'], 'test', 'real'))
20+
# Run build.cmd
21+
-task:CmdLine@1
22+
displayName:Run build.cmd
23+
inputs:
24+
filename:build.cmd
25+
arguments:microbuild
1926

20-
# Install Swix Plugin
21-
-task:ms-vseng.MicroBuildTasks.32f78468-e895-4f47-962c-58a699361df8.MicroBuildSwixPlugin@1
22-
displayName:Install Swix Plugin
27+
# Publish nightly package to MyGet
28+
-task:PowerShell@1
29+
displayName:Publish nightly package to MyGet
30+
inputs:
31+
scriptName:'setup\publish-assets.ps1'
32+
arguments:'-binariesPath $(MSBuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
33+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'myget'))
2334

24-
# Run build.cmd
25-
-task:CmdLine@1
26-
displayName:Run build.cmd
27-
inputs:
28-
filename:build.cmd
29-
arguments:microbuild
35+
# Publish packages to Azure Blob Storage
36+
-task:MSBuild@1
37+
displayName:Publish packages to Azure Blob Storage
38+
inputs:
39+
solution:PublishToBlob.proj
40+
msbuildArguments:'/t:Build /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:AccountKey=$(PB_PublishBlobFeedKey) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion) /p:ManifestBuildId=$(OfficialBuildId)'
41+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
3042

31-
# Publish nightly package to MyGet
32-
-task:PowerShell@1
33-
displayName:Publish nightly package to MyGet
34-
inputs:
35-
scriptName:'setup\publish-assets.ps1'
36-
arguments:'-binariesPath $(MSBuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
37-
condition:and(succeeded(), contains(variables['PB_PublishType'], 'myget'))
43+
# Create static drop
44+
-task:PublishBuildArtifacts@1
45+
displayName:Create static drop
46+
inputs:
47+
PathtoPublish:'$(MSBuildConfiguration)'
48+
ArtifactName:'$(Build.BuildNumber)'
49+
publishLocation:FilePath
50+
TargetPath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)'
51+
Parallel:true
52+
ParallelCount:64
53+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'drop'))
3854

39-
# Publish packages to Azure Blob Storage
40-
-task:MSBuild@1
41-
displayName:Publish packages to Azure Blob Storage
42-
inputs:
43-
solution:PublishToBlob.proj
44-
msbuildArguments:'/t:Build /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:AccountKey=$(PB_PublishBlobFeedKey) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion) /p:ManifestBuildId=$(OfficialBuildId)'
45-
condition:and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
55+
# Publish symbols
56+
-task:PublishSymbols@1
57+
displayName:Publish symbols
58+
inputs:
59+
SymbolsPath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
60+
SearchPattern:'**\*.dll;**\*.exe;**\*.pdb'
61+
SymbolsFolder:'$(Build.SourcesDirectory)\$(MSBuildConfiguration)'
62+
TreatNotIndexedAsWarning:true
63+
SymbolsProduct:'$(Build.DefinitionName)'
64+
SymbolsVersion:'$(Build.BuildNumber)'
65+
continueOnError:true
66+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'symbols'))
4667

47-
# Create static drop
48-
-task:PublishBuildArtifacts@1
49-
displayName:Create static drop
50-
inputs:
51-
PathtoPublish:'$(MSBuildConfiguration)'
52-
ArtifactName:'$(Build.BuildNumber)'
53-
publishLocation:FilePath
54-
TargetPath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)'
55-
Parallel:true
56-
ParallelCount:64
57-
condition:and(succeeded(), contains(variables['PB_PublishType'], 'drop'))
68+
# Upload VSTS Drop
69+
-task:ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
70+
displayName:Upload VSTS Drop
71+
inputs:
72+
DropFolder:'$(Build.SourcesDirectory)\$(MSBuildConfiguration)\insertion'
73+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'vsts'))
5874

59-
# Publish symbols
60-
-task:PublishSymbols@1
61-
displayName:Publish symbols
62-
inputs:
63-
SymbolsPath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
64-
SearchPattern:'**\*.dll;**\*.exe;**\*.pdb'
65-
SymbolsFolder:'$(Build.SourcesDirectory)\$(MSBuildConfiguration)'
66-
TreatNotIndexedAsWarning:true
67-
SymbolsProduct:'$(Build.DefinitionName)'
68-
SymbolsVersion:'$(Build.BuildNumber)'
69-
continueOnError:true
70-
condition:and(succeeded(), contains(variables['PB_PublishType'], 'symbols'))
75+
# Execute cleanup tasks
76+
-task:ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
77+
displayName:Execute cleanup tasks
78+
condition:succeededOrFailed()
7179

72-
# Upload VSTS Drop
73-
-task:ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
74-
displayName:Upload VSTS Drop
75-
inputs:
76-
DropFolder:'$(Build.SourcesDirectory)\$(MSBuildConfiguration)\insertion'
77-
condition:and(succeeded(), contains(variables['PB_PublishType'], 'vsts'))
80+
# Publish Artifact: MicroBuildOutputs
81+
-task:PublishBuildArtifacts@1
82+
displayName:'Publish Artifact: MicroBuildOutputs'
83+
inputs:
84+
PathtoPublish:'$(Build.StagingDirectory)\MicroBuild\Output'
85+
ArtifactName:MicroBuildOutputs
86+
publishLocation:Container
87+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'microbuild'))
7888

79-
# Execute cleanup tasks
80-
-task:ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
81-
displayName:Execute cleanup tasks
82-
condition:succeededOrFailed()
83-
84-
# Publish Artifact: MicroBuildOutputs
85-
-task:PublishBuildArtifacts@1
86-
displayName:'Publish Artifact: MicroBuildOutputs'
87-
inputs:
88-
PathtoPublish:'$(Build.StagingDirectory)\MicroBuild\Output'
89-
ArtifactName:MicroBuildOutputs
90-
publishLocation:Container
91-
condition:and(succeeded(), contains(variables['PB_PublishType'], 'microbuild'))
92-
93-
# Publish Symbols to Symweb
94-
-task:ms-vscs-artifact.build-tasks.artifactSymbolTask-1.artifactSymbolTask@0
95-
displayName:Publish symbols to SymWeb
96-
inputs:
97-
symbolServiceURI:'https://microsoft.artifacts.visualstudio.com/DefaultCollection'
98-
sourcePath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
99-
usePat:false
100-
condition:and(succeeded(), contains(variables['PB_PublishType'], 'symweb'))
89+
# Publish Symbols to Symweb
90+
-task:ms-vscs-artifact.build-tasks.artifactSymbolTask-1.artifactSymbolTask@0
91+
displayName:Publish symbols to SymWeb
92+
inputs:
93+
symbolServiceURI:'https://microsoft.artifacts.visualstudio.com/DefaultCollection'
94+
sourcePath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
95+
usePat:false
96+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'symweb'))

0 commit comments

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