Skip to content

Commit d146309

Browse files
Tanya SolyanikTanya Solyanik
authored andcommitted
Merged PR 49093: Merge from release/9.0 into internal/release/9.0
Fixes #13279 I took feeds from both branches when resolving the conflict
2 parents 93c725b + 61ec31a commit d146309

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
77
<add key="darc-int-dotnet-runtime-f80f87e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f80f87ea/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-f57e6dc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f57e6dc7/nuget/v3/index.json" />
89
<!-- End: Package sources from dotnet-runtime -->
910
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1011
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -26,6 +27,7 @@
2627
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2728
<!-- Begin: Package sources from dotnet-runtime -->
2829
<add key="darc-int-dotnet-runtime-f80f87e" value="true" />
30+
<add key="darc-int-dotnet-runtime-f57e6dc" value="true" />
2931
<!-- End: Package sources from dotnet-runtime -->
3032
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3133
</disabledPackageSources>

0 commit comments

Comments
 (0)