diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index be9acd85d..f77cfc433 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.22620.1",
+ "version": "1.1.0-beta.23053.1",
"commands": [
"darc"
]
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 89b59ca95..59526b0ca 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -373,12 +373,11 @@ stages:
# the VMR synchronization step is run to validate that the PR can be merged and later
# synchronized into the VMR without problems.
# You can do this by allowing the Synchronize_VMR stage from above in PRs.
-# TODO - Temporarily disabled (https://github.com/dotnet/source-build/issues/3184)
-# - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-# - template: eng/pipelines/templates/stages/vmr-build.yml
-# parameters:
-# vmrBranch: ${{ parameters.vmrBranch }}
-# isBuiltFromVmr: false
+- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+ - template: eng/pipelines/templates/stages/vmr-build.yml
+ parameters:
+ vmrBranch: ${{ parameters.vmrBranch }}
+ isBuiltFromVmr: false
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- stage: Publish
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0f337e92d..71795b213 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -205,13 +205,13 @@
https://github.com/dotnet/arcade
cb37e1f67041bfc6484ec47525bda461606efe92
-
+
https://github.com/dotnet/arcade-services
- a15b2ccfd23a56ac9314ce91ea2d00f514b29856
+ 11dfc0ff33280c18db03a2108673a41ade41fd55
-
+
https://github.com/dotnet/arcade-services
- a15b2ccfd23a56ac9314ce91ea2d00f514b29856
+ 11dfc0ff33280c18db03a2108673a41ade41fd55
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 41f5f60b3..bc9ec2b98 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -30,7 +30,7 @@
- 1.1.0-beta.22620.1
+ 1.1.0-beta.23053.1
diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh
old mode 100644
new mode 100755
diff --git a/src/SourceBuild/content/eng/install-nuget-credprovider.sh b/src/SourceBuild/content/eng/install-nuget-credprovider.sh
old mode 100644
new mode 100755
diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh
old mode 100644
new mode 100755
diff --git a/src/SourceBuild/content/prereqs/packages/archive/_ b/src/SourceBuild/content/prereqs/packages/archive/_
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/SourceBuild/content/prereqs/packages/prebuilt/_ b/src/SourceBuild/content/prereqs/packages/prebuilt/_
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj
index f20c61b71..afdd47c63 100644
--- a/src/SourceBuild/content/repo-projects/aspnetcore.proj
+++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj
@@ -3,9 +3,9 @@
$(TargetRid)
- osx-x64
- freebsd-x64
- win-x64
+ osx-$(Platform)
+ freebsd-$(Platform)
+ win-$(Platform)
$(StandardSourceBuildArgs.Replace('--publish', ''))
diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj
index 6dc870be9..42ef91233 100644
--- a/src/SourceBuild/content/repo-projects/installer.proj
+++ b/src/SourceBuild/content/repo-projects/installer.proj
@@ -7,9 +7,9 @@
$(TargetRid)
- osx-x64
- freebsd-x64
- win-x64
+ osx-$(Platform)
+ freebsd-$(Platform)
+ win-$(Platform)
$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))
diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj
index 231c9b464..c477000a6 100644
--- a/src/SourceBuild/content/repo-projects/runtime.proj
+++ b/src/SourceBuild/content/repo-projects/runtime.proj
@@ -8,9 +8,9 @@
$(ProjectDirectory)/clean$(ShellExtension)
$(TargetRid)
- osx-x64
- freebsd-x64
- win-x64
+ osx-$(Platform)
+ freebsd-$(Platform)
+ win-$(Platform)
<_platformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-'))
$(NETCoreSdkRuntimeIdentifier.Substring(0, $(_platformIndex)))