Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 53826ca

Browse files
dotnet-maestro-botmmitche
authored andcommitted
[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
1 parent 07e8b55 commit 53826ca

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

ILAsmVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0-preview6.19280.1
1+
3.0.0-rc2.19462.5

dependencies.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<!-- Tests/infrastructure dependency versions. -->
2424
<PropertyGroup>
25-
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview6.19280.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
25+
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-rc2.19462.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
2626
<XunitPackageVersion>2.4.1-pre.build.4059</XunitPackageVersion>
2727
<XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
2828
<MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.43</MicrosoftDiagnosticsTracingTraceEventPackageVersion>

dir.common.props

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,8 @@
6565

6666
<PropertyGroup>
6767
<!-- Central place to set the versions of all nuget packages produced in the repo -->
68-
<PackageVersion Condition="'$(PackageVersion)' == ''">3.1.0</PackageVersion>
69-
70-
<!-- Set the boolean below to true to generate packages with stabilized versions -->
71-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
72-
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
73-
74-
<PreReleaseLabel>alpha1</PreReleaseLabel>
68+
<PackageVersion Condition="'$(PackageVersion)' == ''">3.1.1</PackageVersion>
69+
<PreReleaseLabel>servicing</PreReleaseLabel>
7570
</PropertyGroup>
7671

7772
<!-- Set up common target properties that we use to conditionally include sources -->

eng/platform-matrix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ jobs:
8787
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
8888
- (Alpine.38.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.8-helix-09ca40b-20190508143246
8989
- (Alpine.39.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.9-helix-09ca40b-20190508143246
90+
- (Alpine.310.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.10-helix-3043688-20190918214010
9091
${{ insert }}: ${{ parameters.jobParameters }}
9192

9293
# Linux musl arm64

0 commit comments

Comments
 (0)