Skip to content

Commit b2db427

Browse files
author
Mirroring
committed
Merge commit '2cb2db810bd748aab04e963491c1aa8f308de135'
2 parents b40c1ca + 2cb2db8 commit b2db427

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

‎NuGet.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
88
<add key="darc-int-dotnet-runtime-e77011b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-e77011b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-5/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-e77011b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-3/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-runtime-e77011b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-2/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-e77011b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-1/nuget/v3/index.json" />
913
<!-- End: Package sources from dotnet-runtime -->
1014
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1115
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -19,6 +23,10 @@
1923
<disabledPackageSources>
2024
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2125
<!-- Begin: Package sources from dotnet-runtime -->
26+
<add key="darc-int-dotnet-runtime-e77011b-1" value="true" />
27+
<add key="darc-int-dotnet-runtime-e77011b-2" value="true" />
28+
<add key="darc-int-dotnet-runtime-e77011b-3" value="true" />
29+
<add key="darc-int-dotnet-runtime-e77011b-5" value="true" />
2230
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
2331
<!-- End: Package sources from dotnet-runtime -->
2432
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,25 +83,25 @@
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24326.2">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24360.7">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>1844d819e6f33f1106083c5066ea01e0310eefa3</Sha>
88+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24326.2">
90+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24360.7">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>1844d819e6f33f1106083c5066ea01e0310eefa3</Sha>
92+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24326.2">
94+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24360.7">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>1844d819e6f33f1106083c5066ea01e0310eefa3</Sha>
96+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24326.2">
98+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24360.7">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>1844d819e6f33f1106083c5066ea01e0310eefa3</Sha>
100+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24326.2">
102+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24360.7">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>1844d819e6f33f1106083c5066ea01e0310eefa3</Sha>
104+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
105105
</Dependency>
106106
</ToolsetDependencies>
107107
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Packages that come from https://github.com/dotnet/arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24326.2</MicrosoftDotNetApiCompatVersion>
60-
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.24326.2</MicrosoftDotNetCodeAnalysisPackageVersion>
61-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24326.2</MicrosoftDotNetGenAPIVersion>
59+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24360.7</MicrosoftDotNetApiCompatVersion>
60+
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.24360.7</MicrosoftDotNetCodeAnalysisPackageVersion>
61+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24360.7</MicrosoftDotNetGenAPIVersion>
6262
</PropertyGroup>
6363
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
6464
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.130",
3+
"dotnet": "6.0.132",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24326.2",
16-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24326.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24360.7",
16+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24360.7"
1717
},
1818
"sdk": {
19-
"version": "6.0.130"
19+
"version": "6.0.132"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)