summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>2018-11-04 15:49:22 +0000
committerGitHub <noreply@github.com>2018-11-04 15:49:22 +0000
commitb4a6c13dcca834daa6899665b74362e590b80947 (patch)
treecd5a2ad6d8fb90e564ba595d4c0d59c3fea6f49e
parent6d9fc60df3b721eab98ca08386a1f01358f93839 (diff)
downloadcoreclr-b4a6c13dcca834daa6899665b74362e590b80947.tar.gz
coreclr-b4a6c13dcca834daa6899665b74362e590b80947.tar.bz2
coreclr-b4a6c13dcca834daa6899665b74362e590b80947.zip
[Darc-Update] Update dependencies from build 20181102.21 of https://github.com/dotnet/arcade (#20783)
* Updating version files * Updating version files
-rw-r--r--eng/Version.Details.xml10
-rw-r--r--eng/Versions.props2
-rwxr-xr-x[-rw-r--r--]eng/common/build.sh0
-rwxr-xr-x[-rw-r--r--]eng/common/cibuild.sh0
-rwxr-xr-x[-rw-r--r--]eng/common/darc-init.sh0
-rwxr-xr-x[-rw-r--r--]eng/common/msbuild.sh0
-rw-r--r--eng/common/templates/phases/base.yml11
-rw-r--r--eng/common/templates/phases/publish-build-assets.yml3
-rw-r--r--eng/common/templates/steps/telemetry-start.yml3
-rw-r--r--global.json6
10 files changed, 21 insertions, 14 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ca7e33393a..c6bb8869f4 100644
--- 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 8a440dc884..92bea97a68 100644
--- 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
index 941db3bd57..941db3bd57 100644..100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
diff --git a/eng/common/cibuild.sh b/eng/common/cibuild.sh
index 1a02c0dec8..1a02c0dec8 100644..100755
--- a/eng/common/cibuild.sh
+++ b/eng/common/cibuild.sh
diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh
index a0c733a15d..a0c733a15d 100644..100755
--- a/eng/common/darc-init.sh
+++ b/eng/common/darc-init.sh
diff --git a/eng/common/msbuild.sh b/eng/common/msbuild.sh
index b1024487f7..b1024487f7 100644..100755
--- a/eng/common/msbuild.sh
+++ b/eng/common/msbuild.sh
diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml
index 92a7933eb5..35294aea0a 100644
--- 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 c7ed5caa5d..c9381cf104 100644
--- 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 109b4f5d88..07f1185d17 100644
--- 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 5c68f14b32..b69f6376c6 100644
--- 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