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

5 files changed, 9 insertions, 7 deletions

diff --git a/dir.common.props b/dir.common.props
index 5aa4807e04..0dbada32da 100644
--- a/dir.common.props
+++ b/dir.common.props
@@ -65,13 +65,13 @@
 
   <PropertyGroup>
     <!-- Central place to set the versions of all nuget packages produced in the repo -->
-    <PackageVersion Condition="'$(PackageVersion)' == ''">3.0.0</PackageVersion>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">3.1.0</PackageVersion>
 
     <!-- Set the boolean below to true to generate packages with stabilized versions -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
 
-    <PreReleaseLabel>preview9</PreReleaseLabel>
+    <PreReleaseLabel>alpha1</PreReleaseLabel>
   </PropertyGroup>
 
   <!-- Set up common target properties that we use to conditionally include sources -->
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:
 #