From 81b5ceebedad24715388f385e5b27a9a12559bcc Mon Sep 17 00:00:00 2001
From: dotnet-maestro <@dotnet-maestro>
Date: Thu, 25 Apr 2019 12:46:01 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20190424.9
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19224.9
---
eng/Version.Details.xml | 4 +-
eng/common/templates/job/job.yml | 7 ++-
eng/common/templates/steps/helix-publish.yml | 51 --------------------
global.json | 2 +-
4 files changed, 9 insertions(+), 55 deletions(-)
delete mode 100644 eng/common/templates/steps/helix-publish.yml
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 711497807..643b01010 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
-
+
https://github.com/dotnet/arcade
- e3919d0c158716ef4685c8e057cc58640af1af83
+ e02c88fca482f1141a9bb310c97be20b0ebd0465
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 74dd81fdc..7839b70bb 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -43,9 +43,12 @@ parameters:
# Optional: enable sending telemetry
enableTelemetry: false
- # Optional: define the helix repo for telemeetry (example: 'dotnet/arcade')
+ # Optional: define the helix repo for telemetry (example: 'dotnet/arcade')
helixRepo: ''
+ # Optional: define the helix type for telemetry (example: 'build/product/')
+ helixType: ''
+
# Required: name of the job
name: ''
@@ -122,6 +125,8 @@ jobs:
displayName: 'Send Helix Start Telemetry'
inputs:
helixRepo: ${{ parameters.helixRepo }}
+ ${{ if ne(parameters.helixType, '') }}:
+ helixType: ${{ parameters.helixType }}
buildConfig: $(_BuildConfig)
runAsPublic: ${{ parameters.runAsPublic }}
continueOnError: ${{ parameters.continueOnError }}
diff --git a/eng/common/templates/steps/helix-publish.yml b/eng/common/templates/steps/helix-publish.yml
deleted file mode 100644
index 470ab65da..000000000
--- a/eng/common/templates/steps/helix-publish.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-parameters:
- HelixSource: 'pr/dotnet-github-anon-kaonashi-bot'
- HelixType: ̓'tests/default'
- HelixBuild: $(Build.BuildNumber)
- HelixTargetQueues: ''
- HelixAccessToken: ''
- HelixPreCommands: ''
- HelixPostCommands: ''
- WorkItemDirectory: ''
- WorkItemCommand: ''
- CorrelationPayloadDirectory: ''
- XUnitProjects: ''
- XUnitTargetFramework: ''
- XUnitRunnerVersion: ''
- IncludeDotNetCli: false
- DotNetCliPackageType: ''
- DotNetCliVersion: ''
- EnableXUnitReporter: false
- WaitForWorkItemCompletion: true
- condition: succeeded()
- continueOnError: false
-
-steps:
- - task: DotNetCoreCLI@2
- inputs:
- command: custom
- projects: eng/common/helixpublish.proj
- custom: msbuild
- arguments: '/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog'
- displayName: Send job to Helix
- env:
- HelixSource: ${{ parameters.HelixSource }}
- HelixType: ${{ parameters.HelixType }}
- HelixBuild: ${{ parameters.HelixBuild }}
- HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
- HelixAccessToken: ${{ parameters.HelixAccessToken }}
- HelixPreCommands: ${{ parameters.HelixPreCommands }}
- HelixPostCommands: ${{ parameters.HelixPostCommands }}
- WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
- WorkItemCommand: ${{ parameters.WorkItemCommand }}
- CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
- XUnitProjects: ${{ parameters.XUnitProjects }}
- XUnitRuntimeTargetFramework: ${{ parameters.XUnitTargetFramework }}
- XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }}
- IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
- DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
- DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
- EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }}
- WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
- condition: ${{ parameters.condition }}
- continueOnError: ${{ parameters.continueOnError }}
diff --git a/global.json b/global.json
index e469bb089..4ee619bd2 100644
--- a/global.json
+++ b/global.json
@@ -7,6 +7,6 @@
"xcopy-msbuild": "15.9.0-alpha"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19223.2"
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19224.9"
}
}