summaryrefslogtreecommitdiff
path: root/buildpipeline
diff options
context:
space:
mode:
authorRuss Keldorph <Russ.Keldorph@microsoft.com>2018-04-16 17:24:20 (GMT)
committerRuss Keldorph <Russ.Keldorph@microsoft.com>2018-04-16 17:24:20 (GMT)
commitaec93559245d3e4498397e214c8214ebe789088c (patch)
tree94a404d56d5b33a2775db0b442278a9fc89d39d7 /buildpipeline
parentb3dff4d441013cbfa39ce209f45ba96d605d8e77 (diff)
parent91ce6edff7b897f1356ba43af7b26565639fb6fc (diff)
downloadcoreclr-aec93559245d3e4498397e214c8214ebe789088c.zip
coreclr-aec93559245d3e4498397e214c8214ebe789088c.tar.gz
coreclr-aec93559245d3e4498397e214c8214ebe789088c.tar.bz2
Merge commit 'master' into release/2.1
Diffstat (limited to 'buildpipeline')
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json48
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Linux.json48
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Mac.json50
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json50
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Windows.json50
-rw-r--r--buildpipeline/DotNet-Trusted-Publish-Symbols.json200
-rw-r--r--buildpipeline/DotNet-Trusted-Publish.json205
-rw-r--r--buildpipeline/pipelines.json6
-rw-r--r--buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json12
9 files changed, 480 insertions, 189 deletions
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
index a278d1b..ef671ff 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
@@ -3,6 +3,30 @@
{
"environment": {},
"enabled": true,
+ "continueOnError": true,
+ "alwaysRun": false,
+ "displayName": "Run AgentTools/Begin.sh",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.sh\") {\n \"Begin.sh script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\Begin.sh\n} else {\n \"Begin.sh script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
+ }
+ },
+ {
+ "environment": {},
+ "enabled": true,
"continueOnError": false,
"alwaysRun": false,
"displayName": "Initialize tools",
@@ -367,6 +391,30 @@
"workingFolder": "",
"failOnStandardError": "false"
}
+ },
+ {
+ "environment": {},
+ "enabled": true,
+ "continueOnError": true,
+ "alwaysRun": true,
+ "displayName": "Run AgentTools/End.sh",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\End.sh\") {\n \"End.sh script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\End.sh\n} else {\n \"End.sh script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
+ }
}
],
"options": [
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
index 077b68b..54065c0 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
@@ -3,6 +3,30 @@
{
"environment": {},
"enabled": true,
+ "continueOnError": true,
+ "alwaysRun": false,
+ "displayName": "Run AgentTools/Begin.sh",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.sh\") {\n \"Begin.sh script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\Begin.sh\n} else {\n \"Begin.sh script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
+ }
+ },
+ {
+ "environment": {},
+ "enabled": true,
"continueOnError": false,
"alwaysRun": false,
"displayName": "Initialize tools",
@@ -327,6 +351,30 @@
"workingFolder": "",
"failOnStandardError": "false"
}
+ },
+ {
+ "environment": {},
+ "enabled": true,
+ "continueOnError": true,
+ "alwaysRun": true,
+ "displayName": "Run AgentTools/End.sh",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\End.sh\") {\n \"End.sh script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\End.sh\n} else {\n \"End.sh script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
+ }
}
],
"options": [
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Mac.json b/buildpipeline/DotNet-CoreClr-Trusted-Mac.json
index a9dffd9..bdc5ace 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Mac.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Mac.json
@@ -3,6 +3,30 @@
{
"environment": {},
"enabled": true,
+ "continueOnError": true,
+ "alwaysRun": false,
+ "displayName": "Run AgentTools/Begin.sh",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.sh\") {\n \"Begin.sh script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\Begin.sh\n} else {\n \"Begin.sh script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
+ }
+ },
+ {
+ "environment": {},
+ "enabled": true,
"continueOnError": false,
"alwaysRun": false,
"displayName": "Run $(Agent.BuildDirectory)/s/clean.sh",
@@ -185,6 +209,30 @@
"Parallel": "false",
"ParallelCount": "8"
}
+ },
+ {
+ "environment": {},
+ "enabled": true,
+ "continueOnError": true,
+ "alwaysRun": true,
+ "displayName": "Run AgentTools/End.sh",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\End.sh\") {\n \"End.sh script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\End.sh\n} else {\n \"End.sh script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
+ }
}
],
"options": [
@@ -311,4 +359,4 @@
"revision": 418098432,
"visibility": "organization"
}
-} \ No newline at end of file
+}
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
index a4ae2bf..0c68d3b 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
@@ -3,6 +3,30 @@
{
"environment": {},
"enabled": true,
+ "continueOnError": true,
+ "alwaysRun": false,
+ "displayName": "Run AgentTools/Begin.ps1",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.ps1\") {\n \"Begin.ps1 script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\Begin.ps1\n} else {\n \"Begin.ps1 script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
+ }
+ },
+ {
+ "environment": {},
+ "enabled": true,
"continueOnError": false,
"alwaysRun": false,
"displayName": "Install Signing Plugin",
@@ -275,6 +299,30 @@
"Parallel": "false",
"ParallelCount": "8"
}
+ },
+ {
+ "environment": {},
+ "enabled": true,
+ "continueOnError": true,
+ "alwaysRun": true,
+ "displayName": "Run AgentTools/End.ps1",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\End.ps1\") {\n \"End.ps1 script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\End.ps1\n} else {\n \"End.ps1 script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
+ }
}
],
"options": [
@@ -435,4 +483,4 @@
"revision": 418098432,
"visibility": "organization"
}
-} \ No newline at end of file
+}
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
index ef03b0b..1c9e727 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
@@ -3,6 +3,30 @@
{
"environment": {},
"enabled": true,
+ "continueOnError": true,
+ "alwaysRun": false,
+ "displayName": "Run AgentTools/Begin.ps1",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.ps1\") {\n \"Begin.ps1 script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\Begin.ps1\n} else {\n \"Begin.ps1 script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
+ }
+ },
+ {
+ "environment": {},
+ "enabled": true,
"continueOnError": false,
"alwaysRun": false,
"displayName": "Install Signing Plugin",
@@ -275,6 +299,30 @@
"Parallel": "false",
"ParallelCount": "8"
}
+ },
+ {
+ "environment": {},
+ "enabled": true,
+ "continueOnError": true,
+ "alwaysRun": true,
+ "displayName": "Run AgentTools/End.ps1",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\End.ps1\") {\n \"End.ps1 script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\End.ps1\n} else {\n \"End.ps1 script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
+ }
}
],
"options": [
@@ -428,4 +476,4 @@
"revision": 418098432,
"visibility": "organization"
}
-} \ No newline at end of file
+}
diff --git a/buildpipeline/DotNet-Trusted-Publish-Symbols.json b/buildpipeline/DotNet-Trusted-Publish-Symbols.json
index d796a21..ad915ba 100644
--- a/buildpipeline/DotNet-Trusted-Publish-Symbols.json
+++ b/buildpipeline/DotNet-Trusted-Publish-Symbols.json
@@ -1,6 +1,30 @@
{
"build": [
{
+ "environment": {},
+ "enabled": true,
+ "continueOnError": true,
+ "alwaysRun": false,
+ "displayName": "Run AgentTools/Begin.ps1",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.ps1\") {\n \"Begin.ps1 script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\Begin.ps1\n} else {\n \"Begin.ps1 script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
+ }
+ },
+ {
"enabled": true,
"continueOnError": false,
"alwaysRun": false,
@@ -21,10 +45,30 @@
}
},
{
+ "environment": {},
+ "enabled": true,
+ "continueOnError": false,
+ "alwaysRun": false,
+ "displayName": "Setup vs dev env",
+ "timeoutInMinutes": 0,
+ "task": {
+ "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd",
+ "versionSpec": "1.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "filename": "$(Pipeline.SourcesDirectory)\\setup_vs_tools.cmd",
+ "arguments": "",
+ "modifyEnvironment": "true",
+ "workingFolder": "",
+ "failOnStandardError": "false"
+ }
+ },
+ {
"enabled": true,
"continueOnError": false,
"alwaysRun": false,
- "displayName": "Sync packages",
+ "displayName": "Sync symbol packages",
"timeoutInMinutes": 0,
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -33,51 +77,93 @@
},
"inputs": {
"filename": "sync.cmd",
- "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg/ -- /p:DownloadFlatFiles=true /p:BlobNameExtension=\".nupkg\" /p:DownloadDirectory=$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(PB_BuildType)\\symbolpkg",
+ "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)$(ConfigurationGroup)/symbolpkg/ -- /p:DownloadFlatFiles=true /p:BlobNameExtension=\".nupkg\" /p:DownloadDirectory=$(AzureContainerSymbolPackageDirectory)symbolpkg",
"workingFolder": "$(Pipeline.SourcesDirectory)",
"failOnStandardError": "false"
}
},
{
+ "environment": {},
"enabled": true,
"continueOnError": false,
"alwaysRun": false,
- "displayName": "Extract symbol packages",
+ "displayName": "Symbol Packages -> Blob Feed",
"timeoutInMinutes": 0,
+ "condition": "and(succeeded(), contains(variables.PB_PublishType, 'blob'), eq(variables.ConfigurationGroup, 'Release'))",
"task": {
- "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
"versionSpec": "1.*",
"definitionType": "task"
},
"inputs": {
- "scriptType": "inlineScript",
- "scriptName": "",
- "arguments": "-BuildType $(PB_BuildType) -SymPkgGlob $(PB_AzureContainerSymbolPackageGlob) -Branch $(SourceBranch)",
+ "filename": "msbuild",
+ "arguments": "src\\publish.proj /v:D /t:PublishSymbolPackages /p:__PublishSymbols=true $(FeedPublishArguments) /fileloggerparameters:Verbosity=diag;LogFile=publishsympkg.log",
"workingFolder": "$(Pipeline.SourcesDirectory)",
- "inlineScript": "param($BuildType, $SymPkgGlob, $Branch)\nif ($BuildType -ne \"Release\") { exit }\n\n.\\run.cmd build -- `\n/t:UnzipSymbolPackagesForPublish `\n/p:SymbolPackagesToPublishGlob=$SymPkgGlob `\n/v:D",
- "failOnStandardError": "true"
+ "failOnStandardError": "false"
}
},
{
+ "environment": {},
"enabled": true,
"continueOnError": false,
"alwaysRun": false,
- "displayName": "Publish Symbols to Artifact Services",
+ "displayName": "Publish symbols to msdl",
"timeoutInMinutes": 0,
+ "condition": "and(succeeded(), contains(variables.PB_PublishType, 'msdl'), eq(variables.ConfigurationGroup, 'Release'))",
"task": {
- "id": "29827cd1-5c33-4ff0-a817-abd46970ffc4",
- "versionSpec": "0.*",
+ "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
+ "versionSpec": "1.*",
"definitionType": "task"
},
"inputs": {
- "symbolServiceURI": "https://microsoft.artifacts.visualstudio.com/DefaultCollection",
- "requestName": "$(system.teamProject)/$(Build.BuildNumber)/$(Build.BuildId)",
- "sourcePath": "$(Pipeline.SourcesDirectory)\\bin\\obj\\SymbolsRequest\\ExtractedPackages",
- "assemblyPath": "",
- "toLowerCase": "true",
- "detailedLog": "true",
- "expirationInDays": "30",
- "usePat": "false"
+ "filename": "msbuild",
+ "arguments": "src\\publish.proj /v:D /t:PublishAllSymbols $(FeedPublishArguments) /p:SymbolServerPath=$(PB_MsdlSymbolServerPath) /p:SymbolServerPAT=$(PB_MsdlSymbolServerPAT) /p:SymbolExpirationInDays=$(PB_SymbolExpirationInDays)",
+ "workingFolder": "$(Pipeline.SourcesDirectory)",
+ "failOnStandardError": "false"
+ }
+ },
+ {
+ "environment": {},
+ "enabled": true,
+ "continueOnError": false,
+ "alwaysRun": false,
+ "displayName": "Publish symbols to symweb",
+ "timeoutInMinutes": 0,
+ "condition": "and(succeeded(), contains(variables.PB_PublishType, 'symweb'), eq(variables.ConfigurationGroup, 'Release'))",
+ "task": {
+ "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
+ "versionSpec": "1.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "filename": "msbuild",
+ "arguments": "src\\publish.proj /v:D /t:PublishAllSymbols $(FeedPublishArguments) /p:SymbolServerPath=$(PB_SymwebSymbolServerPath) /p:SymbolServerPAT=$(PB_SymwebSymbolServerPAT) /p:SymbolExpirationInDays=$(PB_SymbolExpirationInDays)",
+ "workingFolder": "$(Pipeline.SourcesDirectory)",
+ "failOnStandardError": "false"
+ }
+ },
+ {
+ "environment": {},
+ "enabled": true,
+ "continueOnError": true,
+ "alwaysRun": true,
+ "displayName": "Run AgentTools/End.ps1",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\End.ps1\") {\n \"End.ps1 script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\End.ps1\n} else {\n \"End.ps1 script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
}
}
],
@@ -129,8 +215,8 @@
"value": "false",
"allowOverride": true
},
- "PB_BuildType": {
- "value": "Release",
+ "ConfigurationGroup": {
+ "value": "$(PB_BuildType)",
"allowOverride": true
},
"CloudDropAccountName": {
@@ -142,12 +228,25 @@
"allowOverride": true,
"isSecret": true
},
- "OfficialBuildId": {
+ "PB_ContainerName": {
"value": "$(Build.BuildNumber)",
"allowOverride": true
},
- "Label": {
- "value": "$(Build.BuildNumber)",
+ "PB_BlobNamePrefix": {
+ "value": "$(PB_PipeBuildIdentifier)/",
+ "allowOverride": true
+ },
+ "AzureBlobFeedAccountName": {
+ "value": "dotnetfeed",
+ "allowOverride": true
+ },
+ "AzureBlobFeedAccessToken": {
+ "value": null,
+ "allowOverride": true,
+ "isSecret": true
+ },
+ "AzureBlobFeedContainerName": {
+ "value": "dotnet-core",
"allowOverride": true
},
"Pipeline.SourcesDirectory": {
@@ -167,6 +266,10 @@
"value": null,
"isSecret": true
},
+ "OfficialBuildId": {
+ "value": "$(Build.BuildNumber)",
+ "allowOverride": true
+ },
"SourceVersion": {
"value": "master",
"allowOverride": true
@@ -175,39 +278,48 @@
"value": "master",
"allowOverride": true
},
+ "AzureContainerSymbolPackageDirectory": {
+ "value": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\",
+ "allowOverride": true
+ },
"AzureContainerSymbolPackageGlob": {
"value": "symbolpkg\\*.nupkg",
+ },
+ "FeedPublishArguments": {
+ "value": "$(PB_BuildOutputManifestArguments) /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:CloudDropAccessToken=$(PB_PublishBlobFeedKey) /p:CloudDropAccountName=$(AzureBlobFeedAccountName) /p:ContainerName=$(AzureBlobFeedContainerName) /p:OverwriteOnPublish=true /p:PackagesPatternDir=$(AzureContainerSymbolPackageDirectory) /p:__BuildType=$(ConfigurationGroup) /p:OfficialPublish=true /p:PublishFlatContainer=false"
+ },
+ "PB_PublishType": {
+ "value": "",
"allowOverride": true
},
- "PB_AzureContainerSymbolPackageGlob": {
- "value": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(PB_BuildType)\\$(AzureContainerSymbolPackageGlob)",
+ "PB_PublishBlobFeedUrl": {
+ "value": "",
"allowOverride": true
},
- "PB_DotNetCoreShareDir": {
- "value": "passed-by-pipebuild",
+ "PB_PublishBlobFeedKey": {
+ "value": "",
"allowOverride": true
},
- "SymbolsProject": {
- "value": "CLR"
+ "PB_BuildOutputManifestArguments": {
+ "value": "/p:ManifestBuildId=$(OfficialBuildId) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion)"
},
- "SymbolsStatusMail": {
- "value": "dagood;mawilkie"
+ "PB_MsdlSymbolServerPath": {
+ "value": "https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection"
},
- "SymbolsUserName": {
- "value": "dlab"
+ "PB_MsdlSymbolServerPAT": {
+ "value": null,
+ "isSecret": true
},
- "SymbolsRelease": {
- "value": "rtm"
+ "PB_SymwebSymbolServerPath": {
+ "value": "https://microsoft.artifacts.visualstudio.com/DefaultCollection"
},
- "SymbolsProductGroup": {
- "value": "Visual_Studio"
+ "PB_SymwebSymbolServerPAT": {
+ "value": null,
+ "isSecret": true
},
- "SymbolsProductName": {
- "value": "dotnetcore"
+ "PB_SymbolExpirationInDays": {
+ "value": "30"
},
- "SymbolPublishDestinationDir": {
- "value": "$(PB_DotNetCoreShareDir)\\$(PB_VstsRepositoryName)\\$(Label)\\"
- }
},
"retentionRules": [
{
diff --git a/buildpipeline/DotNet-Trusted-Publish.json b/buildpipeline/DotNet-Trusted-Publish.json
index 8cff0ee..ed8c320 100644
--- a/buildpipeline/DotNet-Trusted-Publish.json
+++ b/buildpipeline/DotNet-Trusted-Publish.json
@@ -3,12 +3,35 @@
{
"environment": {},
"enabled": true,
+ "continueOnError": true,
+ "alwaysRun": false,
+ "displayName": "Run AgentTools/Begin.ps1",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.ps1\") {\n \"Begin.ps1 script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\Begin.ps1\n} else {\n \"Begin.ps1 script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
+ }
+ },
+ {
+ "environment": {},
+ "enabled": true,
"continueOnError": false,
"alwaysRun": false,
"displayName": "Install Signing Plugin",
"timeoutInMinutes": 0,
"condition": "and(succeeded(), in(variables.PB_SignType, 'real', 'test'))",
- "refName": "Task2",
"task": {
"id": "30666190-6959-11e5-9f96-f56098202fef",
"versionSpec": "1.*",
@@ -27,9 +50,8 @@
"enabled": true,
"continueOnError": false,
"alwaysRun": false,
- "displayName": "Fetch custom tooling (NuGet, EmbedIndex)",
+ "displayName": "Fetch custom tooling (NuGet)",
"timeoutInMinutes": 0,
- "refName": "Task3",
"task": {
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"versionSpec": "1.*",
@@ -51,7 +73,6 @@
"alwaysRun": false,
"displayName": "Set up pipeline-specific git repository",
"timeoutInMinutes": 0,
- "refName": "Task4",
"task": {
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"versionSpec": "1.*",
@@ -73,7 +94,6 @@
"alwaysRun": false,
"displayName": "Setup vs dev env",
"timeoutInMinutes": 0,
- "refName": "Task1",
"task": {
"id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd",
"versionSpec": "1.*",
@@ -94,27 +114,6 @@
"alwaysRun": false,
"displayName": "Sync packages",
"timeoutInMinutes": 0,
- "refName": "Task5",
- "task": {
- "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "filename": "sync.cmd",
- "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg/flatcontainer/ -- /p:DownloadFlatFiles=true /p:BlobNameExtension=\".nupkg\" /p:DownloadDirectory=$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\pkg",
- "workingFolder": "$(Pipeline.SourcesDirectory)",
- "failOnStandardError": "false"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": false,
- "alwaysRun": false,
- "displayName": "Sync symbol packages",
- "timeoutInMinutes": 0,
- "refName": "Task6",
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
"versionSpec": "1.*",
@@ -122,7 +121,7 @@
},
"inputs": {
"filename": "sync.cmd",
- "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg/ -- /p:DownloadFlatFiles=true /p:BlobNameExtension=\".nupkg\" /p:DownloadDirectory=$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\symbolpkg",
+ "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)$(ConfigurationGroup)/pkg/flatcontainer/ -- /p:DownloadFlatFiles=true /p:BlobNameExtension=\".nupkg\" /p:DownloadDirectory=$(AzureContainerPackageDirectory)pkg",
"workingFolder": "$(Pipeline.SourcesDirectory)",
"failOnStandardError": "false"
}
@@ -132,31 +131,8 @@
"enabled": true,
"continueOnError": false,
"alwaysRun": false,
- "displayName": "Index symbol packages",
- "timeoutInMinutes": 0,
- "refName": "Task8",
- "task": {
- "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "scriptType": "inlineScript",
- "scriptName": "",
- "arguments": "",
- "workingFolder": "",
- "inlineScript": "if ($env:ConfigurationGroup -ne \"Release\") { exit }\n\n& $env:Build_SourcesDirectory\\scripts\\DotNet-Trusted-Publish\\Embed-Index.ps1 `\n $env:Pipeline_SourcesDirectory\\packages\\AzureTransfer\\$env:ConfigurationGroup\\$env:SymbolPackageLocation `\n $env:Build_StagingDirectory\\IndexedSymbolPackages",
- "failOnStandardError": "true"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": false,
- "alwaysRun": false,
"displayName": "Generate Version Assets",
"timeoutInMinutes": 0,
- "refName": "Task9",
"task": {
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"versionSpec": "1.*",
@@ -178,7 +154,6 @@
"alwaysRun": false,
"displayName": "Log Native Version Assets Files",
"timeoutInMinutes": 0,
- "refName": "Task10",
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
"versionSpec": "1.*",
@@ -199,7 +174,6 @@
"displayName": "packages -> dotnet.myget.org",
"timeoutInMinutes": 0,
"condition": "and(succeeded(), contains(variables.PB_PublishType, 'myget'), eq(variables.ConfigurationGroup, 'Release'))",
- "refName": "Task11",
"task": {
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"versionSpec": "1.*",
@@ -208,7 +182,7 @@
"inputs": {
"scriptType": "inlineScript",
"scriptName": "",
- "arguments": "-ApiKey $(MyGetApiKey) -ConfigurationGroup $(ConfigurationGroup) -PackagesGlob $(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\$(AzureContainerPackageGlob) -MyGetFeedUrl $(MyGetFeedUrl)",
+ "arguments": "-ApiKey $(MyGetApiKey) -ConfigurationGroup $(ConfigurationGroup) -PackagesGlob $(AzureContainerPackageDirectory)$(AzureContainerPackageGlob) -MyGetFeedUrl $(MyGetFeedUrl)",
"workingFolder": "$(Pipeline.SourcesDirectory)",
"inlineScript": "param($ApiKey, $ConfigurationGroup, $PackagesGlob, $MyGetFeedUrl)\n\nif ($ConfigurationGroup.ToLower() -ne \"release\") { Write-host \"Chose not to publish\"; exit }\n\nmsbuild /t:NuGetPush /v:Normal `\n/p:NuGetExePath=$env:CustomNuGetPath `\n/p:NuGetApiKey=$ApiKey `\n/p:NuGetSource=$MyGetFeedUrl `\n/p:PackagesGlob=$PackagesGlob",
"failOnStandardError": "true"
@@ -219,33 +193,9 @@
"enabled": true,
"continueOnError": false,
"alwaysRun": false,
- "displayName": "symbol packages -> dotnet.myget.org",
- "timeoutInMinutes": 0,
- "condition": "and(succeeded(), contains(variables.PB_PublishType, 'myget'), eq(variables.ConfigurationGroup, 'Release'))",
- "refName": "Task12",
- "task": {
- "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "scriptType": "inlineScript",
- "scriptName": "",
- "arguments": "-ApiKey $(MyGetApiKey) -ConfigurationGroup $(ConfigurationGroup) -PackagesGlob $(Build.StagingDirectory)\\IndexedSymbolPackages\\*.nupkg -MyGetFeedUrl $(MyGetFeedUrl)",
- "workingFolder": "$(Pipeline.SourcesDirectory)",
- "inlineScript": "param($ApiKey, $ConfigurationGroup, $PackagesGlob, $MyGetFeedUrl)\n\nif ($ConfigurationGroup.ToLower() -ne \"release\") { Write-host \"Chose not to publish\"; exit }\nif ($env:SourceBranch.StartsWith(\"release/\")) { exit }\n\nmsbuild /t:NuGetPush /v:Normal `\n/p:NuGetExePath=$env:CustomNuGetPath `\n/p:NuGetApiKey=$ApiKey `\n/p:NuGetSource=$MyGetFeedUrl `\n/p:PackagesGlob=$PackagesGlob",
- "failOnStandardError": "true"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": false,
- "alwaysRun": false,
"displayName": "Packages -> Blob Feed",
"timeoutInMinutes": 0,
"condition": "and(succeeded(), contains(variables.PB_PublishType, 'blob'), eq(variables.ConfigurationGroup, 'Release'))",
- "refName": "Task13",
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
"versionSpec": "1.*",
@@ -260,33 +210,11 @@
},
{
"environment": {},
- "enabled": true,
- "continueOnError": false,
- "alwaysRun": false,
- "displayName": "Symbol Packages -> Blob Feed",
- "timeoutInMinutes": 0,
- "condition": "and(succeeded(), contains(variables.PB_PublishType, 'blob'), eq(variables.ConfigurationGroup, 'Release'))",
- "refName": "Task14",
- "task": {
- "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "filename": "msbuild",
- "arguments": "src\\publish.proj /t:PublishSymbolPackages /p:__PublishSymbols=true $(FeedPublishArguments) /fileloggerparameters:Verbosity=diag;LogFile=publishsympkg.log",
- "workingFolder": "$(Pipeline.SourcesDirectory)",
- "failOnStandardError": "false"
- }
- },
- {
- "environment": {},
"enabled": false,
"continueOnError": false,
"alwaysRun": false,
"displayName": "Create VSTS auth NuGet.Config",
"timeoutInMinutes": 0,
- "refName": "Task15",
"task": {
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"versionSpec": "1.*",
@@ -308,7 +236,6 @@
"alwaysRun": false,
"displayName": "packages -> VSTS",
"timeoutInMinutes": 0,
- "refName": "Task16",
"task": {
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"versionSpec": "1.*",
@@ -319,7 +246,7 @@
"scriptName": "",
"arguments": "",
"workingFolder": "",
- "inlineScript": "if ($env:ConfigurationGroup -ne \"Release\") { exit }\n& $env:CustomNuGetPath push $env:Pipeline.SourcesDirectory\\packages\\AzureTransfer\\$env:ConfigurationGroup\\$env:AzureContainerPackageGlob placeholderapikey -Source vsts-dotnet-core -ConfigFile $env:VstsAuthedNuGetConfigPath -Timeout 3600",
+ "inlineScript": "if ($env:ConfigurationGroup -ne \"Release\") { exit }\n& $env:CustomNuGetPath push $env:AzureContainerPackageDirectory$env:AzureContainerPackageGlob placeholderapikey -Source vsts-dotnet-core -ConfigFile $env:VstsAuthedNuGetConfigPath -Timeout 3600",
"failOnStandardError": "true"
}
},
@@ -331,7 +258,6 @@
"displayName": "Update versions repository",
"timeoutInMinutes": 0,
"condition": "and(succeeded(), contains(variables.PB_PublishType, 'versions'), eq(variables.ConfigurationGroup, 'Release'))",
- "refName": "Task17",
"task": {
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"versionSpec": "1.*",
@@ -342,7 +268,7 @@
"scriptName": "",
"arguments": "-gitHubAuthToken $(UpdatePublishedVersions.AuthToken) -root $(Pipeline.SourcesDirectory) -configGroup $(ConfigurationGroup)",
"workingFolder": "",
- "inlineScript": "param($gitHubAuthToken, $root, $configGroup)\nif ($configGroup -ne \"Release\" ) { exit }\ncd $root\n. $root\\UpdatePublishedVersions.ps1 `\n -gitHubUser dotnet-build-bot -gitHubEmail dotnet-build-bot@microsoft.com `\n -gitHubAuthToken $gitHubAuthToken `\n -versionsRepoOwner $env:VersionsRepoOwner -versionsRepo versions `\n -versionsRepoPath build-info/dotnet/$env:GitHubRepositoryName/$env:SourceBranch `\n -nupkgPath $root\\packages\\AzureTransfer\\$env:ConfigurationGroup\\$env:AzureContainerPackageGlob",
+ "inlineScript": "param($gitHubAuthToken, $root, $configGroup)\nif ($configGroup -ne \"Release\" ) { exit }\ncd $root\n. $root\\UpdatePublishedVersions.ps1 `\n -gitHubUser dotnet-build-bot -gitHubEmail dotnet-build-bot@microsoft.com `\n -gitHubAuthToken $gitHubAuthToken `\n -versionsRepoOwner $env:VersionsRepoOwner -versionsRepo versions `\n -versionsRepoPath build-info/dotnet/$env:GitHubRepositoryName/$env:SourceBranch `\n -nupkgPath $env:AzureContainerPackageDirectory$env:AzureContainerPackageGlob",
"failOnStandardError": "true"
}
},
@@ -353,7 +279,6 @@
"alwaysRun": false,
"displayName": "Get Build Number",
"timeoutInMinutes": 0,
- "refName": "Task18",
"task": {
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"versionSpec": "1.*",
@@ -375,7 +300,6 @@
"alwaysRun": false,
"displayName": "Publish to Artifact Services Drop (OfficialBuildId)",
"timeoutInMinutes": 0,
- "refName": "PublishBuildArtifacts1",
"task": {
"id": "f9d96d25-0c81-4e77-8282-1ad1f785cbb4",
"versionSpec": "0.*",
@@ -384,7 +308,7 @@
"inputs": {
"dropServiceURI": "https://devdiv.artifacts.visualstudio.com/DefaultCollection",
"buildNumber": "dotnet/$(GitHubRepositoryName)/$(SourceBranch)/$(OfficialBuildId)/packages/$(ConfigurationGroup)",
- "sourcePath": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)",
+ "sourcePath": "$(AzureContainerPackageDirectory)",
"dropExePath": "",
"toLowerCase": "true",
"detailedLog": "false",
@@ -400,7 +324,6 @@
"alwaysRun": false,
"displayName": "Publish to Artifact Services Drop (BuildNumber)",
"timeoutInMinutes": 0,
- "refName": "PublishBuildArtifacts2",
"task": {
"id": "f9d96d25-0c81-4e77-8282-1ad1f785cbb4",
"versionSpec": "0.*",
@@ -409,7 +332,7 @@
"inputs": {
"dropServiceURI": "https://devdiv.artifacts.visualstudio.com/DefaultCollection",
"buildNumber": "dotnet/$(GitHubRepositoryName)/$(SourceBranch)/$(BuildNumber)/packages/$(ConfigurationGroup)",
- "sourcePath": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)",
+ "sourcePath": "$(AzureContainerPackageDirectory)",
"dropExePath": "",
"toLowerCase": "true",
"detailedLog": "false",
@@ -426,7 +349,6 @@
"displayName": "Copy Files to: $(Build.StagingDirectory)\\DebugLogs",
"timeoutInMinutes": 0,
"condition": "succeededOrFailed()",
- "refName": "CopyFiles1",
"task": {
"id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c",
"versionSpec": "2.*",
@@ -449,7 +371,6 @@
"displayName": "Publish Artifact: DebugLogs",
"timeoutInMinutes": 0,
"condition": "succeededOrFailed()",
- "refName": "PublishBuildArtifacts3",
"task": {
"id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe",
"versionSpec": "1.*",
@@ -472,13 +393,36 @@
"displayName": "Send Telemetry",
"timeoutInMinutes": 0,
"condition": "always()",
- "refName": "Task19",
"task": {
"id": "521a94ea-9e68-468a-8167-6dcf361ea776",
"versionSpec": "1.*",
"definitionType": "task"
},
"inputs": {}
+ },
+ {
+ "environment": {},
+ "enabled": true,
+ "continueOnError": true,
+ "alwaysRun": true,
+ "displayName": "Run AgentTools/End.ps1",
+ "timeoutInMinutes": 0,
+ "condition": "succeededOrFailed()",
+ "task": {
+ "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+ "versionSpec": "2.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "targetType": "inline",
+ "filePath": "",
+ "arguments": "",
+ "script": "if (Test-Path \"$(AgentToolsPath)\\End.ps1\") {\n \"End.ps1 script found. Executing...\"\n cd $(AgentToolsPath)\n & $(AgentToolsPath)\\End.ps1\n} else {\n \"End.ps1 script does not exist. Moving on...\"\n}",
+ "errorActionPreference": "continue",
+ "failOnStderr": "false",
+ "ignoreLASTEXITCODE": "true",
+ "workingDirectory": ""
+ }
}
],
"options": [
@@ -522,9 +466,6 @@
"value": "$(PB_BuildType)",
"allowOverride": true
},
- "TeamName": {
- "value": "DotNetCore"
- },
"CloudDropAccountName": {
"value": "dotnetbuildoutput",
"allowOverride": true
@@ -534,6 +475,17 @@
"allowOverride": true,
"isSecret": true
},
+ "PB_ContainerName": {
+ "value": "$(Build.BuildNumber)",
+ "allowOverride": true
+ },
+ "PB_BlobNamePrefix": {
+ "value": "$(PB_PipeBuildIdentifier)/",
+ "allowOverride": true
+ },
+ "TeamName": {
+ "value": "DotNetCore"
+ },
"AzureBlobFeedAccountName": {
"value": "dotnetfeed",
"allowOverride": true
@@ -551,10 +503,6 @@
"value": "$(Build.BuildNumber)",
"allowOverride": true
},
- "Label": {
- "value": "$(Build.BuildNumber)",
- "allowOverride": true
- },
"MyGetFeedUrl": {
"value": "https://dotnet.myget.org/F/dotnet-core-test/api/v2/package",
"allowOverride": true
@@ -612,9 +560,6 @@
"BranchGroup": {
"value": ""
},
- "SymbolRoot": {
- "value": "\\\\fake\\symbol\\root"
- },
"DefinitionNames": {
"value": "Fake-Windows Fake-Windows-Native"
},
@@ -653,17 +598,12 @@
"value": "master",
"allowOverride": true
},
- "AzureContainerPackageGlob": {
- "value": "pkg\\*.nupkg",
- "allowOverride": true
- },
- "AzureContainerSymbolPackageGlob": {
- "value": "symbolpkg\\*.nupkg",
+ "AzureContainerPackageDirectory": {
+ "value": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\",
"allowOverride": true
},
- "SymbolPackageLocation": {
- "value": "symbolpkg\\*.nupkg",
- "allowOverride": true
+ "AzureContainerPackageGlob": {
+ "value": "pkg\\*.nupkg",
},
"GitHubRepositoryName": {
"value": "corefx",
@@ -674,10 +614,7 @@
"allowOverride": true
},
"FeedPublishArguments": {
- "value": "$(PB_BuildOutputManifestArguments) /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:CloudDropAccessToken=$(PB_PublishBlobFeedKey) /p:CloudDropAccountName=$(AzureBlobFeedAccountName) /p:ContainerName=$(AzureBlobFeedContainerName) /p:OverwriteOnPublish=true /p:PackagesPatternDir=../packages/AzureTransfer/Release/ /p:__BuildType=$(ConfigurationGroup) /p:OfficialPublish=true /p:PublishFlatContainer=false"
- },
- "PB_SymbolCatalogCertificateId": {
- "value": "400"
+ "value": "$(PB_BuildOutputManifestArguments) /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:CloudDropAccessToken=$(PB_PublishBlobFeedKey) /p:CloudDropAccountName=$(AzureBlobFeedAccountName) /p:ContainerName=$(AzureBlobFeedContainerName) /p:OverwriteOnPublish=true /p:PackagesPatternDir=$(AzureContainerPackageDirectory) /p:__BuildType=$(ConfigurationGroup) /p:OfficialPublish=true /p:PublishFlatContainer=false",
},
"PB_PublishType": {
"value": "",
diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json
index 94370ed..49e3763 100644
--- a/buildpipeline/pipelines.json
+++ b/buildpipeline/pipelines.json
@@ -130,7 +130,7 @@
{
"Name": "DotNet-CoreClr-Trusted-Linux-Crossbuild",
"Parameters": {
- "DockerTag": "ubuntu-14.04-cross-e435274-20180323032140",
+ "DockerTag": "ubuntu-14.04-cross-e435274-20180405193556",
"Architecture": "arm",
"Rid": "linux",
"CrossArchitecture": "x86",
@@ -151,7 +151,9 @@
"Parameters": {
"DockerTag": "ubuntu-16.04-cross-arm64-a3ae44b-20180315221921",
"Architecture": "arm64",
- "Rid": "linux"
+ "Rid": "linux",
+ "CrossArchBuildArgs": "crosscomponent",
+ "CrossArchBuildPackagesArgs": "-__DoCrossArchBuild=1"
},
"ReportingParameters": {
"OperatingSystem": "Linux",
diff --git a/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json b/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
index 58a6b80..3c65d64 100644
--- a/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
+++ b/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
@@ -31,7 +31,7 @@
"alwaysRun": false,
"displayName": "Setup vs dev env",
"timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
+ "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
"refName": "Task1",
"task": {
"id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd",
@@ -53,7 +53,7 @@
"alwaysRun": false,
"displayName": "Run clean.cmd",
"timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
+ "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
"refName": "Task2",
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -74,7 +74,7 @@
"alwaysRun": false,
"displayName": "Run sync.cmd",
"timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
+ "condition": "and(succeeded(),ne(variables['PB_SkipTests'], 'true'))",
"refName": "Task3",
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -95,7 +95,7 @@
"alwaysRun": false,
"displayName": "Generate version props file",
"timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
+ "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
"refName": "Task4",
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -116,7 +116,7 @@
"alwaysRun": false,
"displayName": "Run build-test.cmd",
"timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
+ "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
"refName": "Task5",
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -137,7 +137,7 @@
"alwaysRun": false,
"displayName": "Send job to Helix",
"timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
+ "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
"refName": "Task6",
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",