Skip to content

Commit 8a4af1b

Browse files
dotnet-maestro[bot]wiktork
dotnet-maestro[bot]
and
wiktork
authored
[release/10.0] Update dependencies from dotnet/dotnet (#8618)
* Update dependencies from https://github.com/dotnet/dotnet build 20250929.3 On relative base path root Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 From Version 10.0.0-rc.1.25451.107 -> To Version 10.0.0-rc.2.25479.103 Microsoft.CodeAnalysis.NetAnalyzers , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 From Version 10.0.100-rc.1.25451.107 -> To Version 10.0.100-rc.2.25479.103 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25451.107 -> To Version 10.0.0-beta.25479.103 System.CommandLine From Version 2.0.0-rc.1.25451.107 -> To Version 2.0.0-rc.2.25479.103 * Fix build issues --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Wiktor Kopec <wiktork@microsoft.com>
1 parent c4990a0 commit 8a4af1b

10 files changed

Lines changed: 64 additions & 56 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-rc.1.25451.107">
3+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-rc.2.25479.103">
44
<Uri>https://github.com/dotnet/dotnet</Uri>
5-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
5+
<Sha>bf3a274512724bac1d384fe52f43e7b57f78787d</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.637302">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
@@ -12,55 +12,55 @@
1212
<Uri>https://github.com/dotnet/diagnostics</Uri>
1313
<Sha>eab990eafdd479265f78855d72e6afa3ee0813c7</Sha>
1414
</Dependency>
15-
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25451.107">
15+
<Dependency Name="System.CommandLine" Version="2.0.0-rc.2.25479.103">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
17+
<Sha>bf3a274512724bac1d384fe52f43e7b57f78787d</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
21-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100-rc.1.25451.107">
21+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100-rc.2.25479.103">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
23+
<Sha>bf3a274512724bac1d384fe52f43e7b57f78787d</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25451.107">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25479.103">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
27+
<Sha>bf3a274512724bac1d384fe52f43e7b57f78787d</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25451.107">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25479.103">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
31+
<Sha>bf3a274512724bac1d384fe52f43e7b57f78787d</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25451.107">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25479.103">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
35+
<Sha>bf3a274512724bac1d384fe52f43e7b57f78787d</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25451.107">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25479.103">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
39+
<Sha>bf3a274512724bac1d384fe52f43e7b57f78787d</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25451.107">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25479.103">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
43+
<Sha>bf3a274512724bac1d384fe52f43e7b57f78787d</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.FileFormats" Version="1.0.637302">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
4747
<Sha>eab990eafdd479265f78855d72e6afa3ee0813c7</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-rc.1.25451.107">
49+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-rc.2.25479.103">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
51+
<Sha>bf3a274512724bac1d384fe52f43e7b57f78787d</Sha>
5252
</Dependency>
53-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.1.25451.107">
53+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.2.25479.103">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
55+
<Sha>bf3a274512724bac1d384fe52f43e7b57f78787d</Sha>
5656
</Dependency>
57-
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-rc.1.25451.107">
57+
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-rc.2.25479.103">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
59+
<Sha>bf3a274512724bac1d384fe52f43e7b57f78787d</Sha>
6060
</Dependency>
61-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.1.25451.107">
61+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.2.25479.103">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
63+
<Sha>bf3a274512724bac1d384fe52f43e7b57f78787d</Sha>
6464
</Dependency>
6565
</ToolsetDependencies>
6666
</Dependencies>

‎eng/Versions.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@
5454
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.637302</MicrosoftDiagnosticsMonitoringEventPipeVersion>
5555
<MicrosoftFileFormatsVersion>1.0.637302</MicrosoftFileFormatsVersion>
5656
<!-- dotnet/dotnet references -->
57-
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-rc.1.25451.107</MicrosoftAspNetCoreAppRuntimewinx64Version>
58-
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.100-rc.1.25451.107</MicrosoftCodeAnalysisNetAnalyzersVersion>
59-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25451.107</MicrosoftDotNetBuildTasksArchivesVersion>
60-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25451.107</MicrosoftDotNetCodeAnalysisVersion>
61-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25451.107</MicrosoftDotNetXUnitExtensionsVersion>
62-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-rc.1.25451.107</MicrosoftNETCoreAppRuntimewinx64Version>
63-
<SystemCommandLineVersion>2.0.0-rc.1.25451.107</SystemCommandLineVersion>
64-
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-rc.1.25451.107</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
65-
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-rc.1.25451.107</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
66-
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-rc.1.25451.107</VSRedistCommonNetCoreSharedFrameworkx64100Version>
57+
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-rc.2.25479.103</MicrosoftAspNetCoreAppRuntimewinx64Version>
58+
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.100-rc.2.25479.103</MicrosoftCodeAnalysisNetAnalyzersVersion>
59+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25479.103</MicrosoftDotNetBuildTasksArchivesVersion>
60+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25479.103</MicrosoftDotNetCodeAnalysisVersion>
61+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25479.103</MicrosoftDotNetXUnitExtensionsVersion>
62+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-rc.2.25479.103</MicrosoftNETCoreAppRuntimewinx64Version>
63+
<SystemCommandLineVersion>2.0.0-rc.2.25479.103</SystemCommandLineVersion>
64+
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-rc.2.25479.103</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
65+
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-rc.2.25479.103</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
66+
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-rc.2.25479.103</VSRedistCommonNetCoreSharedFrameworkx64100Version>
6767
</PropertyGroup>
6868
<PropertyGroup Label="Runtime Versions">
6969
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
157157
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
158158
}
159159

160-
$dotnetVersions = @('5','6','7','8','9')
160+
$dotnetVersions = @('5','6','7','8','9','10')
161161

162162
foreach ($dotnetVersion in $dotnetVersions) {
163163
$feedPrefix = "dotnet" + $dotnetVersion;

‎eng/common/SetupNugetSources.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
9999
PackageSources+=('dotnet3.1-internal-transport')
100100
fi
101101

102-
DotNetVersions=('5' '6' '7' '8' '9')
102+
DotNetVersions=('5' '6' '7' '8' '9' '10')
103103

104104
for DotNetVersion in ${DotNetVersions[@]} ; do
105105
FeedPrefix="dotnet${DotNetVersion}";

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ parameters:
4040

4141
repositoryAlias: self
4242

43+
officialBuildId: ''
44+
4345
jobs:
4446
- job: Asset_Registry_Publish
4547

@@ -62,6 +64,11 @@ jobs:
6264
value: false
6365
# unconditional - needed for logs publishing (redactor tool version)
6466
- template: /eng/common/core-templates/post-build/common-variables.yml
67+
- name: OfficialBuildId
68+
${{ if ne(parameters.officialBuildId, '') }}:
69+
value: ${{ parameters.officialBuildId }}
70+
${{ else }}:
71+
value: $(Build.BuildNumber)
6572

6673
pool:
6774
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -124,7 +131,7 @@ jobs:
124131
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
125132
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
126133
/p:MaestroApiEndpoint=https://maestro.dot.net
127-
/p:OfficialBuildId=$(Build.BuildNumber)
134+
/p:OfficialBuildId=$(OfficialBuildId)
128135
condition: ${{ parameters.condition }}
129136
continueOnError: ${{ parameters.continueOnError }}
130137

‎eng/common/core-templates/jobs/jobs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ parameters:
4444
artifacts: {}
4545
is1ESPipeline: ''
4646
repositoryAlias: self
47+
officialBuildId: ''
4748

4849
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4950
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -116,3 +117,4 @@ jobs:
116117
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
117118
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
118119
repositoryAlias: ${{ parameters.repositoryAlias }}
120+
officialBuildId: ${{ parameters.officialBuildId }}

‎eng/common/sdk-task.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ show_usage() {
1010

1111
echo "Advanced settings:"
1212
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
13-
echo " --noWarnAsError Do not warn as error
13+
echo " --noWarnAsError Do not warn as error"
1414
echo ""
1515
echo "Command line arguments not listed above are passed thru to msbuild."
1616
}

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-preview.7.25372.107",
3+
"dotnet": "10.0.100-rc.1.25451.107",
44
"runtimes": {
55
"aspnetcore": [
66
"$(MicrosoftAspNetCoreApp80Version)",
@@ -26,7 +26,7 @@
2626
},
2727
"msbuild-sdks": {
2828
"Microsoft.Build.NoTargets": "3.7.0",
29-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25451.107",
30-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25451.107"
29+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.103",
30+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25479.103"
3131
}
3232
}

‎src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/ScenarioHelpers.cs‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Microsoft.Extensions.DependencyInjection;
99
using Microsoft.Extensions.DependencyInjection.Extensions;
1010
using Microsoft.Extensions.Logging;
11+
using Microsoft.Extensions.Hosting;
1112
using System;
1213
using System.Collections.Concurrent;
1314
using System.Collections.Generic;
@@ -76,20 +77,21 @@ public static async Task<int> RunWebScenarioAsync<TStartup>(Func<ILogger, Task<i
7677
// - Doesn't write logs to stdout (since the unit test app uses this for execution control)
7778
// - Allows ASP.NET events via DiagnosticsSourceEventSource (enabled via adding a logger
7879
// and the ASP.NET hosting category).
79-
// - Uses WebHostBuilder to support hosting startup assemblies.
80-
IWebHost host = new WebHostBuilder()
81-
.ConfigureServices(services =>
80+
IHost host = new HostBuilder()
81+
.ConfigureWebHost(webBuilder =>
8282
{
83-
configureServices?.Invoke(services);
84-
85-
services.AddLogging(builder =>
83+
webBuilder.ConfigureServices(services =>
8684
{
87-
builder.AddEventSourceLogger();
88-
builder.AddFilter("Microsoft.AspNetCore.Hosting", LogLevel.Information);
85+
configureServices?.Invoke(services);
86+
services.AddLogging(builder =>
87+
{
88+
builder.AddEventSourceLogger();
89+
builder.AddFilter("Microsoft.AspNetCore.Hosting", LogLevel.Information);
90+
});
8991
});
92+
webBuilder.UseKestrel();
93+
webBuilder.UseStartup<TStartup>();
9094
})
91-
.UseKestrel()
92-
.UseStartup<TStartup>()
9395
.Build();
9496

9597
int exitCode;

‎src/Tools/dotnet-monitor/Commands/CollectCommandHandler.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,8 @@ private static IHostBuilder Configure(this IHostBuilder builder, StartupAuthenti
165165
ServerUrlsBlockingConfigurationManager? manager =
166166
context.Properties[typeof(ServerUrlsBlockingConfigurationManager)] as ServerUrlsBlockingConfigurationManager;
167167
Debug.Assert(null != manager, $"Expected {typeof(ServerUrlsBlockingConfigurationManager).FullName} to be a {typeof(HostBuilderContext).FullName} property.");
168-
if (null != manager)
169-
{
170-
// Block reading of the Urls option so that Kestrel is unable to read it from the composed configuration.
171-
manager.IsBlocking = true;
172-
}
168+
// Block reading of the Urls option so that Kestrel is unable to read it from the composed configuration.
169+
manager?.IsBlocking = true;
173170
});
174171
}
175172

0 commit comments

Comments
 (0)