diff options
| -rw-r--r-- | azure-pipelines.yml | 16 | ||||
| -rw-r--r-- | dependencies.props | 4 | ||||
| -rw-r--r-- | eng/Version.Details.xml | 2 | ||||
| -rw-r--r-- | eng/Versions.props | 2 |
4 files changed, 14 insertions, 10 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 03fa821326..cfa115e159 100644 --- a/azure-pipelines.yml +++ b/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 diff --git a/dependencies.props b/dependencies.props index fc82a23de8..32e45f30fa 100644 --- a/dependencies.props +++ b/dependencies.props @@ -21,7 +21,7 @@ <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion> <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion> - <PreReleaseLabel>preview4</PreReleaseLabel> + <PreReleaseLabel>preview3</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> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63d8010300..90bd899b2b 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> <ToolsetDependencies> diff --git a/eng/Versions.props b/eng/Versions.props index 1f585674aa..b35189d914 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ <PropertyGroup> <!-- This repo version --> <VersionPrefix>3.0.0</VersionPrefix> - <PreReleaseVersionLabel>preview</PreReleaseVersionLabel> + <PreReleaseVersionLabel>preview3</PreReleaseVersionLabel> <!-- Opt-out repo features --> <UsingToolXliff>false</UsingToolXliff> <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies> |