diff options
| author | William Godbe <wigodbe@microsoft.com> | 2019-05-31 12:25:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-31 12:25:54 -0700 |
| commit | e98f0d309e391ac4ec13b82311bb36fd3d5f53c3 (patch) | |
| tree | b91c6d4b70812f168b181b6a127d33e374028d86 | |
| parent | 6c77e7562a475e47352f852fb7cf8de98c1b5bcd (diff) | |
| parent | e330c2ce5b1af4e69cdcacb8254a5107586c68f8 (diff) | |
| download | coreclr-e98f0d309e391ac4ec13b82311bb36fd3d5f53c3.tar.gz coreclr-e98f0d309e391ac4ec13b82311bb36fd3d5f53c3.tar.bz2 coreclr-e98f0d309e391ac4ec13b82311bb36fd3d5f53c3.zip | |
Merge branch 'release/3.0' into merge/master-to-release/3.0
| -rw-r--r-- | azure-pipelines.yml | 21 | ||||
| -rw-r--r-- | clrdefinitions.cmake | 2 | ||||
| -rw-r--r-- | dependencies.props | 2 | ||||
| -rw-r--r-- | eng/Version.Details.xml | 2 |
4 files changed, 18 insertions, 9 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7b20d2f012..082a703beb 100644 --- a/azure-pipelines.yml +++ b/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 diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index 255923693e..fe67536a3c 100644 --- a/clrdefinitions.cmake +++ b/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) diff --git a/dependencies.props b/dependencies.props index 5a662ce64c..b25cd0b8e2 100644 --- a/dependencies.props +++ b/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> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 309c92943e..9c4e978403 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> + <Dependencies> <ProductDependencies> </ProductDependencies> |