Skip to content

Commit 480ddbb

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 50976: [internal/release/8.0] merge public commits
2 parents c8ef90c + 7976776 commit 480ddbb

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
@@ -13,6 +13,10 @@
1313
<!-- End: Package sources from dotnet-runtime -->
1414
<!-- Begin: Package sources from dotnet-winforms -->
1515
<add key="darc-int-dotnet-winforms-92d43c6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-92d43c65/nuget/v3/index.json" />
16+
<add key="darc-int-dotnet-winforms-f3291ac" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f3291ace/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-winforms-f3291ac-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f3291ace-3/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-winforms-f3291ac-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f3291ace-2/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-winforms-f3291ac-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f3291ace-1/nuget/v3/index.json" />
1620
<!-- End: Package sources from dotnet-winforms -->
1721
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1822
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -34,6 +38,10 @@
3438
<!-- End: Package sources from dotnet-runtime -->
3539
<!-- Begin: Package sources from dotnet-winforms -->
3640
<add key="darc-int-dotnet-winforms-92d43c6" value="true" />
41+
<add key="darc-int-dotnet-winforms-f3291ac-1" value="true" />
42+
<add key="darc-int-dotnet-winforms-f3291ac-2" value="true" />
43+
<add key="darc-int-dotnet-winforms-f3291ac-3" value="true" />
44+
<add key="darc-int-dotnet-winforms-f3291ac" value="true" />
3745
<!-- End: Package sources from dotnet-winforms -->
3846
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3947
</disabledPackageSources>

‎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.25263.4">
159+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25310.3">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
161+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25263.4">
163+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25310.3">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
165+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25263.4">
167+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25310.3">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
169+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.25263.4">
171+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.25310.3">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
173+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25263.4">
175+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25310.3">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
177+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</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.25263.4</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.25263.4</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.25310.3</MicrosoftDotNetApiCompatVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.25310.3</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.116",
3+
"dotnet": "8.0.117",
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.25263.4",
16-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25263.4"
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3"
1717
},
1818
"sdk": {
19-
"version": "8.0.116"
19+
"version": "8.0.117"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)