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

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

Merged
merged 8 commits into from
Dec 2, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ecfe3bc
Fix Segfault in PerfInfo Image Logging (#26910)
brianrob Oct 15, 2019
97c8353
update branding for 3.0.2 (#27896)
Anipik Nov 20, 2019
64ac634
[release/3.0] Fix use of ilasm during test builds when using a 3.0 SD…
hoyosjs Nov 21, 2019
8d3bb93
Move off of the old arm32 queue (#27905)
Nov 21, 2019
bb3006f
Add alpine3.10 testing to 3.0 (#27214)
Nov 21, 2019
8f60f14
Fix GetSequencePoints when profiler provides mapping via SetILInstrum…
davmason Nov 21, 2019
4d14ed7
[release/3.0] Update dependencies from dotnet/core-setup (#27910)
dotnet-maestro[bot] Nov 22, 2019
af4aa53
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
mmitche Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ILAsmVersion.txt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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)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
Expand Down