diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 5c1f7c4f77..2c5ef89f26 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -18,7 +18,7 @@ This file should be imported by eng/Versions.props 9.0.0 9.0.0 - 10.0.0-beta.25509.2 + 10.0.0-beta.25513.2 1.0.0-prerelease.25467.1 1.0.0-prerelease.25467.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd474d3c19..1c1cb3c0db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,9 +44,9 @@ - + https://github.com/dotnet/arcade - 32a401ae573e0b2613c0ec9ce5bb0052d7b79147 + e8ca69398033dd1eea35e9667bf857234465de2b https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index dd2564aef0..b97cc53637 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -66,10 +66,8 @@ EnableInternalPackageSource() { grep -i " /dev/null if [ "$?" == "0" ]; then echo "Enabling internal source '$PackageSourceName'." - # Remove the disabled entry - local OldDisableValue="" - local NewDisableValue="" - sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile" + # Remove the disabled entry (including any surrounding comments or whitespace on the same line) + sed -i.bak "//d" "$ConfigFile" # Add the source name to PackageSources for credential handling PackageSources+=("$PackageSourceName") diff --git a/global.json b/global.json index dc3db6144d..fcfaa76410 100644 --- a/global.json +++ b/global.json @@ -22,7 +22,7 @@ "perl": "5.38.2.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25509.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25513.2", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } }