Skip to content

Commit 523efbb

Browse files
RussKieRussKie
authored
Merge branch 'main' into update-dotnet-sdk-10.0.100-preview.2.25102.3
2 parents 01fb198 + 9660fb4 commit 523efbb

File tree

6 files changed

+59
-58
lines changed

6 files changed

+59
-58
lines changed

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,38 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="dotnet-ef" Version="10.0.0-preview.2.25081.2">
12+
<Dependency Name="dotnet-ef" Version="10.0.0-preview.2.25103.3">
1313
<Uri>https://github.com/dotnet/efcore</Uri>
14-
<Sha>a149ce7a057bd304ea382c3dba7434268f099398</Sha>
14+
<Sha>d58959f771cba9483e9ff3bf30a6566c97fd3ccd</Sha>
1515
<SourceBuildTarball RepoName="efcore" ManagedOnly="true" />
1616
</Dependency>
17-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0-preview.2.25081.2">
17+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0-preview.2.25103.3">
1818
<Uri>https://github.com/dotnet/efcore</Uri>
19-
<Sha>a149ce7a057bd304ea382c3dba7434268f099398</Sha>
19+
<Sha>d58959f771cba9483e9ff3bf30a6566c97fd3ccd</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0-preview.2.25081.2">
21+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0-preview.2.25103.3">
2222
<Uri>https://github.com/dotnet/efcore</Uri>
23-
<Sha>a149ce7a057bd304ea382c3dba7434268f099398</Sha>
23+
<Sha>d58959f771cba9483e9ff3bf30a6566c97fd3ccd</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0-preview.2.25081.2">
25+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0-preview.2.25103.3">
2626
<Uri>https://github.com/dotnet/efcore</Uri>
27-
<Sha>a149ce7a057bd304ea382c3dba7434268f099398</Sha>
27+
<Sha>d58959f771cba9483e9ff3bf30a6566c97fd3ccd</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0-preview.2.25081.2">
29+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0-preview.2.25103.3">
3030
<Uri>https://github.com/dotnet/efcore</Uri>
31-
<Sha>a149ce7a057bd304ea382c3dba7434268f099398</Sha>
31+
<Sha>d58959f771cba9483e9ff3bf30a6566c97fd3ccd</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0-preview.2.25081.2">
33+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0-preview.2.25103.3">
3434
<Uri>https://github.com/dotnet/efcore</Uri>
35-
<Sha>a149ce7a057bd304ea382c3dba7434268f099398</Sha>
35+
<Sha>d58959f771cba9483e9ff3bf30a6566c97fd3ccd</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="10.0.0-preview.2.25081.2">
37+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="10.0.0-preview.2.25103.3">
3838
<Uri>https://github.com/dotnet/efcore</Uri>
39-
<Sha>a149ce7a057bd304ea382c3dba7434268f099398</Sha>
39+
<Sha>d58959f771cba9483e9ff3bf30a6566c97fd3ccd</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-preview.2.25081.2">
41+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-preview.2.25103.3">
4242
<Uri>https://github.com/dotnet/efcore</Uri>
43-
<Sha>a149ce7a057bd304ea382c3dba7434268f099398</Sha>
43+
<Sha>d58959f771cba9483e9ff3bf30a6566c97fd3ccd</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="10.0.0-preview.2.25102.2">
4646
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -388,47 +388,47 @@
388388
<Uri>https://github.com/dotnet/runtime</Uri>
389389
<Sha>6f3f67528f9c1e6fd3b8614aac054286f3b2e7e0</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25076.1">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25080.7">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
393+
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25076.1">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25080.7">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
398+
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25076.1">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25080.7">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
403+
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25076.1">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25080.7">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
407+
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25076.1">
409+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25080.7">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
411+
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25076.1">
413+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25080.7">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
415+
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25076.1">
417+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25080.7">
418418
<Uri>https://github.com/dotnet/arcade</Uri>
419-
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
419+
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25076.1">
421+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25080.7">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
423+
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.2.0-preview.1.25076.1">
425+
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.2.0-preview.1.25080.2">
426426
<Uri>https://github.com/dotnet/extensions</Uri>
427-
<Sha>934f76764160313201398550d0ee3c5ac52d8ac5</Sha>
427+
<Sha>cc2317e220509a75fe457fc73ac83091c2b531ce</Sha>
428428
</Dependency>
429-
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.2.0-preview.1.25076.1">
429+
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.2.0-preview.1.25080.2">
430430
<Uri>https://github.com/dotnet/extensions</Uri>
431-
<Sha>934f76764160313201398550d0ee3c5ac52d8ac5</Sha>
431+
<Sha>cc2317e220509a75fe457fc73ac83091c2b531ce</Sha>
432432
</Dependency>
433433
<Dependency Name="NuGet.Frameworks" Version="6.2.4">
434434
<Uri>https://github.com/nuget/nuget.client</Uri>

‎eng/Versions.props‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -143,17 +143,17 @@
143143
<SystemIOHashingVersion>10.0.0-preview.2.25102.2</SystemIOHashingVersion>
144144
<SystemRuntimeCachingVersion>10.0.0-preview.2.25102.2</SystemRuntimeCachingVersion>
145145
<!-- Packages from dotnet/extensions -->
146-
<MicrosoftExtensionsDiagnosticsTestingVersion>9.2.0-preview.1.25076.1</MicrosoftExtensionsDiagnosticsTestingVersion>
147-
<MicrosoftExtensionsTimeProviderTestingVersion>9.2.0-preview.1.25076.1</MicrosoftExtensionsTimeProviderTestingVersion>
146+
<MicrosoftExtensionsDiagnosticsTestingVersion>9.2.0-preview.1.25080.2</MicrosoftExtensionsDiagnosticsTestingVersion>
147+
<MicrosoftExtensionsTimeProviderTestingVersion>9.2.0-preview.1.25080.2</MicrosoftExtensionsTimeProviderTestingVersion>
148148
<!-- Packages from dotnet/efcore -->
149-
<dotnetefVersion>10.0.0-preview.2.25081.2</dotnetefVersion>
150-
<MicrosoftEntityFrameworkCoreInMemoryVersion>10.0.0-preview.2.25081.2</MicrosoftEntityFrameworkCoreInMemoryVersion>
151-
<MicrosoftEntityFrameworkCoreRelationalVersion>10.0.0-preview.2.25081.2</MicrosoftEntityFrameworkCoreRelationalVersion>
152-
<MicrosoftEntityFrameworkCoreSqliteVersion>10.0.0-preview.2.25081.2</MicrosoftEntityFrameworkCoreSqliteVersion>
153-
<MicrosoftEntityFrameworkCoreSqlServerVersion>10.0.0-preview.2.25081.2</MicrosoftEntityFrameworkCoreSqlServerVersion>
154-
<MicrosoftEntityFrameworkCoreToolsVersion>10.0.0-preview.2.25081.2</MicrosoftEntityFrameworkCoreToolsVersion>
155-
<MicrosoftEntityFrameworkCoreVersion>10.0.0-preview.2.25081.2</MicrosoftEntityFrameworkCoreVersion>
156-
<MicrosoftEntityFrameworkCoreDesignVersion>10.0.0-preview.2.25081.2</MicrosoftEntityFrameworkCoreDesignVersion>
149+
<dotnetefVersion>10.0.0-preview.2.25103.3</dotnetefVersion>
150+
<MicrosoftEntityFrameworkCoreInMemoryVersion>10.0.0-preview.2.25103.3</MicrosoftEntityFrameworkCoreInMemoryVersion>
151+
<MicrosoftEntityFrameworkCoreRelationalVersion>10.0.0-preview.2.25103.3</MicrosoftEntityFrameworkCoreRelationalVersion>
152+
<MicrosoftEntityFrameworkCoreSqliteVersion>10.0.0-preview.2.25103.3</MicrosoftEntityFrameworkCoreSqliteVersion>
153+
<MicrosoftEntityFrameworkCoreSqlServerVersion>10.0.0-preview.2.25103.3</MicrosoftEntityFrameworkCoreSqlServerVersion>
154+
<MicrosoftEntityFrameworkCoreToolsVersion>10.0.0-preview.2.25103.3</MicrosoftEntityFrameworkCoreToolsVersion>
155+
<MicrosoftEntityFrameworkCoreVersion>10.0.0-preview.2.25103.3</MicrosoftEntityFrameworkCoreVersion>
156+
<MicrosoftEntityFrameworkCoreDesignVersion>10.0.0-preview.2.25103.3</MicrosoftEntityFrameworkCoreDesignVersion>
157157
<!-- Packages from dotnet/roslyn -->
158158
<MicrosoftCodeAnalysisCommonVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisCommonVersion>
159159
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
@@ -166,11 +166,11 @@
166166
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
167167
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
168168
<!-- Packages from dotnet/arcade -->
169-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksArchivesVersion>
170-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksInstallersVersion>
171-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksTemplatingVersion>
172-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25076.1</MicrosoftDotNetRemoteExecutorVersion>
173-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.25076.1</MicrosoftSourceBuildIntermediatearcadeVersion>
169+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25080.7</MicrosoftDotNetBuildTasksArchivesVersion>
170+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25080.7</MicrosoftDotNetBuildTasksInstallersVersion>
171+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25080.7</MicrosoftDotNetBuildTasksTemplatingVersion>
172+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25080.7</MicrosoftDotNetRemoteExecutorVersion>
173+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.25080.7</MicrosoftSourceBuildIntermediatearcadeVersion>
174174
<!-- Packages from dotnet/source-build-externals -->
175175
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.607901</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
176176
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/native/install-dependencies.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ case "$os" in
2424
apt update
2525

2626
apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
27-
libssl-dev libkrb5-dev zlib1g-dev pigz cpio
27+
libssl-dev libkrb5-dev pigz cpio
2828

2929
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
3030
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
31-
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz cpio
31+
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
3232
elif [ "$ID" = "alpine" ]; then
33-
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz cpio
33+
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
3434
else
3535
echo "Unsupported distro. distro: $ID"
3636
exit 1

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "11.0.24"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25076.1",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25076.1",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25076.1",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25080.7",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25080.7",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25080.7",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

‎src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5288,6 +5288,7 @@ await ExpectAsync(Http2FrameType.DATA,
52885288
}
52895289

52905290
[Fact]
5291+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60111")]
52915292
public async Task IgnoreNewStreamsDuringClosedConnection()
52925293
{
52935294
// Remove callback that completes _pair.Application.Output on abort.

‎src/submodules/googletest‎

0 commit comments

Comments
 (0)