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' #28002

Merged
merged 12 commits into from
Jan 17, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 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
d4db988
update brandint to 3.0.3 (#27993)
Anipik Jan 14, 2020
c76e272
Update branding to 3.0.3 (#27997)
mmitche Jan 15, 2020
91946c7
Fix infrastructure issues in release 3.0 (#28000)
hoyosjs Jan 16, 2020
259ce7d
[release/3.0] Update dependencies from dotnet/arcade (#26889)
dotnet-maestro[bot] Jan 17, 2020
b8987a3
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
mmitche Jan 17, 2020
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
3 changes: 2 additions & 1 deletion eng/Tools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />
<PackageDownload Include="Microsoft.DotNet.Helix.Sdk" Version="[$(MicrosoftDotNetHelixSdkVersion)]" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />
</ItemGroup>
</Project>
</Project>
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<!-- arcade -->
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19577.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19577.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetHelixSdkVersion>2.0.0-beta.19461.7</MicrosoftDotNetHelixSdkVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<!-- roslyn -->
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
Expand Down
15 changes: 13 additions & 2 deletions eng/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,18 @@ jobs:
parameters:
jobTemplate: test-job.yml
buildConfig: checked
platformGroup: all
platforms:
- Linux_arm
- Linux_arm64
- Linux_musl_x64
- Linux_musl_arm64
- Linux_rhel6_x64
- Linux_x64
- OSX_x64
- Windows_NT_x64
- Windows_NT_x86
# - Windows_NT_arm return this when https://github.com/dotnet/runtime/issues/1097 is fixed.
- Windows_NT_arm64
helixQueueGroup: ci
jobParameters:
testGroup: outerloop
Expand All @@ -73,7 +84,7 @@ jobs:
- OSX_x64
- Windows_NT_x64
- Windows_NT_x86
- Windows_NT_arm
# - Windows_NT_arm return this when https://github.com/dotnet/runtime/issues/1097 is fixed.
- Windows_NT_arm64
helixQueueGroup: ci
jobParameters:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- Linux_musl_x64
- Linux_x64
- OSX_x64
- Windows_NT_arm
# - Windows_NT_arm return this when https://github.com/dotnet/runtime/issues/1097 is fixed.
- Windows_NT_arm64
- Windows_NT_x64
- Windows_NT_x86
Expand Down
8 changes: 7 additions & 1 deletion src/pal/src/exception/remote-unwind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,19 @@ SET_DEFAULT_DEBUG_CHANNEL(EXCEPT);
#include <elf.h>
#include <link.h>

#if defined(_X86_) || defined(_ARM_)
#if defined(_X86_) || defined(_ARM_)
#if !defined(PRIx32)
#define PRIx32 "lx"
#endif
#define PRIx PRIx32
#define PRIu PRIu32
#define PRId PRId32
#define PRIA "08"
#define PRIxA PRIA PRIx
#elif defined(_AMD64_) || defined(_ARM64_)
#if !defined(PRIx64)
#define PRIx64 "llx"
#endif
#define PRIx PRIx64
#define PRIu PRIu64
#define PRId PRId64
Expand Down