Skip to content

Commit 4a71931

Browse files
author
Mirroring
committed
Merge commit '27ff859407b4286ca0408891c82c752e006f2baf'
2 parents 693e8fd + 27ff859 commit 4a71931

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

NuGet.config

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
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-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-b357f86-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c-2/nuget/v3/index.json" />
910
<!-- End: Package sources from dotnet-runtime -->
1011
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1112
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -19,6 +20,7 @@
1920
<disabledPackageSources>
2021
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2122
<!-- Begin: Package sources from dotnet-runtime -->
23+
<add key="darc-int-dotnet-runtime-b357f86-2" value="true" />
2224
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
2325
<!-- End: Package sources from dotnet-runtime -->
2426
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

eng/Version.Details.xml

+10-10
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.24459.5">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24508.2">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
88+
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24459.5">
90+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24508.2">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
92+
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24459.5">
94+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24508.2">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
96+
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24459.5">
98+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24508.2">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
100+
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24459.5">
102+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24508.2">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
104+
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
105105
</Dependency>
106106
</ToolsetDependencies>
107107
</Dependencies>

eng/Versions.props

+3-3
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.24459.5</MicrosoftDotNetApiCompatVersion>
60-
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.24459.5</MicrosoftDotNetCodeAnalysisPackageVersion>
61-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24459.5</MicrosoftDotNetGenAPIVersion>
59+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24508.2</MicrosoftDotNetApiCompatVersion>
60+
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.24508.2</MicrosoftDotNetCodeAnalysisPackageVersion>
61+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24508.2</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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.133",
3+
"dotnet": "6.0.135",
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.24459.5",
16-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24459.5"
15+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24508.2",
16+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24508.2"
1717
},
1818
"sdk": {
19-
"version": "6.0.133"
19+
"version": "6.0.135"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)