diff options
author | Anirudh Agnihotry <anirudhagnihotry098@gmail.com> | 2019-09-10 12:42:32 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-10 12:42:32 -0700 |
commit | b3baedcf715a1bd444cc3b0554b67feefa0daca4 (patch) | |
tree | 91837d966150bc3858f65dac5a5c4429ea7a6233 /eng | |
parent | 771d6e8742c993a02782261516d2391c60fcf58b (diff) | |
parent | 80eccfecde4175f00352e4c21f2c9ad82110007d (diff) | |
download | coreclr-b3baedcf715a1bd444cc3b0554b67feefa0daca4.tar.gz coreclr-b3baedcf715a1bd444cc3b0554b67feefa0daca4.tar.bz2 coreclr-b3baedcf715a1bd444cc3b0554b67feefa0daca4.zip |
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
Diffstat (limited to 'eng')
-rw-r--r-- | eng/Version.Details.xml | 4 | ||||
-rw-r--r-- | eng/Versions.props | 6 | ||||
-rw-r--r-- | eng/pipelines/internal.yml | 1 | ||||
-rw-r--r-- | eng/pipelines/pr.yml | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f3e80d2b0..34c1f96257 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -26,9 +26,9 @@ <Uri>https://github.com/dotnet/corefx</Uri> <Sha>1f43072465d4be9920ab04a3c3ad91f82144de4e</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc2-19459-40"> + <Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview1.19459.38"> <Uri>https://github.com/dotnet/core-setup</Uri> - <Sha>ade240a7f970e5187e4e0ea47581681df085d44b</Sha> + <Sha>0d6763312a2754e45d604ebdc69c8ac7e21a2187</Sha> </Dependency> <Dependency Name="optimization.IBC.CoreCLR" Version="99.99.99-master-20190910.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 1d5b33dca7..464053441f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,13 +2,13 @@ <Project> <PropertyGroup> <!-- The .NET Core product branding version --> - <ProductVersion>3.0.0</ProductVersion> + <ProductVersion>3.1.0</ProductVersion> <!-- File version numbers --> <MajorVersion>4</MajorVersion> <MinorVersion>7</MinorVersion> <!-- Always use shipping version instead of dummy versions --> <DotNetUseShippingVersions>true</DotNetUseShippingVersions> - <PreReleaseVersionLabel>rc2</PreReleaseVersionLabel> + <PreReleaseVersionLabel>preview1</PreReleaseVersionLabel> <!-- Opt-in/out repo features --> <UsingToolIbcOptimization>true</UsingToolIbcOptimization> <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers> @@ -25,7 +25,7 @@ <MicrosoftNETCorePlatformsVersion>3.0.0-rc2.19460.1</MicrosoftNETCorePlatformsVersion> <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19326.2</MicrosoftBclAsyncInterfacesVersion> <!-- core-setup --> - <MicrosoftNETCoreAppVersion>3.0.0-rc2-19459-40</MicrosoftNETCoreAppVersion> + <MicrosoftNETCoreAppVersion>3.1.0-preview1.19459.38</MicrosoftNETCoreAppVersion> <!-- dotnet-core-internal-tooling --> <IbcMergePackageVersion>5.0.6-beta.19203.1</IbcMergePackageVersion> <!-- dotnet-optimization --> diff --git a/eng/pipelines/internal.yml b/eng/pipelines/internal.yml index 5feef00bef..cacacffe29 100644 --- a/eng/pipelines/internal.yml +++ b/eng/pipelines/internal.yml @@ -3,6 +3,7 @@ trigger: branches: include: - release/3.0 + - release/3.1 pr: none diff --git a/eng/pipelines/pr.yml b/eng/pipelines/pr.yml index 04e532d58e..de580466fe 100644 --- a/eng/pipelines/pr.yml +++ b/eng/pipelines/pr.yml @@ -5,6 +5,7 @@ pr: - release/2.1 - release/2.2 - release/3.0 +- release/3.1 jobs: # |