Skip to content

Commit 7e9ff48

Browse files
authored
Merge pull request #30481 from vseanreesermsft/internal-merge-6.0-2023-03-14-1017
Merging internal commits for release/6.0
2 parents e939f63 + 234770b commit 7e9ff48

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7+
<add key="darc-int-dotnet-runtime-5edef4b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5edef4b2/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-runtime -->
89
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
910
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -18,6 +19,7 @@
1819
<clear />
1920
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2021
<!-- Begin: Package sources from dotnet-runtime -->
22+
<add key="darc-int-dotnet-runtime-5edef4b" value="true" />
2123
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2224
<add key="darc-int-dotnet-runtime-cd08c36" value="true" />
2325
<add key="darc-int-dotnet-runtime-cb5f173" value="true" />

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
<Uri>https://github.com/dotnet/runtime</Uri>
4242
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
4343
</Dependency>
44-
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0">
45-
<Uri>https://github.com/dotnet/runtime</Uri>
46-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
44+
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.1">
45+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
46+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
4747
</Dependency>
4848
</ProductDependencies>
4949
<ToolsetDependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616
<PropertyGroup Label="Dependencies from dotnet/runtime">
1717
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
18-
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion>
18+
<SystemDiagnosticsDiagnosticSourceVersion>6.0.1</SystemDiagnosticsDiagnosticSourceVersion>
1919
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
2020
<MicrosoftExtensionsConfigurationVersion>6.0.1</MicrosoftExtensionsConfigurationVersion>
2121
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.114",
3+
"dotnet": "6.0.115",
44
"runtimes": {
55
"dotnet": [
66
"3.1.32",
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
"sdk": {
16-
"version": "6.0.114",
16+
"version": "6.0.115",
1717
"allowPrerelease": true,
1818
"rollForward": "latestMajor"
1919
},

0 commit comments

Comments
 (0)