diff options
author | dotnet-maestro-bot <dotnet-maestro-bot@microsoft.com> | 2020-01-16 18:10:56 -0800 |
---|---|---|
committer | William Godbe <wigodbe@microsoft.com> | 2020-01-16 18:10:56 -0800 |
commit | fd22fd600a2526a7c58536da0e80325eb710d7f1 (patch) | |
tree | 1fccd34b404e4dcc89928536e6621dd8ef8f6d4d | |
parent | 4e29494f5610ecd739b1b762b36d3b93c61a4a4b (diff) | |
download | coreclr-fd22fd600a2526a7c58536da0e80325eb710d7f1.tar.gz coreclr-fd22fd600a2526a7c58536da0e80325eb710d7f1.tar.bz2 coreclr-fd22fd600a2526a7c58536da0e80325eb710d7f1.zip |
[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 <mmitche@microsoft.com>
Co-authored-by: Juan Hoyos <juan.hoyos@microsoft.com>
Co-authored-by: Brian Robbins <brianrob@microsoft.com>
Co-authored-by: Anirudh Agnihotry <anirudhagnihotry098@gmail.com>
Co-authored-by: Juan Hoyos <juan.hoyos@microsoft.com>
Co-authored-by: Jarret Shook <jashoo@microsoft.com>
Co-authored-by: David Mason <davmason@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
-rw-r--r-- | eng/Tools.props | 3 | ||||
-rw-r--r-- | eng/Versions.props | 1 | ||||
-rw-r--r-- | eng/pipelines/ci.yml | 15 | ||||
-rw-r--r-- | eng/pipelines/pr.yml | 2 | ||||
-rw-r--r-- | src/pal/src/exception/remote-unwind.cpp | 8 |
5 files changed, 24 insertions, 5 deletions
diff --git a/eng/Tools.props b/eng/Tools.props index 40a770a47f..b8c99b0323 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -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>
\ No newline at end of file +</Project> diff --git a/eng/Versions.props b/eng/Versions.props index 038ecbfb77..506eeacc8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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> diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml index d4401681d9..811fd93b65 100644 --- a/eng/pipelines/ci.yml +++ b/eng/pipelines/ci.yml @@ -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 @@ -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: diff --git a/eng/pipelines/pr.yml b/eng/pipelines/pr.yml index 5f0066d40c..33ff8c6997 100644 --- a/eng/pipelines/pr.yml +++ b/eng/pipelines/pr.yml @@ -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 diff --git a/src/pal/src/exception/remote-unwind.cpp b/src/pal/src/exception/remote-unwind.cpp index 893cc026c5..c4ff0335e4 100644 --- a/src/pal/src/exception/remote-unwind.cpp +++ b/src/pal/src/exception/remote-unwind.cpp @@ -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 |