Merge branch 'release/3.0' into merge/master-to-release/3.0

Author: wtgodbe

azure-pipelines.yml

@@ -1,3 +1,18 @@
+trigger:
+  batch: true
+  branches:
+    include:
+    - master
+    - release/3.0
+
+pr:
+- master
+- release/3.0
+
+# Temporarily set a build number format that includes a large revision
+# number that won't conflict with buildpipeline official builds.
+name: $(Date:yyyyMMdd)$(Rev:.7r)
+
 variables:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
 
@@ -21,12 +36,6 @@ resources:
   - container: centos6_x64_build_image
     image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-6-3e800f1-20190501005338
 
-trigger:
-- master
-
-pr:
-- master
-
 jobs:
 
 ##   The following is the matrix of test runs that we have. This is

clrdefinitions.cmake

@@ -2,7 +2,7 @@ include(clrfeatures.cmake)
 
 # If set, indicates that this is not an officially supported release
 # Keep in sync with IsPrerelease in dir.props
-set(PRERELEASE 1)
+set(PRERELEASE 0)
 
 # Features we're currently flighting, but don't intend to ship in officially supported releases
 if (PRERELEASE)

dependencies.props

@@ -36,7 +36,7 @@
   <!-- Package dependency verification/auto-upgrade configuration. -->
   <PropertyGroup>
     <BaseDotNetBuildInfo>build-info/dotnet/</BaseDotNetBuildInfo>
-    <DependencyBranch>master</DependencyBranch>
+    <DependencyBranch>release/3.0</DependencyBranch>
     <CurrentRefXmlPath>$(MSBuildThisFileFullPath)</CurrentRefXmlPath>
   </PropertyGroup>
 

eng/Version.Details.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+
 <Dependencies>
   <ProductDependencies>
   </ProductDependencies>