[automated] Merge branch 'release/3.0' => 'release/3.1' (#27922)

* Fix Segfault in PerfInfo Image Logging (#26910)

* update branding for 3.0.2 (#27896)

* update branding

* remove stable properties from coreclr as it never stablises

* [release/3.0] Fix use of ilasm during test builds when using a 3.0 SDK (#27820)

* Add fix for restore of ilasm

The restore logic in buildtools tried to use a netcoreapp2.1 TFM for Linux-musl.
This ended up restoring Linux-x64 binaries which then broke the test build.
This change works around this by saving a copy of the depproj that BuildTools used into
the tree and restore it as a 3.0 app manually in init-tools on our side of the build.

* Change to a 3.0 SDK for servicing

* Bump test versions of ilasm and runtime package to match the RC

* Move off of the old arm32 queue (#27905)

* Add alpine3.10 testing to 3.0 (#27214)

* Fix GetSequencePoints when profiler provides mapping via SetILInstrumentedCodeMap (#27843)

Port #25802 to 3.0.2

* [release/3.0] Update dependencies from dotnet/core-setup (#27910)

* Update dependencies from https://github.com/dotnet/core-setup build 20191016.12

- Microsoft.NETCore.App - 3.0.1-servicing-19516-12

* Update dependencies from https://github.com/dotnet/core-setup build 20191121.02

- Microsoft.NETCore.App - 3.0.2-servicing-19571-02

diff --git a/ILAsmVersion.txt b/ILAsmVersion.txt
index 9d451b5..2a6e60c 100644 (file)
--- a/ILAsmVersion.txt
+++ b/ILAsmVersion.txt
@@ -1 +1 @@
-3.0.0-preview6.19280.1
+3.0.0-rc2.19462.5

diff --git a/dependencies.props b/dependencies.props
index 774b169..4874fbe 100644 (file)
--- a/dependencies.props
+++ b/dependencies.props
@@ -22,7 +22,7 @@
 
   <!-- Tests/infrastructure dependency versions. -->
   <PropertyGroup>
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview6.19280.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-rc2.19462.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
     <XunitPackageVersion>2.4.1-pre.build.4059</XunitPackageVersion>
     <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
     <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.43</MicrosoftDiagnosticsTracingTraceEventPackageVersion>

diff --git a/dir.common.props b/dir.common.props
index 0dbada3..652f5ed 100644 (file)
--- a/dir.common.props
+++ b/dir.common.props
@@ -65,13 +65,8 @@
 
   <PropertyGroup>
     <!-- Central place to set the versions of all nuget packages produced in the repo -->
-    <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>alpha1</PreReleaseLabel>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">3.1.1</PackageVersion>
+    <PreReleaseLabel>servicing</PreReleaseLabel>
   </PropertyGroup>
 
   <!-- Set up common target properties that we use to conditionally include sources -->

diff --git a/eng/platform-matrix.yml b/eng/platform-matrix.yml
index b0ef62c..21f2588 100644 (file)
--- a/eng/platform-matrix.yml
+++ b/eng/platform-matrix.yml
@@ -87,6 +87,7 @@ jobs:
       - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
         - (Alpine.38.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-09ca40b-20190508143246
         - (Alpine.39.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-helix-09ca40b-20190508143246
+        - (Alpine.310.Amd64)Ubuntu.1604.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.10-helix-3043688-20190918214010
       ${{ insert }}: ${{ parameters.jobParameters }}
 
 # Linux musl arm64