Skip to content

Commit a6beabe

Browse files
author
Mirroring
committed
Merge commit '548fa5296a18a853b472061a950f801d2bca34db'
2 parents c8c2cbd + 548fa52 commit a6beabe

File tree

4 files changed

+29
-13
lines changed

4 files changed

+29
-13
lines changed

‎NuGet.config‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,17 @@
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-893c2eb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-893c2eb-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-4/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-893c2eb-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-3/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-runtime-893c2eb-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-2/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-893c2eb-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-1/nuget/v3/index.json" />
913
<!-- End: Package sources from dotnet-runtime -->
1014
<!-- Begin: Package sources from dotnet-winforms -->
1115
<add key="darc-int-dotnet-winforms-9dc841c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-9dc841c7/nuget/v3/index.json" />
16+
<add key="darc-int-dotnet-winforms-9dc841c-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-9dc841c7-4/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-winforms-9dc841c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-9dc841c7-3/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-winforms-9dc841c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-9dc841c7-2/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-winforms-9dc841c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-9dc841c7-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" />
@@ -24,9 +32,17 @@
2432
<disabledPackageSources>
2533
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2634
<!-- Begin: Package sources from dotnet-runtime -->
35+
<add key="darc-int-dotnet-runtime-893c2eb-1" value="true" />
36+
<add key="darc-int-dotnet-runtime-893c2eb-2" value="true" />
37+
<add key="darc-int-dotnet-runtime-893c2eb-3" value="true" />
38+
<add key="darc-int-dotnet-runtime-893c2eb-4" value="true" />
2739
<add key="darc-int-dotnet-runtime-893c2eb" value="true" />
2840
<!-- End: Package sources from dotnet-runtime -->
2941
<!-- Begin: Package sources from dotnet-winforms -->
42+
<add key="darc-int-dotnet-winforms-9dc841c-1" value="true" />
43+
<add key="darc-int-dotnet-winforms-9dc841c-2" value="true" />
44+
<add key="darc-int-dotnet-winforms-9dc841c-3" value="true" />
45+
<add key="darc-int-dotnet-winforms-9dc841c-4" value="true" />
3046
<add key="darc-int-dotnet-winforms-9dc841c" value="true" />
3147
<!-- End: Package sources from dotnet-winforms -->
3248
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,25 +165,25 @@
165165
</Dependency>
166166
</ProductDependencies>
167167
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25428.3">
168+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25460.1">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
170+
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25428.3">
172+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25460.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
174+
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25428.3">
176+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25460.1">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
178+
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182182
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25428.3">
184+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25460.1">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
186+
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
187187
</Dependency>
188188
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
189189
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<!-- Packages that come from https://github.com/dotnet/arcade -->
5353
<PropertyGroup>
5454
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
55-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.25428.3</MicrosoftDotNetCodeAnalysisPackageVersion>
55+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.25460.1</MicrosoftDotNetCodeAnalysisPackageVersion>
5656
</PropertyGroup>
5757
<!-- Sourcelink -->
5858
<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": "9.0.109",
3+
"dotnet": "9.0.110",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25428.3"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25460.1"
1717
},
1818
"sdk": {
19-
"version": "9.0.109"
19+
"version": "9.0.110"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.38.0.1",

0 commit comments

Comments
 (0)