diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index c5fe9a99d..05a3c41a3 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"microsoft.dotnet.darc": {
- "version": "1.1.0-beta.23068.1",
+ "version": "1.1.0-beta.23068.2",
"commands": [
"darc"
]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9c682f6e3..029480b43 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -205,13 +205,13 @@
https://github.com/dotnet/arcade
3600aa80a01e90f38a7b86b9d7c1264e091aa5a8
-
+
https://github.com/dotnet/arcade-services
- fbfe3ef4178f3e5ca05ee32ebd4a20599e72f115
+ f1d9bcb8317ed06f04276a60e4d0e3b46e2a9ce4
-
+
https://github.com/dotnet/arcade-services
- fbfe3ef4178f3e5ca05ee32ebd4a20599e72f115
+ f1d9bcb8317ed06f04276a60e4d0e3b46e2a9ce4
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 7b8682628..8918ca0fe 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -30,7 +30,7 @@
- 1.1.0-beta.23068.1
+ 1.1.0-beta.23068.2
diff --git a/src/SourceBuild/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml
index 7cf91c400..428335747 100644
--- a/src/SourceBuild/content/eng/pipelines/ci.yml
+++ b/src/SourceBuild/content/eng/pipelines/ci.yml
@@ -19,11 +19,10 @@ stages:
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: templates/stages/vmr-scan.yml
-# For rolling builds we want to build the MSFT SDK first so that we can
-# compare the contents with the source-built one later.
-# This only works because we don't run this test in PRs. If we decided
-# to run this test in PRs, we would need to build the MSFT SDK there too.
-- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+ # For rolling builds we want to build the MSFT SDK first so that we can
+ # compare the contents with the source-built one later.
+ # This only works because we don't run this test in PRs. If we decided
+ # to run this test in PRs, we would need to build the MSFT SDK there too.
- stage: Build_MSFT_SDK
displayName: Build MSFT SDK
jobs:
diff --git a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml
index 81a7d9d64..16dcb2113 100644
--- a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml
+++ b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml
@@ -1,12 +1,12 @@
stages:
-- stage: VMR_Scan
- displayName: VMR Scan
+- stage: Tag_n_Scan
+ displayName: Tag & Scan
dependsOn: []
variables:
- template: /eng/common/templates/variables/pool-providers.yml
jobs:
- - job: Scan
- displayName: VMR Scan
+ - job: Tag_n_Scan
+ displayName: Tag & Scan
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $(DncEngPublicBuildPool)
@@ -21,11 +21,17 @@ stages:
- script: |
source ./eng/common/tools.sh
InitializeDotNetCli true
- dotnet='./.dotnet/dotnet'
- "$dotnet" tool restore
+ ./.dotnet/dotnet tool restore
displayName: Initialize tooling
workingDirectory: $(Build.SourcesDirectory)/src/installer
+ - script: |
+ set -e
+ sha=`./.dotnet/dotnet darc vmr get-version --vmr "$(Build.SourcesDirectory)" installer`
+ echo "##vso[build.addbuildtag]installer-$sha"
+ displayName: Tag the build
+ workingDirectory: $(Build.SourcesDirectory)/src/installer
+
- script: >
./.dotnet/dotnet darc vmr scan-binary-files
--vmr "$(Build.SourcesDirectory)"