Skip to content

Commit c02fa78

Browse files
author
Mirroring
committed
Merge commit '3e4fd9c4dba4f9f86b3f1c7a75a7830c3b458874'
2 parents 79bbea0 + 3e4fd9c commit c02fa78

File tree

4 files changed

+24
-22
lines changed

4 files changed

+24
-22
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-runtime -->
1212
<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" />
13+
<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" />
1314
<!-- End: Package sources from dotnet-runtime -->
1415
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1516
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,6 +23,7 @@
2223
<clear />
2324
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2425
<!-- Begin: Package sources from dotnet-runtime -->
26+
<add key="darc-int-dotnet-runtime-b357f86-2" value="true" />
2527
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
2628
<!-- End: Package sources from dotnet-runtime -->
2729
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,33 +39,33 @@
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>
42-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24459.5">
42+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24508.2">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
44+
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24459.5">
46+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24508.2">
4747
<Uri>https://github.com/dotnet/arcade</Uri>
48-
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
48+
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24459.5">
50+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24508.2">
5151
<Uri>https://github.com/dotnet/arcade</Uri>
52-
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
52+
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
5353
</Dependency>
54-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24459.5">
54+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24508.2">
5555
<Uri>https://github.com/dotnet/arcade</Uri>
56-
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
56+
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24459.5">
58+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24508.2">
5959
<Uri>https://github.com/dotnet/arcade</Uri>
60-
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
60+
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24459.5">
62+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24508.2">
6363
<Uri>https://github.com/dotnet/arcade</Uri>
64-
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
64+
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24459.5">
66+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24508.2">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
68+
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
6969
</Dependency>
7070
</ToolsetDependencies>
7171
</Dependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
<!--Package versions-->
5050
<PropertyGroup>
5151
<!-- arcade -->
52-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24459.5</MicrosoftDotNetBuildTasksFeedVersion>
53-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24459.5</MicrosoftDotNetBuildTasksArchivesVersion>
54-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24459.5</MicrosoftDotNetBuildTasksPackagingVersion>
55-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24459.5</MicrosoftDotNetBuildTasksInstallersVersion>
56-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24459.5</MicrosoftDotNetVersionToolsTasksVersion>
52+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24508.2</MicrosoftDotNetBuildTasksFeedVersion>
53+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24508.2</MicrosoftDotNetBuildTasksArchivesVersion>
54+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24508.2</MicrosoftDotNetBuildTasksPackagingVersion>
55+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24508.2</MicrosoftDotNetBuildTasksInstallersVersion>
56+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24508.2</MicrosoftDotNetVersionToolsTasksVersion>
5757
<!-- runtime -->
5858
<MicrosoftNETCoreAppRefVersion>6.0.35</MicrosoftNETCoreAppRefVersion>
5959
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.35</MicrosoftNETCoreAppRuntimewinx64Version>

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.133"
3+
"dotnet": "6.0.135"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24459.5",
7-
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24459.5",
6+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24508.2",
7+
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24508.2",
88
"Microsoft.Build.NoTargets": "1.0.53"
99
}
1010
}

0 commit comments

Comments
 (0)