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

Commit 91946c7

Browse files
authored
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
1 parent c76e272 commit 91946c7

File tree

5 files changed

+35
-16
lines changed

5 files changed

+35
-16
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.19461.7</MicrosoftDotNetBuildTasksFeedVersion>
1919
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19461.7</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: 19 additions & 8 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:
@@ -84,9 +95,9 @@ jobs:
8495
#
8596
# Formatting
8697
#
87-
- template: /eng/platform-matrix.yml
88-
parameters:
89-
jobTemplate: format-job.yml
90-
platforms:
91-
- Linux_x64
92-
- Windows_NT_x64
98+
# - template: /eng/platform-matrix.yml
99+
# parameters:
100+
# jobTemplate: format-job.yml
101+
# platforms:
102+
# - Linux_x64
103+
# - Windows_NT_x64

eng/pipelines/pr.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- Linux_musl_x64
6565
- Linux_x64
6666
- OSX_x64
67-
- Windows_NT_arm
67+
# - Windows_NT_arm return this when https://github.com/dotnet/runtime/issues/1097 is fixed.
6868
- Windows_NT_arm64
6969
- Windows_NT_x64
7070
- Windows_NT_x86
@@ -122,8 +122,8 @@ jobs:
122122
#
123123
# Formatting
124124
#
125-
- template: /eng/platform-matrix.yml
126-
parameters:
127-
jobTemplate: format-job.yml
128-
platforms:
129-
- Linux_x64
125+
# - template: /eng/platform-matrix.yml
126+
# parameters:
127+
# jobTemplate: format-job.yml
128+
# platforms:
129+
# - Linux_x64

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)