Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7512c29

Browse files
committed
Merged PR 55114: Merge in changes from public release/13.0 and bump to latest dotnet/extensions
2 parents5440536 +5f970c5 commit7512c29

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<addkey="darc-int-dotnet-efcore-f55fe13"value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-f55fe135/nuget/v3/index.json" />
1616
<!-- End: Package sources from dotnet-efcore-->
1717
<!-- Begin: Package sources from dotnet-extensions-->
18-
<addkey="darc-int-dotnet-extensions-ea69fde"value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-extensions-ea69fdea/nuget/v3/index.json" />
18+
<addkey="darc-int-dotnet-extensions-fbd3936"value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-extensions-fbd39361/nuget/v3/index.json" />
1919
<!-- End: Package sources from dotnet-extensions-->
2020
<!-- Begin: Package sources from dotnet-runtime-->
2121
<addkey="darc-int-dotnet-runtime-a2266c7"value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a2266c72/nuget/v3/index.json" />
@@ -43,7 +43,7 @@
4343
<addkey="darc-int-dotnet-efcore-f55fe13"value="true" />
4444
<!-- End: Package sources from dotnet-efcore-->
4545
<!-- Begin: Package sources from dotnet-extensions-->
46-
<addkey="darc-int-dotnet-extensions-ea69fde"value="true" />
46+
<addkey="darc-int-dotnet-extensions-fbd3936"value="true" />
4747
<!-- End: Package sources from dotnet-extensions-->
4848
<!-- Begin: Package sources from dotnet-runtime-->
4949
<addkey="darc-int-dotnet-runtime-a2266c7"value="true" />

‎eng/Version.Details.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,27 @@
3535
</Dependency>
3636
<DependencyName="Microsoft.Extensions.DependencyInjection.AutoActivation"Version="10.0.0">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
38-
<Sha>ea69fdea45ab2f505608ec9218315a092def86b5</Sha>
38+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
3939
</Dependency>
4040
<DependencyName="Microsoft.Extensions.Http.Resilience"Version="10.0.0">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
42-
<Sha>ea69fdea45ab2f505608ec9218315a092def86b5</Sha>
42+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
4343
</Dependency>
4444
<DependencyName="Microsoft.Extensions.ServiceDiscovery"Version="10.0.0">
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
46-
<Sha>ea69fdea45ab2f505608ec9218315a092def86b5</Sha>
46+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
4747
</Dependency>
4848
<DependencyName="Microsoft.Extensions.ServiceDiscovery.Yarp"Version="10.0.0">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
50-
<Sha>ea69fdea45ab2f505608ec9218315a092def86b5</Sha>
50+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
5151
</Dependency>
5252
<DependencyName="Microsoft.Extensions.TimeProvider.Testing"Version="10.0.0">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
54-
<Sha>ea69fdea45ab2f505608ec9218315a092def86b5</Sha>
54+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
5555
</Dependency>
5656
<DependencyName="Microsoft.Extensions.Diagnostics.Testing"Version="10.0.0">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
58-
<Sha>ea69fdea45ab2f505608ec9218315a092def86b5</Sha>
58+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
5959
</Dependency>
6060
<DependencyName="Microsoft.Extensions.Configuration.Abstractions"Version="9.0.11">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -167,15 +167,15 @@
167167
</Dependency>
168168
<DependencyName="Microsoft.Extensions.AI"Version="10.0.0">
169169
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
170-
<Sha>ea69fdea45ab2f505608ec9218315a092def86b5</Sha>
170+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
171171
</Dependency>
172-
<DependencyName="Microsoft.Extensions.AI.OpenAI"Version="10.0.0-preview.1.25558.1">
172+
<DependencyName="Microsoft.Extensions.AI.OpenAI"Version="10.0.0-preview.1.25559.3">
173173
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
174-
<Sha>ea69fdea45ab2f505608ec9218315a092def86b5</Sha>
174+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
175175
</Dependency>
176-
<DependencyName="Microsoft.Extensions.AI.AzureAIInference"Version="10.0.0-preview.1.25558.1">
176+
<DependencyName="Microsoft.Extensions.AI.AzureAIInference"Version="10.0.0-preview.1.25559.3">
177177
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
178-
<Sha>ea69fdea45ab2f505608ec9218315a092def86b5</Sha>
178+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
179179
</Dependency>
180180
</ProductDependencies>
181181
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<MicrosoftDotNetBuildTasksArchivesVersion>11.0.0-beta.25509.1</MicrosoftDotNetBuildTasksArchivesVersion>
4343
<!-- dotnet/extensions-->
4444
<MicrosoftExtensionsAIVersion>10.0.0</MicrosoftExtensionsAIVersion>
45-
<MicrosoftExtensionsAIOpenAIVersion>10.0.0-preview.1.25558.1</MicrosoftExtensionsAIOpenAIVersion>
46-
<MicrosoftExtensionsAIAzureAIInferenceVersion>10.0.0-preview.1.25558.1</MicrosoftExtensionsAIAzureAIInferenceVersion>
45+
<MicrosoftExtensionsAIOpenAIVersion>10.0.0-preview.1.25559.3</MicrosoftExtensionsAIOpenAIVersion>
46+
<MicrosoftExtensionsAIAzureAIInferenceVersion>10.0.0-preview.1.25559.3</MicrosoftExtensionsAIAzureAIInferenceVersion>
4747
<MicrosoftExtensionsHttpResilienceVersion>10.0.0</MicrosoftExtensionsHttpResilienceVersion>
4848
<MicrosoftExtensionsDependencyInjectionAutoActivationVersion>10.0.0</MicrosoftExtensionsDependencyInjectionAutoActivationVersion>
4949
<MicrosoftExtensionsDiagnosticsTestingVersion>10.0.0</MicrosoftExtensionsDiagnosticsTestingVersion>

‎src/Aspire.Cli/DotNet/DotNetSdkInstaller.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ internal sealed class DotNetSdkInstaller(IFeatures features, IConfiguration conf
1919
/// <summary>
2020
/// The minimum .NET SDK version required for Aspire.
2121
/// </summary>
22-
publicconststringMinimumSdkVersion="10.0.100-rc.2.25502.107";
22+
publicconststringMinimumSdkVersion="10.0.100";
2323

2424
/// <inheritdoc />
2525
publicasyncTask<(boolSuccess,string?HighestVersion,stringMinimumRequiredVersion,boolForceInstall)>CheckAsync(CancellationTokencancellationToken=default)
@@ -406,10 +406,10 @@ public string GetEffectiveMinimumSdkVersion()
406406
/// <returns>True if the installed version meets the requirement.</returns>
407407
privatestaticboolMeetsMinimumRequirement(SemVersioninstalledVersion,SemVersionrequiredVersion,stringrequiredVersionString)
408408
{
409-
// Special handling for .NET 10RC requirement - allow any .NET 10.x version
409+
// Special handling for .NET 10RTM requirement - allow any .NET 10.x version
410410
if(requiredVersionString==MinimumSdkVersion)
411411
{
412-
// If we require 10.0.100-rc.2.25502.107, accept any version that is >= 10.0.0
412+
// If we require 10.0.100, accept any version that is >= 10.0.0
413413
returninstalledVersion.Major>=10;
414414
}
415415

‎tests/Aspire.Cli.Tests/DotNetSdkInstallerTests.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -269,19 +269,19 @@ public void ErrorMessage_Format_IsCorrect()
269269
// Test the error message format with placeholders
270270
varmessage=string.Format(CultureInfo.InvariantCulture,
271271
ErrorStrings.ResourceManager.GetString("MinimumSdkVersionNotMet",CultureInfo.GetCultureInfo("en-US"))!,
272-
"10.0.100-rc.2.25502.107",
272+
"10.0.100",
273273
"(not found)");
274274

275-
Assert.Equal("The Aspire CLI requires .NET SDK version 10.0.100-rc.2.25502.107 or later. Detected: (not found).",message);
275+
Assert.Equal("The Aspire CLI requires .NET SDK version 10.0.100 or later. Detected: (not found).",message);
276276
}
277277

278278
[Fact]
279279
publicvoidMeetsMinimumRequirement_AllowsDotNet10Prereleases()
280280
{
281281
// Test the logic we added for allowing .NET 10 prereleases
282282
varinstalledVersion=SemVersion.Parse("10.0.100-preview.1.25463.5",SemVersionStyles.Strict);
283-
varrequiredVersion=SemVersion.Parse("10.0.100-rc.2.25502.107",SemVersionStyles.Strict);
284-
varrequiredVersionString="10.0.100-rc.2.25502.107";
283+
varrequiredVersion=SemVersion.Parse("10.0.100",SemVersionStyles.Strict);
284+
varrequiredVersionString="10.0.100";
285285

286286
// Use reflection to access the private method
287287
varmethod=typeof(DotNetSdkInstaller).GetMethod("MeetsMinimumRequirement",
@@ -296,8 +296,8 @@ public void MeetsMinimumRequirement_AllowsDotNet10LatestPrerelease()
296296
{
297297
// Test with a more recent .NET 10 prerelease
298298
varinstalledVersion=SemVersion.Parse("10.1.0-preview.2.25999.99",SemVersionStyles.Strict);
299-
varrequiredVersion=SemVersion.Parse("10.0.100-rc.2.25502.107",SemVersionStyles.Strict);
300-
varrequiredVersionString="10.0.100-rc.2.25502.107";
299+
varrequiredVersion=SemVersion.Parse("10.0.100",SemVersionStyles.Strict);
300+
varrequiredVersionString="10.0.100";
301301

302302
// Use reflection to access the private method
303303
varmethod=typeof(DotNetSdkInstaller).GetMethod("MeetsMinimumRequirement",
@@ -312,8 +312,8 @@ public void MeetsMinimumRequirement_RejectsDotNet9()
312312
{
313313
// Test that .NET 9 is rejected
314314
varinstalledVersion=SemVersion.Parse("9.0.999",SemVersionStyles.Strict);
315-
varrequiredVersion=SemVersion.Parse("10.0.100-rc.2.25502.107",SemVersionStyles.Strict);
316-
varrequiredVersionString="10.0.100-rc.2.25502.107";
315+
varrequiredVersion=SemVersion.Parse("10.0.100",SemVersionStyles.Strict);
316+
varrequiredVersionString="10.0.100";
317317

318318
// Use reflection to access the private method
319319
varmethod=typeof(DotNetSdkInstaller).GetMethod("MeetsMinimumRequirement",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp