Skip to content

Commit 1b9be43

Browse files
wiktorkwiktork
authored
Merge pull request #7992 from wiktork/dev/wiktork/merge91
Merge main to release/9.x
2 parents ba13574 + 401f362 commit 1b9be43

File tree

3 files changed

+13
-37
lines changed

3 files changed

+13
-37
lines changed

Diff for: ‎NuGet.config

-24
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,8 @@
1010
<clear />
1111
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1212
<!-- Begin: Package sources from dotnet-aspnetcore -->
13-
<add key="darc-int-dotnet-aspnetcore-4442a18" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4442a188/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-aspnetcore-4442a18-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4442a188-8/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-aspnetcore-4442a18-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4442a188-7/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-aspnetcore-4442a18-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4442a188-6/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-aspnetcore-4442a18-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4442a188-5/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-aspnetcore-4442a18-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4442a188-4/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-aspnetcore-4442a18-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4442a188-3/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-aspnetcore-4442a18-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4442a188-2/nuget/v3/index.json" />
21-
<add key="darc-int-dotnet-aspnetcore-4442a18-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4442a188-1/nuget/v3/index.json" />
2213
<!-- End: Package sources from dotnet-aspnetcore -->
2314
<!-- Begin: Package sources from dotnet-runtime -->
24-
<add key="darc-int-dotnet-runtime-c8acea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22/nuget/v3/index.json" />
25-
<add key="darc-int-dotnet-runtime-c8acea2-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-8/nuget/v3/index.json" />
26-
<add key="darc-int-dotnet-runtime-c8acea2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-3/nuget/v3/index.json" />
2715
<!-- End: Package sources from dotnet-runtime -->
2816
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2917
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
@@ -42,20 +30,8 @@
4230
<clear />
4331
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4432
<!-- Begin: Package sources from dotnet-aspnetcore -->
45-
<add key="darc-int-dotnet-aspnetcore-4442a18-1" value="true" />
46-
<add key="darc-int-dotnet-aspnetcore-4442a18-2" value="true" />
47-
<add key="darc-int-dotnet-aspnetcore-4442a18-3" value="true" />
48-
<add key="darc-int-dotnet-aspnetcore-4442a18-4" value="true" />
49-
<add key="darc-int-dotnet-aspnetcore-4442a18-5" value="true" />
50-
<add key="darc-int-dotnet-aspnetcore-4442a18-6" value="true" />
51-
<add key="darc-int-dotnet-aspnetcore-4442a18-7" value="true" />
52-
<add key="darc-int-dotnet-aspnetcore-4442a18-8" value="true" />
53-
<add key="darc-int-dotnet-aspnetcore-4442a18" value="true" />
5433
<!-- End: Package sources from dotnet-aspnetcore -->
5534
<!-- Begin: Package sources from dotnet-runtime -->
56-
<add key="darc-int-dotnet-runtime-c8acea2-3" value="true" />
57-
<add key="darc-int-dotnet-runtime-c8acea2-8" value="true" />
58-
<add key="darc-int-dotnet-runtime-c8acea2" value="true" />
5935
<!-- End: Package sources from dotnet-runtime -->
6036
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6137
</disabledPackageSources>

Diff for: ‎eng/Version.Details.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
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.25121.1">
7+
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25154.1">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
9-
<Sha>6626d0ac5d10532ef9c0939b4b65c7381715340a</Sha>
9+
<Sha>1b1ef2e76ce8c2dc3aa261e8037d3a11e27a39bd</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25121.1">
11+
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25154.1">
1212
<Uri>https://github.com/dotnet/diagnostics</Uri>
13-
<Sha>6626d0ac5d10532ef9c0939b4b65c7381715340a</Sha>
13+
<Sha>1b1ef2e76ce8c2dc3aa261e8037d3a11e27a39bd</Sha>
1414
</Dependency>
15-
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.25072.1">
15+
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.25153.1">
1616
<Uri>https://github.com/dotnet/command-line-api</Uri>
17-
<Sha>060374e56c1b2e741b6525ca8417006efb54fbd7</Sha>
17+
<Sha>b7f0d1c4f0da129f7a115e32b21f0b773e60805b</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
@@ -42,9 +42,9 @@
4242
<Uri>https://github.com/dotnet/arcade</Uri>
4343
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.FileFormats" Version="1.0.612101">
45+
<Dependency Name="Microsoft.FileFormats" Version="1.0.615401">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
47-
<Sha>6626d0ac5d10532ef9c0939b4b65c7381715340a</Sha>
47+
<Sha>1b1ef2e76ce8c2dc3aa261e8037d3a11e27a39bd</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>

Diff for: ‎eng/Versions.props

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup Label="Versioning">
55
<RepositoryUrl>https://github.com/dotnet/dotnet-monitor</RepositoryUrl>
66
<VersionPrefix>9.1.0</VersionPrefix>
7-
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
7+
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
88
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
99
<!-- Disable final version kind until merged into release branch. -->
1010
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
@@ -55,10 +55,10 @@
5555
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.1</MicrosoftAspNetCoreAppRuntimewinx64Version>
5656
<VSRedistCommonAspNetCoreSharedFrameworkx6490Version>9.0.1-rtm.24610.9</VSRedistCommonAspNetCoreSharedFrameworkx6490Version>
5757
<!-- dotnet/command-line-api references -->
58-
<SystemCommandLineVersion>2.0.0-beta4.25072.1</SystemCommandLineVersion>
58+
<SystemCommandLineVersion>2.0.0-beta4.25153.1</SystemCommandLineVersion>
5959
<!-- dotnet/diagnostics references -->
60-
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25121.1</MicrosoftDiagnosticsMonitoringVersion>
61-
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25121.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
60+
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25154.1</MicrosoftDiagnosticsMonitoringVersion>
61+
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25154.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.612101</MicrosoftFileFormatsVersion>
70+
<MicrosoftFileFormatsVersion>1.0.615401</MicrosoftFileFormatsVersion>
7171
</PropertyGroup>
7272
<PropertyGroup Label="Runtime Versions">
7373
<MicrosoftAspNetCoreApp31Version>$(MicrosoftNETCoreApp31Version)</MicrosoftAspNetCoreApp31Version>

0 commit comments

Comments
 (0)