Skip to content

Commit 169a40a

Browse files
liveansliveans
authored
Merge branch 'main' into fix_missing_status_code
2 parents 260ab0f + 8df86ac commit 169a40a

192 files changed

Lines changed: 2765 additions & 1314 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎eng/Subsets.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,11 +524,12 @@
524524
<ProjectToBuild Include="$(SharedNativeRoot)managed\cdac\Microsoft.Diagnostics.DataContractReader\Microsoft.Diagnostics.DataContractReader.csproj;
525525
$(SharedNativeRoot)managed\cdac\Microsoft.Diagnostics.DataContractReader.Abstractions\Microsoft.Diagnostics.DataContractReader.Abstractions.csproj;
526526
$(SharedNativeRoot)managed\cdac\Microsoft.Diagnostics.DataContractReader.Legacy\Microsoft.Diagnostics.DataContractReader.Legacy.csproj;
527-
$(SharedNativeRoot)managed\cdac\Microsoft.Diagnostics.DataContractReader.Contracts\Microsoft.Diagnostics.DataContractReader.Contracts.csproj" Category="tools" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
527+
$(SharedNativeRoot)managed\cdac\Microsoft.Diagnostics.DataContractReader.Contracts\Microsoft.Diagnostics.DataContractReader.Contracts.csproj;
528+
$(SharedNativeRoot)managed\cdac\tests\TestInfrastructure\Microsoft.Diagnostics.DataContractReader.TestInfrastructure.csproj" Category="tools" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
528529
</ItemGroup>
529530

530531
<ItemGroup Condition="$(_subset.Contains('+tools.cdactests+'))">
531-
<ProjectToBuild Include="$(SharedNativeRoot)managed\cdac\tests\Microsoft.Diagnostics.DataContractReader.Tests.csproj" Test="true" Category="tools"/>
532+
<ProjectToBuild Include="$(SharedNativeRoot)managed\cdac\tests\UnitTests\Microsoft.Diagnostics.DataContractReader.Tests.csproj" Test="true" Category="tools"/>
532533
</ItemGroup>
533534

534535
<ItemGroup Condition="$(_subset.Contains('+tools.cdacdumptests+'))">

‎eng/Version.Details.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,22 +97,22 @@ This file should be imported by eng/Versions.props
9797
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.26276.2</optimizationwindows_ntx64MIBCRuntimePackageVersion>
9898
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.26276.2</optimizationwindows_ntx86MIBCRuntimePackageVersion>
9999
<!-- dotnet-runtime-assets dependencies -->
100-
<MicrosoftDotNetCilStripSourcesPackageVersion>11.0.0-beta.26276.1</MicrosoftDotNetCilStripSourcesPackageVersion>
101-
<MicrosoftDotnetFuzzingTestDataPackageVersion>11.0.0-beta.26276.1</MicrosoftDotnetFuzzingTestDataPackageVersion>
102-
<MicrosoftNETHostModelTestDataPackageVersion>11.0.0-beta.26276.1</MicrosoftNETHostModelTestDataPackageVersion>
103-
<SystemComponentModelTypeConverterTestDataPackageVersion>11.0.0-beta.26276.1</SystemComponentModelTypeConverterTestDataPackageVersion>
104-
<SystemDataCommonTestDataPackageVersion>11.0.0-beta.26276.1</SystemDataCommonTestDataPackageVersion>
105-
<SystemDrawingCommonTestDataPackageVersion>11.0.0-beta.26276.1</SystemDrawingCommonTestDataPackageVersion>
106-
<SystemFormatsTarTestDataPackageVersion>11.0.0-beta.26276.1</SystemFormatsTarTestDataPackageVersion>
107-
<SystemIOCompressionTestDataPackageVersion>11.0.0-beta.26276.1</SystemIOCompressionTestDataPackageVersion>
108-
<SystemIOPackagingTestDataPackageVersion>11.0.0-beta.26276.1</SystemIOPackagingTestDataPackageVersion>
109-
<SystemNetTestDataPackageVersion>11.0.0-beta.26276.1</SystemNetTestDataPackageVersion>
110-
<SystemPrivateRuntimeUnicodeDataPackageVersion>11.0.0-beta.26276.1</SystemPrivateRuntimeUnicodeDataPackageVersion>
111-
<SystemRuntimeNumericsTestDataPackageVersion>11.0.0-beta.26276.1</SystemRuntimeNumericsTestDataPackageVersion>
112-
<SystemRuntimeTimeZoneDataPackageVersion>11.0.0-beta.26276.1</SystemRuntimeTimeZoneDataPackageVersion>
113-
<SystemSecurityCryptographyX509CertificatesTestDataPackageVersion>11.0.0-beta.26276.1</SystemSecurityCryptographyX509CertificatesTestDataPackageVersion>
114-
<SystemTextRegularExpressionsTestDataPackageVersion>11.0.0-beta.26276.1</SystemTextRegularExpressionsTestDataPackageVersion>
115-
<SystemWindowsExtensionsTestDataPackageVersion>11.0.0-beta.26276.1</SystemWindowsExtensionsTestDataPackageVersion>
100+
<MicrosoftDotNetCilStripSourcesPackageVersion>11.0.0-beta.26302.1</MicrosoftDotNetCilStripSourcesPackageVersion>
101+
<MicrosoftDotnetFuzzingTestDataPackageVersion>11.0.0-beta.26302.1</MicrosoftDotnetFuzzingTestDataPackageVersion>
102+
<MicrosoftNETHostModelTestDataPackageVersion>11.0.0-beta.26302.1</MicrosoftNETHostModelTestDataPackageVersion>
103+
<SystemComponentModelTypeConverterTestDataPackageVersion>11.0.0-beta.26302.1</SystemComponentModelTypeConverterTestDataPackageVersion>
104+
<SystemDataCommonTestDataPackageVersion>11.0.0-beta.26302.1</SystemDataCommonTestDataPackageVersion>
105+
<SystemDrawingCommonTestDataPackageVersion>11.0.0-beta.26302.1</SystemDrawingCommonTestDataPackageVersion>
106+
<SystemFormatsTarTestDataPackageVersion>11.0.0-beta.26302.1</SystemFormatsTarTestDataPackageVersion>
107+
<SystemIOCompressionTestDataPackageVersion>11.0.0-beta.26302.1</SystemIOCompressionTestDataPackageVersion>
108+
<SystemIOPackagingTestDataPackageVersion>11.0.0-beta.26302.1</SystemIOPackagingTestDataPackageVersion>
109+
<SystemNetTestDataPackageVersion>11.0.0-beta.26302.1</SystemNetTestDataPackageVersion>
110+
<SystemPrivateRuntimeUnicodeDataPackageVersion>11.0.0-beta.26302.1</SystemPrivateRuntimeUnicodeDataPackageVersion>
111+
<SystemRuntimeNumericsTestDataPackageVersion>11.0.0-beta.26302.1</SystemRuntimeNumericsTestDataPackageVersion>
112+
<SystemRuntimeTimeZoneDataPackageVersion>11.0.0-beta.26302.1</SystemRuntimeTimeZoneDataPackageVersion>
113+
<SystemSecurityCryptographyX509CertificatesTestDataPackageVersion>11.0.0-beta.26302.1</SystemSecurityCryptographyX509CertificatesTestDataPackageVersion>
114+
<SystemTextRegularExpressionsTestDataPackageVersion>11.0.0-beta.26302.1</SystemTextRegularExpressionsTestDataPackageVersion>
115+
<SystemWindowsExtensionsTestDataPackageVersion>11.0.0-beta.26302.1</SystemWindowsExtensionsTestDataPackageVersion>
116116
<!-- dotnet-xharness dependencies -->
117117
<MicrosoftDotNetXHarnessCLIPackageVersion>11.0.0-prerelease.26279.1</MicrosoftDotNetXHarnessCLIPackageVersion>
118118
<MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>11.0.0-prerelease.26279.1</MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -123,57 +123,57 @@
123123
<Uri>https://github.com/dotnet/dotnet</Uri>
124124
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
125125
</Dependency>
126-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="11.0.0-beta.26276.1">
126+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="11.0.0-beta.26302.1">
127127
<Uri>https://github.com/dotnet/runtime-assets</Uri>
128-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
128+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
129129
</Dependency>
130-
<Dependency Name="System.Data.Common.TestData" Version="11.0.0-beta.26276.1">
130+
<Dependency Name="System.Data.Common.TestData" Version="11.0.0-beta.26302.1">
131131
<Uri>https://github.com/dotnet/runtime-assets</Uri>
132-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
132+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
133133
</Dependency>
134-
<Dependency Name="System.Drawing.Common.TestData" Version="11.0.0-beta.26276.1">
134+
<Dependency Name="System.Drawing.Common.TestData" Version="11.0.0-beta.26302.1">
135135
<Uri>https://github.com/dotnet/runtime-assets</Uri>
136-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
136+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
137137
</Dependency>
138-
<Dependency Name="System.Formats.Tar.TestData" Version="11.0.0-beta.26276.1">
138+
<Dependency Name="System.Formats.Tar.TestData" Version="11.0.0-beta.26302.1">
139139
<Uri>https://github.com/dotnet/runtime-assets</Uri>
140-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
140+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
141141
</Dependency>
142-
<Dependency Name="System.IO.Compression.TestData" Version="11.0.0-beta.26276.1">
142+
<Dependency Name="System.IO.Compression.TestData" Version="11.0.0-beta.26302.1">
143143
<Uri>https://github.com/dotnet/runtime-assets</Uri>
144-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
144+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
145145
</Dependency>
146-
<Dependency Name="System.IO.Packaging.TestData" Version="11.0.0-beta.26276.1">
146+
<Dependency Name="System.IO.Packaging.TestData" Version="11.0.0-beta.26302.1">
147147
<Uri>https://github.com/dotnet/runtime-assets</Uri>
148-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
148+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
149149
</Dependency>
150-
<Dependency Name="System.Net.TestData" Version="11.0.0-beta.26276.1">
150+
<Dependency Name="System.Net.TestData" Version="11.0.0-beta.26302.1">
151151
<Uri>https://github.com/dotnet/runtime-assets</Uri>
152-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
152+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
153153
</Dependency>
154-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="11.0.0-beta.26276.1">
154+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="11.0.0-beta.26302.1">
155155
<Uri>https://github.com/dotnet/runtime-assets</Uri>
156-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
156+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
157157
</Dependency>
158-
<Dependency Name="System.Runtime.TimeZoneData" Version="11.0.0-beta.26276.1">
158+
<Dependency Name="System.Runtime.TimeZoneData" Version="11.0.0-beta.26302.1">
159159
<Uri>https://github.com/dotnet/runtime-assets</Uri>
160-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
160+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
161161
</Dependency>
162-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="11.0.0-beta.26276.1">
162+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="11.0.0-beta.26302.1">
163163
<Uri>https://github.com/dotnet/runtime-assets</Uri>
164-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
164+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
165165
</Dependency>
166-
<Dependency Name="System.Text.RegularExpressions.TestData" Version="11.0.0-beta.26276.1">
166+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="11.0.0-beta.26302.1">
167167
<Uri>https://github.com/dotnet/runtime-assets</Uri>
168-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
168+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
169169
</Dependency>
170-
<Dependency Name="System.Windows.Extensions.TestData" Version="11.0.0-beta.26276.1">
170+
<Dependency Name="System.Windows.Extensions.TestData" Version="11.0.0-beta.26302.1">
171171
<Uri>https://github.com/dotnet/runtime-assets</Uri>
172-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
172+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="11.0.0-beta.26276.1">
174+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="11.0.0-beta.26302.1">
175175
<Uri>https://github.com/dotnet/runtime-assets</Uri>
176-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
176+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
177177
</Dependency>
178178
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang" Version="19.1.0-alpha.1.26208.2">
179179
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -323,9 +323,9 @@
323323
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
324324
<Sha>28af8e7016d4b1ad30ed932f15bd56c033402457</Sha>
325325
</Dependency>
326-
<Dependency Name="System.Runtime.Numerics.TestData" Version="11.0.0-beta.26276.1">
326+
<Dependency Name="System.Runtime.Numerics.TestData" Version="11.0.0-beta.26302.1">
327327
<Uri>https://github.com/dotnet/runtime-assets</Uri>
328-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
328+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
329329
</Dependency>
330330
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.8.0-1.26266.103">
331331
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -413,13 +413,13 @@
413413
<Uri>https://github.com/dotnet/node</Uri>
414414
<Sha>cfe285c85ac61bde50792e8d516e31b302846f53</Sha>
415415
</Dependency>
416-
<Dependency Name="Microsoft.NET.HostModel.TestData" Version="11.0.0-beta.26276.1">
416+
<Dependency Name="Microsoft.NET.HostModel.TestData" Version="11.0.0-beta.26302.1">
417417
<Uri>https://github.com/dotnet/runtime-assets</Uri>
418-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
418+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
419419
</Dependency>
420-
<Dependency Name="Microsoft.DotnetFuzzing.TestData" Version="11.0.0-beta.26276.1">
420+
<Dependency Name="Microsoft.DotnetFuzzing.TestData" Version="11.0.0-beta.26302.1">
421421
<Uri>https://github.com/dotnet/runtime-assets</Uri>
422-
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
422+
<Sha>0dfda3e1e2da87cd6637ecb40e40a4fb6782a505</Sha>
423423
</Dependency>
424424
</ToolsetDependencies>
425425
</Dependencies>

‎src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,6 @@
99
<!-- Accessed via native code. -->
1010
<type fullname="System.Runtime.InteropServices.CustomMarshalers.*" />
1111

12-
<!-- Works around https://github.com/dotnet/runtime/issues/128120 -->
13-
<type fullname="System.StubHelpers.DateMarshaler" />
14-
<type fullname="System.StubHelpers.StructureMarshaler`1" />
15-
<type fullname="System.StubHelpers.BlittableArrayMarshaler`1" />
16-
<type fullname="System.StubHelpers.AnsiCharArrayMarshaler`2" />
17-
<type fullname="System.StubHelpers.LayoutClassMarshaler`1" />
18-
<type fullname="System.StubHelpers.BoolMarshaler`1" />
19-
<type fullname="System.StubHelpers.LPWSTRMarshaler" />
20-
<type fullname="System.StubHelpers.LPSTRArrayElementMarshaler`2" />
21-
<type fullname="System.StubHelpers.BSTRArrayElementMarshaler" />
22-
2312
<!-- GetActualImplementationForArrayGenericIListOrIReadOnlyListMethod depends on slots of these interfaces not changing -->
2413
<type fullname="System.Collections.Generic.IEnumerable`1" />
2514
<type fullname="System.Collections.Generic.ICollection`1" />

‎src/coreclr/debug/crashreport/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
set(CMAKE_INCLUDE_CURRENT_DIR ON)
22

33
set(CRASHREPORT_SOURCES
4+
crashreportstringutils.cpp
45
signalsafeformatter.cpp
56
signalsafejsonwriter.cpp
67
signalsafeconsolewriter.cpp
8+
inproccrashreportlifecycle.cpp
79
inproccrashreporter.cpp
810
inproccrashreportwatchdog.cpp
911
)

‎src/coreclr/debug/crashreport/crashreportstringutils.cpp‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
#include "crashreportstringutils.h"
5+
6+
#include <string.h>
7+
8+
void CrashReportStringUtils::CopyString(char* buffer, size_t bufferSize, const char* value)
9+
{
10+
if (buffer == nullptr || bufferSize == 0)
11+
{
12+
return;
13+
}
14+
15+
if (value == nullptr)
16+
{
17+
buffer[0] = '\0';
18+
return;
19+
}
20+
21+
size_t toCopy = strnlen(value, bufferSize - 1);
22+
if (toCopy != 0)
23+
{
24+
memcpy(buffer, value, toCopy);
25+
}
26+
27+
buffer[toCopy] = '\0';
28+
}
29+
30+
bool CrashReportStringUtils::AppendString(char* buffer, size_t bufferSize, size_t* pos, const char* value)
31+
{
32+
if (buffer == nullptr || pos == nullptr || value == nullptr || bufferSize == 0)
33+
{
34+
return false;
35+
}
36+
37+
size_t p = *pos;
38+
while (*value != '\0' && p + 1 < bufferSize)
39+
{
40+
buffer[p++] = *value++;
41+
}
42+
buffer[p] = '\0';
43+
*pos = p;
44+
return *value == '\0';
45+
}

‎src/coreclr/debug/crashreport/crashreportstringutils.h‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
// Shared, allocation-free, bounds-safe string helpers used by both the in-proc
5+
// crash reporter and the crash report lifecycle. These are safe to call from the
6+
// signal/crash path: they perform no heap allocation and never call into the
7+
// runtime.
8+
9+
#pragma once
10+
11+
#include <stddef.h>
12+
13+
namespace CrashReportStringUtils
14+
{
15+
// Copies value into buffer, truncating if necessary, and always
16+
// null-terminates. A null value yields an empty string. No-op if buffer is
17+
// null or bufferSize is 0.
18+
void CopyString(
19+
char* buffer,
20+
size_t bufferSize,
21+
const char* value);
22+
23+
// Appends value to buffer starting at *pos, copying as much as fits, advancing
24+
// *pos past the characters actually written, and always null-terminating.
25+
// Returns true if the entire value fit; returns false if the value was
26+
// truncated, the arguments are invalid, or bufferSize is 0.
27+
bool AppendString(
28+
char* buffer,
29+
size_t bufferSize,
30+
size_t* pos,
31+
const char* value);
32+
}

0 commit comments

Comments
 (0)