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

* Updating version files

* Updating version files

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ca7e333..c6bb886 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.18529.8">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18552.21">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1bd69581da9d5a4744d60ccfcb929a9c25496599</Sha>
+      <Sha>9552de1b6531c0974bd6e004184c547cf3f73702</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18529.8">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18552.21">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1bd69581da9d5a4744d60ccfcb929a9c25496599</Sha>
+      <Sha>9552de1b6531c0974bd6e004184c547cf3f73702</Sha>
     </Dependency>
   </ToolsetDependencies>
-</Dependencies>
+</Dependencies>
\ No newline at end of file

diff --git a/eng/Versions.props b/eng/Versions.props
index 8a440dc..92bea97 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -18,4 +18,4 @@
       https:%2F%2Fdotnet.myget.org/F/symreader/api/v3/index.json
     </RestoreSources>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/eng/common/build.sh b/eng/common/build.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/eng/common/cibuild.sh b/eng/common/cibuild.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/eng/common/msbuild.sh b/eng/common/msbuild.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml
index 92a7933..35294ae 100644 (file)
--- a/eng/common/templates/phases/base.yml
+++ b/eng/common/templates/phases/base.yml
@@ -17,6 +17,10 @@ parameters:
   # Optional: variables
   variables: {}
 
+  # Optional: should run as a public build even in the internal project
+  #           if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
+  runAsPublic: false
+
   ## Telemetry variables
 
   # Optional: enable sending telemetry
@@ -56,10 +60,11 @@ phases:
         buildConfig: $(_HelixBuildConfig)
         helixSource: $(_HelixSource)
         helixType: $(_HelixType)
+        runAsPublic: ${{ parameters.runAsPublic }}
 
   - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
     # Internal only resource, and Microbuild signing shouldn't be applied to PRs.
-    - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}:
+    - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       - task: MicroBuildSigningPlugin@2
         displayName: Install MicroBuild plugin
         inputs:
@@ -77,7 +82,7 @@ phases:
 
   - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
     # Internal only resources
-    - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}:
+    - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       - task: MicroBuildCleanup@1
         displayName: Execute Microbuild cleanup tasks  
         condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
@@ -90,7 +95,7 @@ phases:
         helixSource: $(_HelixSource)
         helixType: $(_HelixType)
 
-  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}:
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - task: CopyFiles@2
       displayName: Gather Asset Manifests
       inputs:

diff --git a/eng/common/templates/phases/publish-build-assets.yml b/eng/common/templates/phases/publish-build-assets.yml
index c7ed5ca..c9381cf 100644 (file)
--- a/eng/common/templates/phases/publish-build-assets.yml
+++ b/eng/common/templates/phases/publish-build-assets.yml
@@ -4,6 +4,7 @@ parameters:
   configuration: 'Debug'
   condition: succeeded()
   continueOnError: false
+  runAsPublic: false
 phases:
   - phase: Asset_Registry_Publish
     displayName: Publish to Build Asset Registry
@@ -12,7 +13,7 @@ phases:
     variables:
       config: ${{ parameters.configuration }}
     steps:
-      - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}:
+      - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
         - task: DownloadBuildArtifacts@0
           displayName: Download artifact
           inputs:

diff --git a/eng/common/templates/steps/telemetry-start.yml b/eng/common/templates/steps/telemetry-start.yml
index 109b4f5..07f1185 100644 (file)
--- a/eng/common/templates/steps/telemetry-start.yml
+++ b/eng/common/templates/steps/telemetry-start.yml
@@ -2,9 +2,10 @@ parameters:
   helixSource: 'undefined_defaulted_in_telemetry.yml'
   helixType: 'undefined_defaulted_in_telemetry.yml'
   buildConfig: ''
+  runAsPublic: false
 
 steps:
-- ${{ if and(not(eq(variables['System.TeamProject'], 'public')), ne(variables['Build.Repository.Provider'], 'GitHub')) }}:
+- ${{ if and(eq(parameters.runAsPublic, 'false'), not(eq(variables['System.TeamProject'], 'public'))) }}:
   - task: AzureKeyVault@1
     inputs:
       azureSubscription: 'HelixProd_KeyVault'

diff --git a/global.json b/global.json
index 5c68f14..b69f637 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.18529.8",
-    "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18529.8"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18552.21",
+    "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18552.21"
   }
-}
+}
\ No newline at end of file