Skip to content

Commit

Permalink
Merge pull request #7968 from dotnet/darc-release/6.0.4xx-98240f59-6e…
Browse files Browse the repository at this point in the history
…06-40a2-9e99-8eb7ce044db3

[release/6.0.4xx] Update dependencies from dotnet/arcade
  • Loading branch information
marcpopMSFT authored May 17, 2024
2 parents bffac7a + 31ae801 commit 46ec6e7
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
8 changes: 8 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-97d8f4c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-97d8f4c-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-97d8f4c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-97d8f4c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-97d8f4c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -19,6 +23,10 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-97d8f4c-1" value="true" />
<add key="darc-int-dotnet-runtime-97d8f4c-2" value="true" />
<add key="darc-int-dotnet-runtime-97d8f4c-3" value="true" />
<add key="darc-int-dotnet-runtime-97d8f4c-4" value="true" />
<add key="darc-int-dotnet-runtime-97d8f4c" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24218.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24266.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a6f2717562e54654ddd34f71e3838048aaf8a39</Sha>
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"tools": {
"dotnet": "6.0.129",
"dotnet": "6.0.130",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
]
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24218.1"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24266.4"
}
}

0 comments on commit 46ec6e7

Please sign in to comment.