Merge pull request #36977 from dotnet/merge/release/10.0-to-main

[automated] Merge branch 'release/10.0' => 'main'

Author: cincuranet

NuGet.config

@@ -3,7 +3,11 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-dotnet -->
+    <add key="darc-pub-dotnet-dotnet-862de94" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-862de94f/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-e1f1988" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e1f19886/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" />
@@ -22,6 +26,7 @@
     <clear />
     <!--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-e1f1988" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>

eng/common/SetupNugetSources.sh

@@ -66,10 +66,8 @@ EnableInternalPackageSource() {
     grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
     if [ "$?" == "0" ]; then
         echo "Enabling internal source '$PackageSourceName'."
-        # Remove the disabled entry
-        local OldDisableValue="<add key=\"$PackageSourceName\" value=\"true\" />"
-        local NewDisableValue="<!-- Reenabled for build : $PackageSourceName -->"
-        sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile"
+        # Remove the disabled entry (including any surrounding comments or whitespace on the same line)
+        sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"
 
         # Add the source name to PackageSources for credential handling
         PackageSources+=("$PackageSourceName")