Skip to content

Commit 7501a3b

Browse files
pavelsavarapavelsavara
committed
Merge branch 'main' into browser_modularize_corerun
2 parents f65fdc0 + 69d8087 commit 7501a3b

File tree

5 files changed

+79
-69
lines changed

5 files changed

+79
-69
lines changed

‎eng/Version.Details.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,21 @@ This file should be imported by eng/Versions.props
8080
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25528.108</SystemReflectionMetadataLoadContextPackageVersion>
8181
<SystemTextJsonPackageVersion>10.0.0-rc.1.25528.108</SystemTextJsonPackageVersion>
8282
<!-- dotnet/runtime-assets dependencies -->
83-
<MicrosoftDotNetCilStripSourcesPackageVersion>11.0.0-beta.25467.3</MicrosoftDotNetCilStripSourcesPackageVersion>
84-
<MicrosoftNETHostModelTestDataPackageVersion>11.0.0-beta.25467.3</MicrosoftNETHostModelTestDataPackageVersion>
85-
<SystemComponentModelTypeConverterTestDataPackageVersion>11.0.0-beta.25467.3</SystemComponentModelTypeConverterTestDataPackageVersion>
86-
<SystemDataCommonTestDataPackageVersion>11.0.0-beta.25467.3</SystemDataCommonTestDataPackageVersion>
87-
<SystemDrawingCommonTestDataPackageVersion>11.0.0-beta.25467.3</SystemDrawingCommonTestDataPackageVersion>
88-
<SystemFormatsTarTestDataPackageVersion>11.0.0-beta.25467.3</SystemFormatsTarTestDataPackageVersion>
89-
<SystemIOCompressionTestDataPackageVersion>11.0.0-beta.25467.3</SystemIOCompressionTestDataPackageVersion>
90-
<SystemIOPackagingTestDataPackageVersion>11.0.0-beta.25467.3</SystemIOPackagingTestDataPackageVersion>
91-
<SystemNetTestDataPackageVersion>11.0.0-beta.25467.3</SystemNetTestDataPackageVersion>
92-
<SystemPrivateRuntimeUnicodeDataPackageVersion>11.0.0-beta.25467.3</SystemPrivateRuntimeUnicodeDataPackageVersion>
93-
<SystemRuntimeNumericsTestDataPackageVersion>11.0.0-beta.25467.3</SystemRuntimeNumericsTestDataPackageVersion>
94-
<SystemRuntimeTimeZoneDataPackageVersion>11.0.0-beta.25467.3</SystemRuntimeTimeZoneDataPackageVersion>
95-
<SystemSecurityCryptographyX509CertificatesTestDataPackageVersion>11.0.0-beta.25467.3</SystemSecurityCryptographyX509CertificatesTestDataPackageVersion>
96-
<SystemTextRegularExpressionsTestDataPackageVersion>11.0.0-beta.25467.3</SystemTextRegularExpressionsTestDataPackageVersion>
97-
<SystemWindowsExtensionsTestDataPackageVersion>11.0.0-beta.25467.3</SystemWindowsExtensionsTestDataPackageVersion>
83+
<MicrosoftDotNetCilStripSourcesPackageVersion>11.0.0-beta.25553.1</MicrosoftDotNetCilStripSourcesPackageVersion>
84+
<MicrosoftNETHostModelTestDataPackageVersion>11.0.0-beta.25553.1</MicrosoftNETHostModelTestDataPackageVersion>
85+
<SystemComponentModelTypeConverterTestDataPackageVersion>11.0.0-beta.25553.1</SystemComponentModelTypeConverterTestDataPackageVersion>
86+
<SystemDataCommonTestDataPackageVersion>11.0.0-beta.25553.1</SystemDataCommonTestDataPackageVersion>
87+
<SystemDrawingCommonTestDataPackageVersion>11.0.0-beta.25553.1</SystemDrawingCommonTestDataPackageVersion>
88+
<SystemFormatsTarTestDataPackageVersion>11.0.0-beta.25553.1</SystemFormatsTarTestDataPackageVersion>
89+
<SystemIOCompressionTestDataPackageVersion>11.0.0-beta.25553.1</SystemIOCompressionTestDataPackageVersion>
90+
<SystemIOPackagingTestDataPackageVersion>11.0.0-beta.25553.1</SystemIOPackagingTestDataPackageVersion>
91+
<SystemNetTestDataPackageVersion>11.0.0-beta.25553.1</SystemNetTestDataPackageVersion>
92+
<SystemPrivateRuntimeUnicodeDataPackageVersion>11.0.0-beta.25553.1</SystemPrivateRuntimeUnicodeDataPackageVersion>
93+
<SystemRuntimeNumericsTestDataPackageVersion>11.0.0-beta.25553.1</SystemRuntimeNumericsTestDataPackageVersion>
94+
<SystemRuntimeTimeZoneDataPackageVersion>11.0.0-beta.25553.1</SystemRuntimeTimeZoneDataPackageVersion>
95+
<SystemSecurityCryptographyX509CertificatesTestDataPackageVersion>11.0.0-beta.25553.1</SystemSecurityCryptographyX509CertificatesTestDataPackageVersion>
96+
<SystemTextRegularExpressionsTestDataPackageVersion>11.0.0-beta.25553.1</SystemTextRegularExpressionsTestDataPackageVersion>
97+
<SystemWindowsExtensionsTestDataPackageVersion>11.0.0-beta.25553.1</SystemWindowsExtensionsTestDataPackageVersion>
9898
<!-- dotnet/xharness dependencies -->
9999
<MicrosoftDotNetXHarnessCLIPackageVersion>10.0.0-prerelease.25506.2</MicrosoftDotNetXHarnessCLIPackageVersion>
100100
<MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>10.0.0-prerelease.25506.2</MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>
@@ -107,7 +107,7 @@ This file should be imported by eng/Versions.props
107107
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
108108
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
109109
<!-- dotnet/hotreload-utils dependencies -->
110-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolPackageVersion>11.0.0-alpha.0.25479.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolPackageVersion>
110+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolPackageVersion>11.0.0-alpha.0.25528.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolPackageVersion>
111111
<!-- dotnet/node dependencies -->
112112
<runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.25169.1</runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
113113
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.25169.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -127,57 +127,57 @@
127127
<Uri>https://github.com/dotnet/dotnet</Uri>
128128
<Sha>e545239117919cda700be149a2e9a032374fc284</Sha>
129129
</Dependency>
130-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="11.0.0-beta.25467.3">
130+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="11.0.0-beta.25553.1">
131131
<Uri>https://github.com/dotnet/runtime-assets</Uri>
132-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
132+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
133133
</Dependency>
134-
<Dependency Name="System.Data.Common.TestData" Version="11.0.0-beta.25467.3">
134+
<Dependency Name="System.Data.Common.TestData" Version="11.0.0-beta.25553.1">
135135
<Uri>https://github.com/dotnet/runtime-assets</Uri>
136-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
136+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
137137
</Dependency>
138-
<Dependency Name="System.Drawing.Common.TestData" Version="11.0.0-beta.25467.3">
138+
<Dependency Name="System.Drawing.Common.TestData" Version="11.0.0-beta.25553.1">
139139
<Uri>https://github.com/dotnet/runtime-assets</Uri>
140-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
140+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
141141
</Dependency>
142-
<Dependency Name="System.Formats.Tar.TestData" Version="11.0.0-beta.25467.3">
142+
<Dependency Name="System.Formats.Tar.TestData" Version="11.0.0-beta.25553.1">
143143
<Uri>https://github.com/dotnet/runtime-assets</Uri>
144-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
144+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
145145
</Dependency>
146-
<Dependency Name="System.IO.Compression.TestData" Version="11.0.0-beta.25467.3">
146+
<Dependency Name="System.IO.Compression.TestData" Version="11.0.0-beta.25553.1">
147147
<Uri>https://github.com/dotnet/runtime-assets</Uri>
148-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
148+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
149149
</Dependency>
150-
<Dependency Name="System.IO.Packaging.TestData" Version="11.0.0-beta.25467.3">
150+
<Dependency Name="System.IO.Packaging.TestData" Version="11.0.0-beta.25553.1">
151151
<Uri>https://github.com/dotnet/runtime-assets</Uri>
152-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
152+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
153153
</Dependency>
154-
<Dependency Name="System.Net.TestData" Version="11.0.0-beta.25467.3">
154+
<Dependency Name="System.Net.TestData" Version="11.0.0-beta.25553.1">
155155
<Uri>https://github.com/dotnet/runtime-assets</Uri>
156-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
156+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
157157
</Dependency>
158-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="11.0.0-beta.25467.3">
158+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="11.0.0-beta.25553.1">
159159
<Uri>https://github.com/dotnet/runtime-assets</Uri>
160-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
160+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
161161
</Dependency>
162-
<Dependency Name="System.Runtime.TimeZoneData" Version="11.0.0-beta.25467.3">
162+
<Dependency Name="System.Runtime.TimeZoneData" Version="11.0.0-beta.25553.1">
163163
<Uri>https://github.com/dotnet/runtime-assets</Uri>
164-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
164+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
165165
</Dependency>
166-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="11.0.0-beta.25467.3">
166+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="11.0.0-beta.25553.1">
167167
<Uri>https://github.com/dotnet/runtime-assets</Uri>
168-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
168+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
169169
</Dependency>
170-
<Dependency Name="System.Text.RegularExpressions.TestData" Version="11.0.0-beta.25467.3">
170+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="11.0.0-beta.25553.1">
171171
<Uri>https://github.com/dotnet/runtime-assets</Uri>
172-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
172+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
173173
</Dependency>
174-
<Dependency Name="System.Windows.Extensions.TestData" Version="11.0.0-beta.25467.3">
174+
<Dependency Name="System.Windows.Extensions.TestData" Version="11.0.0-beta.25553.1">
175175
<Uri>https://github.com/dotnet/runtime-assets</Uri>
176-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
176+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
177177
</Dependency>
178-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="11.0.0-beta.25467.3">
178+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="11.0.0-beta.25553.1">
179179
<Uri>https://github.com/dotnet/runtime-assets</Uri>
180-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
180+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
181181
</Dependency>
182182
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang" Version="19.1.0-alpha.1.25513.1">
183183
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -323,13 +323,13 @@
323323
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
324324
<Sha>71ce9774e9875270b80faaac1d6b60568a80e1fa</Sha>
325325
</Dependency>
326-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="11.0.0-alpha.0.25479.1">
326+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="11.0.0-alpha.0.25528.1">
327327
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
328-
<Sha>acc1d0b77fc1743fa2cef802f2535ece4276f175</Sha>
328+
<Sha>1c8f1e360f50bc3edeb8969a3a8414333e389bae</Sha>
329329
</Dependency>
330-
<Dependency Name="System.Runtime.Numerics.TestData" Version="11.0.0-beta.25467.3">
330+
<Dependency Name="System.Runtime.Numerics.TestData" Version="11.0.0-beta.25553.1">
331331
<Uri>https://github.com/dotnet/runtime-assets</Uri>
332-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
332+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
333333
</Dependency>
334334
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.3.0-1.25528.108">
335335
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -413,9 +413,9 @@
413413
<Uri>https://github.com/dotnet/node</Uri>
414414
<Sha>7f33d14aae0d91f2d5befda939160177e13b3f47</Sha>
415415
</Dependency>
416-
<Dependency Name="Microsoft.NET.HostModel.TestData" Version="11.0.0-beta.25467.3">
416+
<Dependency Name="Microsoft.NET.HostModel.TestData" Version="11.0.0-beta.25553.1">
417417
<Uri>https://github.com/dotnet/runtime-assets</Uri>
418-
<Sha>3f45384563e6b3240d099ba851e9d88992918264</Sha>
418+
<Sha>b5d67650a6a37772770a9df6ca762eebd0c21617</Sha>
419419
</Dependency>
420420
</ToolsetDependencies>
421421
</Dependencies>

‎src/coreclr/vm/callingconvention.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2190,6 +2190,15 @@ void ArgIteratorTemplate<ARGITERATOR_BASE>::ForceSigWalk()
21902190
// Clear the iterator started flag
21912191
m_dwFlags &= ~ITERATION_STARTED;
21922192

2193+
#ifdef TARGET_WASM
2194+
if (this->NumFixedArgs() == 0)
2195+
{
2196+
// We have zero arguments, but we still need to reserve space for hidden arguments which are in registers on other architectures
2197+
// in non-zero argument cases, the offset is already included in first argument offset.
2198+
maxOffset += m_ofsStack;
2199+
}
2200+
#endif // TARGET_WASM
2201+
21932202
int nSizeOfArgStack = maxOffset - TransitionBlock::GetOffsetOfArgs();
21942203

21952204
#if defined(TARGET_AMD64) && !defined(UNIX_AMD64_ABI)

‎src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpEnvironmentProxy.cs‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
using System;
5-
using System.Collections.Generic;
6-
using System.Net;
7-
using System.Net.Http;
8-
94
namespace System.Net.Http
105
{
116
internal sealed class HttpEnvironmentProxyCredentials : ICredentials
@@ -115,10 +110,11 @@ private HttpEnvironmentProxy(Uri? httpProxy, Uri? httpsProxy, string? bypassList
115110
}
116111

117112
/// <summary>
118-
/// This function will evaluate given string and it will try to convert
119-
/// it to Uri object. The string could contain URI fragment, IP address and port
120-
/// tuple or just IP address or name. It will return null if parsing fails.
113+
/// Attempt to parse a partial Uri string into a Uri object.
114+
/// The string may contain the scheme, user info, host, and port. The host is the only required part.
115+
/// Example expected inputs: contoso.com, contoso.com:8080, http://contoso.com/, user@contoso.com.
121116
/// </summary>
117+
/// <returns><see langword="null"/> if parsing fails.</returns>
122118
private static Uri? GetUriFromString(string? value)
123119
{
124120
if (string.IsNullOrEmpty(value))
@@ -187,6 +183,14 @@ private HttpEnvironmentProxy(Uri? httpProxy, Uri? httpsProxy, string? bypassList
187183
}
188184
}
189185

186+
// We expect inputs to not contain the path/query/fragment, but we do handle some simple cases like a trailing slash.
187+
// An arbitrary path can break this parsing logic, but we expect environment variables to be trusted and well formed.
188+
int delimiterIndex = value.IndexOfAny('/', '?', '#');
189+
if (delimiterIndex >= 0)
190+
{
191+
value = value.Substring(0, delimiterIndex);
192+
}
193+
190194
int ipV6AddressEnd = value.IndexOf(']');
191195
separatorIndex = value.LastIndexOf(':');
192196
// No ':' or it is part of IPv6 address.
@@ -197,18 +201,8 @@ private HttpEnvironmentProxy(Uri? httpProxy, Uri? httpsProxy, string? bypassList
197201
else
198202
{
199203
host = value.Substring(0, separatorIndex);
200-
int endIndex = separatorIndex + 1;
201-
// Strip any trailing characters after port number.
202-
while (endIndex < value.Length)
203-
{
204-
if (!char.IsDigit(value[endIndex]))
205-
{
206-
break;
207-
}
208-
endIndex += 1;
209-
}
210204

211-
if (!ushort.TryParse(value.AsSpan(separatorIndex + 1, endIndex - separatorIndex - 1), out port))
205+
if (!ushort.TryParse(value.AsSpan(separatorIndex + 1), out port))
212206
{
213207
return null;
214208
}
@@ -261,8 +255,7 @@ private bool IsMatchInBypassList(Uri input)
261255
{
262256
// This should match either domain it self or any subdomain or host
263257
// .foo.com will match foo.com it self or *.foo.com
264-
if ((s.Length - 1) == input.Host.Length &&
265-
string.Compare(s, 1, input.Host, 0, input.Host.Length, StringComparison.OrdinalIgnoreCase) == 0)
258+
if (s.AsSpan(1).Equals(input.Host, StringComparison.OrdinalIgnoreCase))
266259
{
267260
return true;
268261
}

‎src/libraries/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,22 @@ await RemoteExecutor.Invoke(() =>
137137
[InlineData("[::1]", "[::1]", "80", null, null)]
138138
[InlineData("domain\\foo:PLACEHOLDER@1.1.1.1", "1.1.1.1", "80", "foo", "PLACEHOLDER")]
139139
[InlineData("domain%5Cfoo:PLACEHOLDER@1.1.1.1", "1.1.1.1", "80", "foo", "PLACEHOLDER")]
140+
[InlineData("placeholder@1.2.3.4/foo", "1.2.3.4", "80", "placeholder", "")]
141+
[InlineData("placeholder@1.2.3?.4", "1.2.0.3", "80", "placeholder", "")]
142+
[InlineData("placeholder:@1.2.3.4/foo:", "1.2.3.4", "80", "placeholder", "")]
140143
[InlineData("HTTP://ABC.COM/", "abc.com", "80", null, null)]
141144
[InlineData("http://10.30.62.64:7890/", "10.30.62.64", "7890", null, null)]
145+
[InlineData("http://1.2.3.4/foo", "1.2.3.4", "80", null, null)]
146+
[InlineData("http://1.2.3.4/foo:", "1.2.3.4", "80", null, null)]
147+
[InlineData("http://1.2.3.4?foo", "1.2.3.4", "80", null, null)]
142148
[InlineData("http://1.2.3.4:8888/foo", "1.2.3.4", "8888", null, null)]
143149
[InlineData("socks4://1.2.3.4:8888/foo", "1.2.3.4", "8888", null, null)]
144150
[InlineData("socks4a://1.2.3.4:8888/foo", "1.2.3.4", "8888", null, null)]
145151
[InlineData("socks5://1.2.3.4:8888/foo", "1.2.3.4", "8888", null, null)]
146152
[InlineData("https://1.1.1.5:3005", "1.1.1.5", "3005", null, null)]
147153
[InlineData("https://1.1.1.5", "1.1.1.5", "443", null, null)]
154+
// Everything before the last '@' is considered as user info (unlike regular Uri parsing).
155+
[InlineData("https://host1:123@foo/@host2/path", "host2", "443", "host1", "123@foo/")]
148156
public async Task HttpProxy_Uri_Parsing(string _input, string _host, string _port, string? _user, string? _password)
149157
{
150158
await RemoteExecutor.Invoke((input, host, port, user, password) =>

0 commit comments

Comments
 (0)