Skip to content

Commit bb110d5

Browse files
brettfobrettfo
committed
consume dotnet arcade sdk
1 parent d5f5bd0 commit bb110d5

File tree

269 files changed

+4001
-4135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+4001
-4135
lines changed

‎.gitignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# output location
22
artifacts/
33

4-
packages/
5-
64
/tests/scripts/current
5+
.dotnet/
6+
.packages/
7+
./tools
78

89
# Patches that may have been generated by scripts.
910
# (These aren't generally useful to commit directly; if anything, they should be applied.)

‎.vsts-pr.yaml‎

Lines changed: 101 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,48 @@
11
jobs:
2+
23
- job: Linux
34
pool:
45
vmImage: ubuntu-16.04
56
timeoutInMinutes: 90
67
strategy:
78
maxParallel: 3
89
matrix:
9-
dotnet_sdk:
10-
_command: make
11-
_args: Configuration=release
12-
release_fcs:
13-
_command: ./fcs/build.sh
14-
_args: Build
10+
coreclr_release:
11+
_configuration: Release
12+
_testKind: testcoreclr
13+
steps:
14+
- script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind)
15+
- task: PublishBuildArtifacts@1
16+
displayName: Publish Build Logs
17+
inputs:
18+
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_configuration)'
19+
ArtifactName: 'Linux $(_configuration) $(_testKind) build log'
20+
publishLocation: Container
21+
continueOnError: true
22+
condition: not(succeeded())
23+
- task: PublishBuildArtifacts@1
24+
displayName: Publish Test Results
25+
inputs:
26+
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults'
27+
ArtifactName: 'Linux $(_configuration) $(_testKind)'
28+
publishLocation: Container
29+
continueOnError: true
30+
condition: not(succeeded())
31+
32+
- job: Linux_FCS
33+
pool:
34+
vmImage: ubuntu-16.04
35+
timeoutInMinutes: 90
1536
steps:
16-
- script: $(_command) $(_args)
37+
- script: ./fcs/build.sh Build
1738
- task: PublishBuildArtifacts@1
39+
displayName: Publish Test Results
1840
inputs:
1941
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults'
20-
ArtifactName: 'Linux $(_command) $(_args)'
42+
ArtifactName: 'Linux FCS test results'
2143
publishLocation: Container
2244
continueOnError: true
23-
condition: failed()
45+
condition: not(succeeded())
2446

2547
- job: MacOS
2648
pool:
@@ -29,56 +51,92 @@ jobs:
2951
strategy:
3052
maxParallel: 3
3153
matrix:
32-
dotnet_sdk:
33-
_command: make
34-
_args: Configuration=release
35-
release_fcs:
36-
_command: ./fcs/build.sh
37-
_args: Build
54+
coreclr_release:
55+
_configuration: Release
56+
_testKind: testcoreclr
3857
steps:
39-
- script: $(_command) $(_args)
58+
- script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind)
4059
- task: PublishBuildArtifacts@1
60+
displayName: Publish Build Logs
61+
inputs:
62+
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_configuration)'
63+
ArtifactName: 'MacOS $(_configuration) $(_testKind) build log'
64+
publishLocation: Container
65+
continueOnError: true
66+
condition: not(succeeded())
67+
- task: PublishBuildArtifacts@1
68+
displayName: Publish Test Results
4169
inputs:
4270
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults'
43-
ArtifactName: 'MacOS $(_command) $(_args)'
71+
ArtifactName: 'MacOS $(_configuration) $(_testKind)'
4472
publishLocation: Container
4573
continueOnError: true
46-
condition: failed()
74+
condition: not(succeeded())
75+
76+
- job: MacOS_FCS
77+
pool:
78+
vmImage: macOS-10.13
79+
timeoutInMinutes: 90
80+
steps:
81+
- script: ./fcs/build.sh Build
82+
- task: PublishBuildArtifacts@1
83+
displayName: Publish Test Results
84+
inputs:
85+
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults'
86+
ArtifactName: 'MacOS FCS test results'
87+
publishLocation: Container
88+
continueOnError: true
89+
condition: not(succeeded())
4790

4891
- job: Windows
4992
pool:
5093
vmImage: vs2017-win2016
5194
timeoutInMinutes: 120
5295
strategy:
53-
maxParallel: 7
96+
maxParallel: 4
5497
matrix:
55-
ci_part1:
56-
_command: build.cmd
57-
_args: release ci_part1
58-
ci_part2:
59-
_command: build.cmd
60-
_args: release ci_part2
61-
ci_part3:
62-
_command: build.cmd
63-
_args: release ci_part3
64-
ci_part4:
65-
_command: build.cmd
66-
_args: release ci_part4
67-
debug_default:
68-
_command: build.cmd
69-
_args: debug
70-
net40_no_vs:
71-
_command: build.cmd
72-
_args: release net40
73-
release_fcs:
74-
_command: fcs\build.cmd
75-
_args: TestAndNuget
98+
desktop_release:
99+
_configuration: Release
100+
_testKind: testDesktop
101+
coreclr_release:
102+
_configuration: Release
103+
_testKind: testCoreclr
104+
fsharpqa_release:
105+
_configuration: Release
106+
_testKind: testFSharpQA
107+
vs_release:
108+
_configuration: Release
109+
_testKind: testVs
110+
steps:
111+
- script: eng\CIBuild.cmd -configuration $(_configuration) -$(_testKind)
112+
- task: PublishBuildArtifacts@1
113+
displayName: Publish Build Logs
114+
inputs:
115+
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\log\$(_configuration)'
116+
ArtifactName: 'Windows $(_configuration) $(_testKind) build log'
117+
publishLocation: Container
118+
continueOnError: true
119+
condition: not(succeeded())
120+
- task: PublishBuildArtifacts@1
121+
displayName: Publish Test Results
122+
inputs:
123+
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\TestResults'
124+
ArtifactName: 'Windows $(_configuration) $(_testKind) test results'
125+
publishLocation: Container
126+
continueOnError: true
127+
condition: not(succeeded())
128+
129+
- job: Windows_FCS
130+
pool:
131+
vmImage: vs2017-win2016
132+
timeoutInMinutes: 120
76133
steps:
77-
- script: $(_command) $(_args)
134+
- script: fcs\build.cmd TestAndNuget
78135
- task: PublishBuildArtifacts@1
136+
displayName: Publish Test Results
79137
inputs:
80138
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\TestResults'
81-
ArtifactName: 'Windows $(_command) $(_args)'
139+
ArtifactName: 'Windows FCS test results'
82140
publishLocation: Container
83141
continueOnError: true
84-
condition: failed()
142+
condition: not(succeeded())

‎.vsts-signed.yaml‎

Lines changed: 65 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
variables:
2-
- name: PB_PublishBlobFeedUrl
3-
value: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
42
- group: DotNet-Blob-Feed
5-
- name: PB_PublishBlobFeedKey
6-
value: $(dotnetfeed-storage-access-key-1)
3+
- name: SignType
4+
value: real
5+
- name: VisualStudioDropName
6+
value: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
77

88
jobs:
99
- job: Full_Signed
@@ -13,124 +13,96 @@ jobs:
1313
variables:
1414
BuildConfiguration: 'Release'
1515
steps:
16+
1617
# Install Signing Plugin
1718
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1
1819
displayName: Install Signing Plugin
1920
inputs:
2021
signType: real
21-
condition: and(succeeded(), in(variables['PB_SignType'], 'test', 'real'))
22-
23-
# Install Swix Plugin
24-
- task: ms-vseng.MicroBuildTasks.32f78468-e895-4f47-962c-58a699361df8.MicroBuildSwixPlugin@1
25-
displayName: Install Swix Plugin
22+
esrpSigning: true
23+
condition: and(succeeded(), ne(variables['SignType'], ''))
2624

27-
# Run build.cmd
28-
- task: CmdLine@1
29-
displayName: Run build.cmd
30-
inputs:
31-
filename: build.cmd
32-
arguments: microbuild
25+
# Build
26+
- script: eng\CIBuild.cmd
27+
-configuration $(BuildConfiguration)
28+
-testAll
29+
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
30+
/p:VisualStudioDropName=$(VisualStudioDropName)
31+
/p:DotNetSignType=$(SignType)
32+
/p:DotNetPublishToBlobFeed=true
33+
/p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
34+
/p:DotNetPublishBlobFeedUrl=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
35+
/p:PublishToSymbolServer=true
36+
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
37+
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
38+
displayName: Build
3339

34-
# Publish nightly package to MyGet
35-
- task: PowerShell@1
36-
displayName: Publish nightly package to MyGet
40+
# Publish logs
41+
- task: PublishBuildArtifacts@1
42+
displayName: Publish Logs
3743
inputs:
38-
scriptName: 'setup\publish-assets.ps1'
39-
arguments: '-binariesPath artifacts\bin -configuration $(BuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
40-
condition: and(succeeded(), contains(variables['PB_PublishType'], 'myget'))
44+
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\log\$(BuildConfiguration)'
45+
ArtifactName: 'Build Diagnostic Files'
46+
publishLocation: Container
47+
continueOnError: true
48+
condition: succeededOrFailed()
4149

42-
# Package publish
43-
- task: CmdLine@1
44-
displayName: Restore package publishing
45-
inputs:
46-
filename: '.nuget\NuGet.exe'
47-
arguments: 'restore packages.config -PackagesDirectory packages -Source https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json'
48-
condition: and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
49-
- task: MSBuild@1
50-
displayName: Publish packages to Azure Blob Storage
51-
inputs:
52-
solution: PublishToBlob.proj
53-
msbuildArguments: '/t:Build /p:Configuration=$(BuildConfiguration) /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:AccountKey=$(PB_PublishBlobFeedKey) /p:ManifestRepouri=$(Build.Repository.Uri) /p:ManifestBranch=$(Build.SourceBranch) /p:ManifestCommit=$(Build.SourceVersion) /p:ManifestBuildId=$(Build.BuildNumber) /bl:$(Build.SourcesDirectory)/artifacts/log/$(BuildConfiguration)/pub/publish.binlog'
54-
condition: and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
50+
# Publish test results
5551
- task: PublishBuildArtifacts@1
56-
displayName: Publish publishing bin log
52+
displayName: Publish Test Results
5753
inputs:
58-
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(BuildConfiguration)/pub'
59-
ArtifactName: 'Publish_bin_log'
54+
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\TestResults'
55+
ArtifactName: 'Test Results'
6056
publishLocation: Container
6157
continueOnError: true
62-
condition: and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
63-
- task: CopyFiles@2
64-
displayName: Gather Asset Manifests
58+
condition: succeededOrFailed()
59+
60+
# Upload VSTS Drop
61+
- task: ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
62+
displayName: Upload VSTS Drop
6563
inputs:
66-
SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(BuildConfiguration)/AssetManifest'
67-
TargetFolder: '$(Build.StagingDirectory)/AssetManifests'
68-
continueOnError: true
69-
condition: and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
64+
DropName: $(VisualStudioDropName)
65+
DropFolder: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)\Insertion'
66+
condition: succeeded()
67+
68+
# Publish an artifact that the RoslynInsertionTool is able to find by its name.
7069
- task: PublishBuildArtifacts@1
71-
displayName: Push Asset Manifests
70+
displayName: Publish Artifact VSSetup
7271
inputs:
73-
PathtoPublish: '$(Build.StagingDirectory)/AssetManifests'
74-
PublishLocation: Container
75-
ArtifactName: AssetManifests
76-
continueOnError: true
77-
condition: and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
72+
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)\Insertion'
73+
ArtifactName: 'VSSetup'
74+
condition: succeeded()
7875

79-
# Create static drop
76+
# Archive NuGet packages to DevOps.
8077
- task: PublishBuildArtifacts@1
81-
displayName: Create static drop
78+
displayName: Publish Artifact Packages
8279
inputs:
83-
PathtoPublish: 'artifacts'
84-
ArtifactName: '$(Build.BuildNumber)'
85-
publishLocation: FilePath
86-
TargetPath: '$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)'
87-
Parallel: true
88-
ParallelCount: 64
89-
condition: and(succeeded(), contains(variables['PB_PublishType'], 'drop'))
80+
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\packages\$(BuildConfiguration)'
81+
ArtifactName: 'Packages'
82+
condition: succeeded()
9083

91-
# Publish symbols
92-
- task: PublishSymbols@1
93-
displayName: Publish symbols
84+
# Publish nightly package to MyGet
85+
- task: PowerShell@1
86+
displayName: Publish nightly package to MyGet
9487
inputs:
95-
SymbolsPath: '$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
96-
SearchPattern: '**\*.dll;**\*.exe;**\*.pdb'
97-
SymbolsFolder: '$(Build.SourcesDirectory)\artifacts\SymStore'
98-
TreatNotIndexedAsWarning: true
99-
SymbolsProduct: '$(Build.DefinitionName)'
100-
SymbolsVersion: '$(Build.BuildNumber)'
101-
continueOnError: true
102-
condition: and(succeeded(), contains(variables['PB_PublishType'], 'symbols'))
88+
scriptName: 'setup\publish-assets.ps1'
89+
arguments: '-binariesPath artifacts\bin -configuration $(BuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
90+
condition: succeeded()
10391

104-
# Upload VSTS Drop
105-
- task: ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
106-
displayName: Upload VSTS Drop
92+
# Package publish
93+
- task: PublishBuildArtifacts@1
94+
displayName: Push Asset Manifests
10795
inputs:
108-
DropFolder: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)\Insertion'
109-
condition: and(succeeded(), contains(variables['PB_PublishType'], 'vsts'))
96+
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(BuildConfiguration)/AssetManifest'
97+
ArtifactName: AssetManifests
98+
continueOnError: true
99+
condition: succeeded()
110100

111101
# Execute cleanup tasks
112102
- task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
113103
displayName: Execute cleanup tasks
114104
condition: succeededOrFailed()
115105

116-
# Publish Artifact: MicroBuildOutputs
117-
- task: PublishBuildArtifacts@1
118-
displayName: 'Publish Artifact: MicroBuildOutputs'
119-
inputs:
120-
PathtoPublish: '$(Build.StagingDirectory)\MicroBuild\Output'
121-
ArtifactName: MicroBuildOutputs
122-
publishLocation: Container
123-
condition: and(succeeded(), contains(variables['PB_PublishType'], 'microbuild'))
124-
125-
# Publish Symbols to Symweb
126-
- task: ms-vscs-artifact.build-tasks.artifactSymbolTask-1.artifactSymbolTask@0
127-
displayName: Publish symbols to SymWeb
128-
inputs:
129-
symbolServiceURI: 'https://microsoft.artifacts.visualstudio.com/DefaultCollection'
130-
sourcePath: '$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\SymStore'
131-
usePat: false
132-
condition: and(succeeded(), contains(variables['PB_PublishType'], 'symweb'))
133-
134106
- template: /eng/common/templates/job/publish-build-assets.yml
135107
parameters:
136108
dependsOn:

0 commit comments

Comments
 (0)