[Darc-Update] Update dependencies from build 20181106.6 of https://github.com/dotnet...

* Updating version files

* Updating version files

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c6bb886..a35b25d 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -2,13 +2,13 @@
 <Dependencies>
   <ProductDependencies></ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18552.21">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18556.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9552de1b6531c0974bd6e004184c547cf3f73702</Sha>
+      <Sha>7b0a1f028490bbf18ab1565998719315f2de22e7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18552.21">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18556.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9552de1b6531c0974bd6e004184c547cf3f73702</Sha>
+      <Sha>7b0a1f028490bbf18ab1565998719315f2de22e7</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
\ No newline at end of file

diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml
index 35294ae..0123cf4 100644 (file)
--- a/eng/common/templates/phases/base.yml
+++ b/eng/common/templates/phases/base.yml
@@ -7,6 +7,14 @@ parameters:
 
   # Optional: name of the phase (not specifying phase name may cause name collisions)
   name: ''
+  # Optional: display name of the phase
+  displayName: ''
+
+  # Optional: condition for the job to run
+  condition: ''
+
+  # Optional: dependencies of the phase
+  dependsOn: ''
 
   # Required: A defined YAML queue
   queue: {}
@@ -42,10 +50,19 @@ parameters:
 phases:
 - phase: ${{ parameters.name }}
 
+  ${{ if ne(parameters.displayName, '') }}:
+    displayName: ${{ parameters.displayName }}
+
+  ${{ if ne(parameters.condition, '') }}:
+    condition: ${{ parameters.condition }}
+
+  ${{ if ne(parameters.dependsOn, '') }}:
+    dependsOn: ${{ parameters.dependsOn }}
+
   queue: ${{ parameters.queue }}
 
   ${{ if ne(parameters.variables, '') }}:
-    variables: 
+    variables:
       ${{ insert }}: ${{ parameters.variables }}
 
   steps:

diff --git a/global.json b/global.json
index b69f637..c5e0057 100644 (file)
--- a/global.json
+++ b/global.json
@@ -7,7 +7,7 @@
     "python": "2.7.15"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18552.21",
-    "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18552.21"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18556.6",
+    "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18556.6"
   }
 }
\ No newline at end of file