Skip to content

Commit 5bc2e93

Browse files
jander-msftjander-msft
authored
Merge main to feature/9.x (#8206)
2 parents 26b00ba + 7b960f6 commit 5bc2e93

File tree

9 files changed

+51
-34
lines changed

9 files changed

+51
-34
lines changed

‎.github/dependabot.template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#! target branch and which major version of .NET Monitor it builds.
1818
#@ def getBranches():
1919
#@ return [
20-
#@ struct.encode({"name": "main", "majorVersion": "8"}),
20+
#@ struct.encode({"name": "main", "majorVersion": "9"}),
2121
#@ struct.encode({"name": "release/9.0", "majorVersion": "9"}),
2222
#@ struct.encode({"name": "release/8.x", "majorVersion": "8"}),
2323
#@ ]

‎.github/dependabot.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,23 @@ updates:
3434
target-branch: main
3535
commit-message:
3636
prefix: '[main] '
37+
- package-ecosystem: nuget
38+
directory: /eng/dependabot/net9.0
39+
schedule:
40+
interval: daily
41+
target-branch: main
42+
ignore:
43+
- dependency-name: '*'
44+
update-types:
45+
- version-update:semver-major
46+
commit-message:
47+
prefix: '[main] '
48+
groups:
49+
runtime-dependencies:
50+
patterns:
51+
- Microsoft.Extensions.*
52+
- Microsoft.NETCore.DotNetHost
53+
- System.Text.Json
3754
- package-ecosystem: nuget
3855
directory: /eng/dependabot/net8.0
3956
schedule:

‎.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions: {}
88
jobs:
99
backport:
1010
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/backport to') && contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association)
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-24.04
1212
permissions:
1313
contents: write
1414
issues: write

‎eng/Version.Details.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
55
<Sha>4442a188f9200a57635373dcd640893c0e8dcc78</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25255.1">
7+
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25256.1">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
9-
<Sha>8a951ade8ae70e5fc47345958cf716cc8e9cffe5</Sha>
9+
<Sha>aebf15d23e5a25ab718e780a29d8aca9a5280425</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25255.1">
11+
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25256.1">
1212
<Uri>https://github.com/dotnet/diagnostics</Uri>
13-
<Sha>8a951ade8ae70e5fc47345958cf716cc8e9cffe5</Sha>
13+
<Sha>aebf15d23e5a25ab718e780a29d8aca9a5280425</Sha>
1414
</Dependency>
1515
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25256.1">
1616
<Uri>https://github.com/dotnet/command-line-api</Uri>
@@ -22,29 +22,29 @@
2222
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
2323
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25255.3">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25255.5">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
27+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25255.3">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25255.5">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
31+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25255.3">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25255.5">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
35+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25255.3">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25255.5">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
39+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25255.3">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25255.5">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
43+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.FileFormats" Version="1.0.625501">
45+
<Dependency Name="Microsoft.FileFormats" Version="1.0.625601">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
47-
<Sha>8a951ade8ae70e5fc47345958cf716cc8e9cffe5</Sha>
47+
<Sha>aebf15d23e5a25ab718e780a29d8aca9a5280425</Sha>
4848
</Dependency>
4949
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.1" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
5050
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@
4848
-->
4949
<PropertyGroup Label="Automated">
5050
<!-- dotnet/arcade references -->
51-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25255.3</MicrosoftDotNetBuildTasksArchivesVersion>
52-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25255.3</MicrosoftDotNetCodeAnalysisVersion>
53-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25255.3</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25255.5</MicrosoftDotNetBuildTasksArchivesVersion>
52+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25255.5</MicrosoftDotNetCodeAnalysisVersion>
53+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25255.5</MicrosoftDotNetXUnitExtensionsVersion>
5454
<!-- dotnet/aspnetcore references -->
5555
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.1</MicrosoftAspNetCoreAppRuntimewinx64Version>
5656
<VSRedistCommonAspNetCoreSharedFrameworkx6490Version>9.0.1-rtm.24610.9</VSRedistCommonAspNetCoreSharedFrameworkx6490Version>
5757
<!-- dotnet/command-line-api references -->
5858
<SystemCommandLineVersion>2.0.0-beta5.25256.1</SystemCommandLineVersion>
5959
<!-- dotnet/diagnostics references -->
60-
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25255.1</MicrosoftDiagnosticsMonitoringVersion>
61-
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25255.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
60+
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25256.1</MicrosoftDiagnosticsMonitoringVersion>
61+
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25256.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
6262
<!-- dotnet/roslyn-analyzers -->
6363
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25076.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
6464
<!-- dotnet/runtime references -->
@@ -67,7 +67,7 @@
6767
<!-- dotnet/sdk references -->
6868
<VSRedistCommonNetCoreSdkPlaceholderx6490Version>9.0.200-rtm.25073.13</VSRedistCommonNetCoreSdkPlaceholderx6490Version>
6969
<!-- dotnet/symstore references -->
70-
<MicrosoftFileFormatsVersion>1.0.625501</MicrosoftFileFormatsVersion>
70+
<MicrosoftFileFormatsVersion>1.0.625601</MicrosoftFileFormatsVersion>
7171
</PropertyGroup>
7272
<PropertyGroup Label="Runtime Versions">
7373
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>

‎eng/dependabot/independent/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Import references updated by Dependabot. -->
33

44
<PropertyGroup>
5-
<AzureCoreVersion>1.45.0</AzureCoreVersion>
5+
<AzureCoreVersion>1.46.0</AzureCoreVersion>
66
<AzureIdentityVersion>1.13.2</AzureIdentityVersion>
77
<AzureStorageBlobsVersion>12.24.0</AzureStorageBlobsVersion>
88
<AzureStorageQueuesVersion>12.22.0</AzureStorageQueuesVersion>

‎eng/dependabot/net9.0/Versions.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<!-- Import references updated by Dependabot. -->
33
<PropertyGroup>
44
<!-- Microsoft.Extensions.Configuration.Abstractions -->
5-
<MicrosoftExtensionsConfigurationAbstractions90Version>9.0.1</MicrosoftExtensionsConfigurationAbstractions90Version>
5+
<MicrosoftExtensionsConfigurationAbstractions90Version>9.0.4</MicrosoftExtensionsConfigurationAbstractions90Version>
66
<!-- Microsoft.Extensions.Logging -->
7-
<MicrosoftExtensionsLogging90Version>9.0.1</MicrosoftExtensionsLogging90Version>
7+
<MicrosoftExtensionsLogging90Version>9.0.4</MicrosoftExtensionsLogging90Version>
88
<!-- Microsoft.Extensions.Logging.Abstractions -->
9-
<MicrosoftExtensionsLoggingAbstractions90Version>9.0.1</MicrosoftExtensionsLoggingAbstractions90Version>
9+
<MicrosoftExtensionsLoggingAbstractions90Version>9.0.4</MicrosoftExtensionsLoggingAbstractions90Version>
1010
<!-- Microsoft.Extensions.Logging.Console -->
11-
<MicrosoftExtensionsLoggingConsole90Version>9.0.1</MicrosoftExtensionsLoggingConsole90Version>
11+
<MicrosoftExtensionsLoggingConsole90Version>9.0.4</MicrosoftExtensionsLoggingConsole90Version>
1212
<!-- Microsoft.NETCore.App -->
13-
<MicrosoftNETCoreApp90Version>9.0.1</MicrosoftNETCoreApp90Version>
13+
<MicrosoftNETCoreApp90Version>9.0.4</MicrosoftNETCoreApp90Version>
1414
<!-- System.Text.Json -->
15-
<SystemTextJson90Version>9.0.0</SystemTextJson90Version>
15+
<SystemTextJson90Version>9.0.4</SystemTextJson90Version>
1616
</PropertyGroup>
1717
</Project>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"msbuild-sdks": {
2424
"Microsoft.Build.NoTargets": "3.7.0",
25-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.3",
26-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25255.3"
25+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5",
26+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25255.5"
2727
}
2828
}

‎src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private static async Task<OpenApiDocument> GetOpenApiDocument(IHost host)
6969
var documentService = GetDocumentService(host.Services);
7070
var methodInfo = documentService.GetType().GetMethod("GetOpenApiDocumentAsync", BindingFlags.Public | BindingFlags.Instance)!;
7171

72-
object result = methodInfo.Invoke(documentService, new object?[] { host.Services, default(CancellationToken) })!;
72+
object result = methodInfo.Invoke(documentService, new object?[] { host.Services, null, default(CancellationToken) })!;
7373

7474
return await (Task<OpenApiDocument>)result;
7575
}

0 commit comments

Comments
 (0)