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

Commit fd22fd6

Browse files
dotnet-maestro-botbrianrobAnipikhoyosjsJarret Shook
authored andcommitted
[automated] Merge branch 'release/3.0' => 'release/3.1' (#28002)
* 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 * update brandint to 3.0.3 (#27993) * Update branding to 3.0.3 (#27997) eng/Versions.props doesn't seem to the the source of truth for branding * Fix infrastructure issues in release 3.0 (#28000) * Restore Helix SDK using Tools.props to work around MSBuild race condition * Disable formatting jobs * Disable ARM windows jobs * Fix tracing in RHEL6 build * [release/3.0] Update dependencies from dotnet/arcade (#26889) * Update dependencies from https://github.com/dotnet/arcade build 20190924.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19474.3 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19474.3 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19474.3 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19474.3 * Update NuGet.config * Update runtime versions * Update dependencies from https://github.com/dotnet/arcade build 20191119.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19569.2 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19569.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19569.2 * Update dependencies from https://github.com/dotnet/arcade build 20191122.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19572.3 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19572.3 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19572.3 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19572.3 * Update dependencies from https://github.com/dotnet/arcade build 20191127.5 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19577.5 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19577.5 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19577.5 * Add coreclr static feed to NuGet.config Co-authored-by: Matt Mitchell <[email protected]> Co-authored-by: Juan Hoyos <[email protected]> Co-authored-by: Brian Robbins <[email protected]> Co-authored-by: Anirudh Agnihotry <[email protected]> Co-authored-by: Juan Hoyos <[email protected]> Co-authored-by: Jarret Shook <[email protected]> Co-authored-by: David Mason <[email protected]> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Mitchell <[email protected]>
1 parent 4e29494 commit fd22fd6

File tree

5 files changed

+24
-5
lines changed

5 files changed

+24
-5
lines changed

eng/Tools.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />
12+
<PackageDownload Include="Microsoft.DotNet.Helix.Sdk" Version="[$(MicrosoftDotNetHelixSdkVersion)]" />
1213
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />
1314
</ItemGroup>
14-
</Project>
15+
</Project>

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<!-- arcade -->
1818
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19577.5</MicrosoftDotNetBuildTasksFeedVersion>
1919
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19577.5</MicrosoftDotNetBuildTasksPackagingVersion>
20+
<MicrosoftDotNetHelixSdkVersion>2.0.0-beta.19461.7</MicrosoftDotNetHelixSdkVersion>
2021
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
2122
<!-- roslyn -->
2223
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>

eng/pipelines/ci.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,18 @@ jobs:
5252
parameters:
5353
jobTemplate: test-job.yml
5454
buildConfig: checked
55-
platformGroup: all
55+
platforms:
56+
- Linux_arm
57+
- Linux_arm64
58+
- Linux_musl_x64
59+
- Linux_musl_arm64
60+
- Linux_rhel6_x64
61+
- Linux_x64
62+
- OSX_x64
63+
- Windows_NT_x64
64+
- Windows_NT_x86
65+
# - Windows_NT_arm return this when https://github.com/dotnet/runtime/issues/1097 is fixed.
66+
- Windows_NT_arm64
5667
helixQueueGroup: ci
5768
jobParameters:
5869
testGroup: outerloop
@@ -73,7 +84,7 @@ jobs:
7384
- OSX_x64
7485
- Windows_NT_x64
7586
- Windows_NT_x86
76-
- Windows_NT_arm
87+
# - Windows_NT_arm return this when https://github.com/dotnet/runtime/issues/1097 is fixed.
7788
- Windows_NT_arm64
7889
helixQueueGroup: ci
7990
jobParameters:

eng/pipelines/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- Linux_musl_x64
6666
- Linux_x64
6767
- OSX_x64
68-
- Windows_NT_arm
68+
# - Windows_NT_arm return this when https://github.com/dotnet/runtime/issues/1097 is fixed.
6969
- Windows_NT_arm64
7070
- Windows_NT_x64
7171
- Windows_NT_x86

src/pal/src/exception/remote-unwind.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,19 @@ SET_DEFAULT_DEBUG_CHANNEL(EXCEPT);
6868
#include <elf.h>
6969
#include <link.h>
7070

71-
#if defined(_X86_) || defined(_ARM_)
71+
#if defined(_X86_) || defined(_ARM_)
72+
#if !defined(PRIx32)
73+
#define PRIx32 "lx"
74+
#endif
7275
#define PRIx PRIx32
7376
#define PRIu PRIu32
7477
#define PRId PRId32
7578
#define PRIA "08"
7679
#define PRIxA PRIA PRIx
7780
#elif defined(_AMD64_) || defined(_ARM64_)
81+
#if !defined(PRIx64)
82+
#define PRIx64 "llx"
83+
#endif
7884
#define PRIx PRIx64
7985
#define PRIu PRIu64
8086
#define PRId PRId64

0 commit comments

Comments
 (0)