diff --git a/NuGet.config b/NuGet.config index f51539aa7c95..79a739ed8c62 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,9 @@ + + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 8d576001dc6f..fd9871ce6ffc 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25512.102 - 10.0.0-beta.25512.102 - 0.11.5-alpha.25512.102 - 10.0.0-beta.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.100-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.100-rtm.25512.102 + 10.0.0-beta.25515.107 + 10.0.0-beta.25515.107 + 0.11.5-alpha.25515.107 + 10.0.0-beta.25515.107 + 10.0.0-rtm.25515.107 + 10.0.0 + 10.0.0 + 10.0.100-rtm.25515.107 + 10.0.0 + 10.0.100 18.5.9227 26.0.9754 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ad8ae96748f..104134389ba6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,29 +1,29 @@ - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e @@ -78,25 +78,25 @@ - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/xharness cbaa911ef1bce4cf92a7e4f7ffa5171eddd1a8fd - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index dd2564aef012..b97cc536379d 100644 --- 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 8f65fc51e4da..a6487b6dccc3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rtm.25512.102", + "version": "10.0.100-rtm.25515.107", "paths": [ "builds/downloads/dotnet", "$host$" @@ -8,9 +8,9 @@ "errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'." }, "tools": { - "dotnet": "10.0.100-rtm.25512.102" + "dotnet": "10.0.100-rtm.25515.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25512.102" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.107" } }