Skip to content

Commit adf59be

Browse files
author
Mirroring
committed
Merge commit '4d0ab0c95e3e832ebc48d24c2dfca99f16702066'
2 parents fecd1e0 + 4d0ab0c commit adf59be

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

NuGet.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@
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-50c4cb9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-50c4cb9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f-2/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-50c4cb9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f-1/nuget/v3/index.json" />
911
<!-- End: Package sources from dotnet-runtime -->
1012
<!-- Begin: Package sources from dotnet-winforms -->
1113
<add key="darc-int-dotnet-winforms-2c14c37" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-2c14c37b/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-winforms-2c14c37-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-2c14c37b-2/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-winforms-2c14c37-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-2c14c37b-1/nuget/v3/index.json" />
1216
<!-- End: Package sources from dotnet-winforms -->
1317
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1418
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,9 +26,13 @@
2226
<disabledPackageSources>
2327
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2428
<!-- Begin: Package sources from dotnet-runtime -->
29+
<add key="darc-int-dotnet-runtime-50c4cb9-1" value="true" />
30+
<add key="darc-int-dotnet-runtime-50c4cb9-2" value="true" />
2531
<add key="darc-int-dotnet-runtime-50c4cb9" value="true" />
2632
<!-- End: Package sources from dotnet-runtime -->
2733
<!-- Begin: Package sources from dotnet-winforms -->
34+
<add key="darc-int-dotnet-winforms-2c14c37-1" value="true" />
35+
<add key="darc-int-dotnet-winforms-2c14c37-2" value="true" />
2836
<add key="darc-int-dotnet-winforms-2c14c37" value="true" />
2937
<!-- End: Package sources from dotnet-winforms -->
3038
<!--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
@@ -156,25 +156,25 @@
156156
</Dependency>
157157
</ProductDependencies>
158158
<ToolsetDependencies>
159-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25164.5">
159+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
161+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25164.5">
163+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25208.7">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
165+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25164.5">
167+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25208.7">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
169+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.25164.5">
171+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.25208.7">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
173+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25164.5">
175+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25208.7">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
177+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
178178
</Dependency>
179179
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
180180
<Uri>https://github.com/dotnet/sourcelink</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
</PropertyGroup>
5050
<!-- Packages that come from https://github.com/dotnet/arcade -->
5151
<PropertyGroup>
52-
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.25164.5</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.25164.5</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.25208.7</MicrosoftDotNetApiCompatVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.25208.7</MicrosoftDotNetCodeAnalysisPackageVersion>
5454
</PropertyGroup>
5555
<!-- Sourcelink -->
5656
<PropertyGroup>

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": "8.0.114",
3+
"dotnet": "8.0.115",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5",
16-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5"
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7"
1717
},
1818
"sdk": {
19-
"version": "8.0.114"
19+
"version": "8.0.115"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)