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

Commit

Permalink
[automated] Merge branch 'release/3.0' => 'release/3.1' (#27922)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
dotnet-maestro-bot authored and mmitche committed Dec 2, 2019
1 parent 07e8b55 commit 53826ca
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion ILAsmVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0-preview6.19280.1
3.0.0-rc2.19462.5
2 changes: 1 addition & 1 deletion dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 2 additions & 7 deletions dir.common.props
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
1 change: 1 addition & 0 deletions eng/platform-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ jobs:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Alpine.38.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.8-helix-09ca40b-20190508143246
- (Alpine.39.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.9-helix-09ca40b-20190508143246
- (Alpine.310.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.10-helix-3043688-20190918214010
${{ insert }}: ${{ parameters.jobParameters }}

# Linux musl arm64
Expand Down

0 comments on commit 53826ca

Please sign in to comment.