diff --git a/NuGet.config b/NuGet.config index cd1332fd7..690b1b0e7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,11 @@ + + + + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 8ce934be3..dd5aba400 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,48 +6,48 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25512.102 - 10.0.0-beta.25512.102 - 10.0.0-beta.25512.102 - 10.0.0-beta.25512.102 - 10.0.0-beta.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.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 + 10.0.0-beta.25514.103 + 10.0.0-beta.25514.103 + 10.0.0-beta.25514.103 + 10.0.0-beta.25514.103 + 10.0.0-beta.25514.103 + 10.0.0-beta.25514.103 + 10.0.0-rtm.25514.103 + 10.0.0-rtm.25514.103 + 10.0.0-rtm.25514.103 + 10.0.0-rtm.25514.103 + 10.0.0-rtm.25514.103 + 10.0.0 + 10.0.0-rtm.25514.103 + 10.0.0-rtm.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 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 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 654c6b231..1e789b978 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,176 +1,176 @@ - + - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + 862de94f7792651640741a4651183e8bd5f64029 diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index dd2564aef..b97cc5363 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 bd8cbe838..4cf79924b 100644 --- a/global.json +++ b/global.json @@ -18,9 +18,9 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25512.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25514.103", "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25509.106", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25512.102", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25514.103", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"