diff --git a/NuGet.config b/NuGet.config index 9f7e9703800..06d412a3cc8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,9 @@ + + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 1b99e90a7dd..34ac5c28434 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 + 10.0.0-beta.25514.103 + 10.0.0-beta.25514.103 + 10.0.0-beta.25514.103 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0-rtm.25514.103 + 10.0.0 + 10.0.0 + 10.0.0-rtm.25514.103 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bb7dda1063..c2792a20c5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index dd2564aef01..b97cc536379 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 f44d4444469..102f904ae64 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25513.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25513.102" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25514.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25514.103" } }