Skip to content

Commit 9d81f02

Browse files
author
Mirroring
committed
Merge commit '9e2bd41139c5290465f8438f59279e56378b5852'
2 parents 496c1e1 + 9e2bd41 commit 9d81f02

File tree

5 files changed

+35
-19
lines changed

5 files changed

+35
-19
lines changed

‎NuGet.config‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
8-
<add key="darc-int-dotnet-runtime-81cabf2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-81cabf28/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-81cabf2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-81cabf28-3/nuget/v3/index.json" />
99
<!-- End: Package sources from dotnet-runtime -->
1010
<!-- Begin: Package sources from dotnet-winforms -->
1111
<add key="darc-int-dotnet-winforms-e4efded" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-e4efded4/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-winforms-e4efded-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-e4efded4-9/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-winforms-e4efded-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-e4efded4-6/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-winforms-e4efded-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-e4efded4-5/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-winforms-e4efded-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-e4efded4-4/nuget/v3/index.json" />
16+
<add key="darc-int-dotnet-winforms-e4efded-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-e4efded4-3/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-winforms-e4efded-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-e4efded4-2/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-winforms-e4efded-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-e4efded4-10/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-winforms-e4efded-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-e4efded4-1/nuget/v3/index.json" />
1220
<!-- End: Package sources from dotnet-winforms -->
1321
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1422
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,9 +30,17 @@
2230
<disabledPackageSources>
2331
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2432
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-81cabf2" value="true" />
33+
<add key="darc-int-dotnet-runtime-81cabf2-3" value="true" />
2634
<!-- End: Package sources from dotnet-runtime -->
2735
<!-- Begin: Package sources from dotnet-winforms -->
36+
<add key="darc-int-dotnet-winforms-e4efded-1" value="true" />
37+
<add key="darc-int-dotnet-winforms-e4efded-10" value="true" />
38+
<add key="darc-int-dotnet-winforms-e4efded-2" value="true" />
39+
<add key="darc-int-dotnet-winforms-e4efded-3" value="true" />
40+
<add key="darc-int-dotnet-winforms-e4efded-4" value="true" />
41+
<add key="darc-int-dotnet-winforms-e4efded-5" value="true" />
42+
<add key="darc-int-dotnet-winforms-e4efded-6" value="true" />
43+
<add key="darc-int-dotnet-winforms-e4efded-9" value="true" />
2844
<add key="darc-int-dotnet-winforms-e4efded" value="true" />
2945
<!-- End: Package sources from dotnet-winforms -->
3046
<!--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.24426.2">
159+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24508.1">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
161+
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24426.2">
163+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24508.1">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
165+
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24426.2">
167+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24508.1">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
169+
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.24426.2">
171+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.24508.1">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
173+
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24426.2">
175+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24508.1">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
177+
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</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.24426.2</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.24426.2</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.24508.1</MicrosoftDotNetApiCompatVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.24508.1</MicrosoftDotNetCodeAnalysisPackageVersion>
5454
</PropertyGroup>
5555
<!-- Sourcelink -->
5656
<PropertyGroup>

‎eng/common/tools.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ function IsWindowsPlatform() {
892892
}
893893

894894
function Get-Darc($version) {
895-
$darcPath = "$TempDir\darc\$(New-Guid)"
895+
$darcPath = "$TempDir\darc\$([guid]::NewGuid())"
896896
if ($version -ne $null) {
897897
& $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
898898
} else {

‎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.108",
3+
"dotnet": "8.0.110",
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.24426.2",
16-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24426.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1"
1717
},
1818
"sdk": {
19-
"version": "8.0.108"
19+
"version": "8.0.110"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)