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

Author: wtgodbe

azure-pipelines.yml

@@ -1,3 +1,13 @@
+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.
@@ -26,12 +36,6 @@ resources:
   - container: centos6_x64_build_image
     image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-6-376e1a3-20174311014331
 
-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

@@ -21,7 +21,7 @@
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
 
-    <PreReleaseLabel>preview5</PreReleaseLabel>
+    <PreReleaseLabel>preview4</PreReleaseLabel>
   </PropertyGroup>
 
   <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
@@ -48,7 +48,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>
 

dir.props

@@ -133,7 +133,7 @@
     <!-- If true, indicates that this is not an officially supported release -->
     <!-- It is important to flip this to false in official release branches -->
     <!-- Keep it in sync with PRERELEASE in clrdefinitions.cmake -->
-    <IsPrerelease>true</IsPrerelease>
+    <IsPrerelease>false</IsPrerelease>
 
     <!-- This should be kept in sync with package details in src/.nuget/init/project.json -->
     <RuntimeIdGraphDefinitionVersion>1.0.2-beta-24224-02</RuntimeIdGraphDefinitionVersion>

eng/Version.Details.xml

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