diff --git a/NuGet.config b/NuGet.config
index 9e48ae7d9..7ea20a294 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,8 +5,6 @@
-
-
@@ -17,12 +15,9 @@
+
+
-
-
-
-
-
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4bf8ad019..5e097b961 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,25 +13,25 @@
https://github.com/dotnet/windowsdesktop
85186023c8de8237268033cadc41d738b7f2005e
-
+
https://github.com/dotnet/runtime
- 907f7da59b40c80941b02ac2a46650adf3f606bc
+ 09c9d10db3ee63a3719870b5433191b9466fbad5
-
+
https://github.com/dotnet/runtime
- 907f7da59b40c80941b02ac2a46650adf3f606bc
+ 09c9d10db3ee63a3719870b5433191b9466fbad5
-
+
https://github.com/dotnet/runtime
- 907f7da59b40c80941b02ac2a46650adf3f606bc
+ 09c9d10db3ee63a3719870b5433191b9466fbad5
-
+
https://github.com/dotnet/runtime
- 907f7da59b40c80941b02ac2a46650adf3f606bc
+ 09c9d10db3ee63a3719870b5433191b9466fbad5
-
+
https://github.com/dotnet/runtime
- 907f7da59b40c80941b02ac2a46650adf3f606bc
+ 09c9d10db3ee63a3719870b5433191b9466fbad5
@@ -39,33 +39,33 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/runtime
- 907f7da59b40c80941b02ac2a46650adf3f606bc
+ 09c9d10db3ee63a3719870b5433191b9466fbad5
-
+
https://github.com/dotnet/aspnetcore
- f490dd24c924e32acb46d0dee6b838237172d5e8
+ 54f732e29a3bc7847551dfa74f4c6db9be29a2c6
-
+
https://github.com/dotnet/aspnetcore
- f490dd24c924e32acb46d0dee6b838237172d5e8
+ 54f732e29a3bc7847551dfa74f4c6db9be29a2c6
-
+
https://github.com/dotnet/aspnetcore
- f490dd24c924e32acb46d0dee6b838237172d5e8
+ 54f732e29a3bc7847551dfa74f4c6db9be29a2c6
-
+
https://github.com/dotnet/aspnetcore
- f490dd24c924e32acb46d0dee6b838237172d5e8
+ 54f732e29a3bc7847551dfa74f4c6db9be29a2c6
-
+
https://github.com/dotnet/aspnetcore
- f490dd24c924e32acb46d0dee6b838237172d5e8
+ 54f732e29a3bc7847551dfa74f4c6db9be29a2c6
-
+
https://github.com/dotnet/aspnetcore
- f490dd24c924e32acb46d0dee6b838237172d5e8
+ 54f732e29a3bc7847551dfa74f4c6db9be29a2c6
https://github.com/dotnet/test-templates
@@ -75,17 +75,17 @@
https://github.com/dotnet/test-templates
a2b05d8171915c69ad97ab5d49bbb07d2c780a67
-
+
https://github.com/dotnet/templating
- 6a10ce799f42102bee8f8bec9a52c42cca6ed272
+ a5633f030dd77065f5656387f3a6113e0ad4833f
-
+
https://github.com/dotnet/sdk
- 4bc03d190c8bb5acfac9043f8af1f5a953a2e894
+ c4f0b91ff5c65aa398cd021bd64fc1b0fa7ac4e9
-
+
https://github.com/dotnet/sdk
- 4bc03d190c8bb5acfac9043f8af1f5a953a2e894
+ c4f0b91ff5c65aa398cd021bd64fc1b0fa7ac4e9
diff --git a/eng/Versions.props b/eng/Versions.props
index ce606f139..f6874a155 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -29,7 +29,7 @@
- 5.0.0-rc.1.20419.1
+ 6.0.0-alpha.1.20454.5
@@ -41,34 +41,34 @@
- 5.0.0-rc.1.20419.22
- 5.0.0-rc.1.20419.22
- 5.0.0-rc.1.20419.22
- 5.0.0-rc.1.20419.22
- 5.0.0-rc.1.20419.22
- 5.0.0-rc.1.20419.22
+ 5.0.0-rc.2.20454.3
+ 5.0.0-rc.2.20454.3
+ 5.0.0-rc.2.20454.3
+ 5.0.0-rc.2.20454.3
+ 5.0.0-rc.2.20454.3
+ 5.0.0-rc.2.20454.3
0.2.0
- 5.0.100-rc.1.20420.8
- 5.0.100-rc.1.20420.8
+ 6.0.100-alpha.1.20454.15
+ 6.0.100-alpha.1.20454.15
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 5.0.0-rc.1.20417.14
+ 6.0.0-alpha.1.20453.28
- 5.0.0-rc.1.20417.14
- 5.0.0-rc.1.20417.14
- 5.0.0-rc.1.20417.14
- 5.0.0-rc.1.20417.14
- 5.0.0-rc.1.20417.14
+ 6.0.0-alpha.1.20453.28
+ 6.0.0-alpha.1.20453.28
+ 6.0.0-alpha.1.20453.28
+ 6.0.0-alpha.1.20453.28
+ 6.0.0-alpha.1.20453.28
2.1.0
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 8efb0277d..ed6f08ec6 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -31,7 +31,7 @@
https://dotnetcli.blob.core.windows.net/dotnet/
https://dotnetcli.blob.core.windows.net/dotnet/
- https://dotnetfeed.blob.core.windows.net/dotnet-core/
+ https://dotnetcli.blob.core.windows.net/dotnet/
$(HostRid)
$(OSName)-$(Architecture)
diff --git a/test/EndToEnd/GivenFrameworkDependentApps.cs b/test/EndToEnd/GivenFrameworkDependentApps.cs
index 19cbdf47f..9e9b6c420 100644
--- a/test/EndToEnd/GivenFrameworkDependentApps.cs
+++ b/test/EndToEnd/GivenFrameworkDependentApps.cs
@@ -18,7 +18,7 @@ namespace EndToEnd
[ClassData(typeof(SupportedNetCoreAppVersions))]
public void ItDoesNotRollForwardToTheLatestVersionOfNetCore(string minorVersion)
{
- if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0")
+ if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0" || minorVersion == "6.0")
{
// https://github.com/dotnet/core-sdk/issues/621
return;
@@ -30,7 +30,7 @@ namespace EndToEnd
[ClassData(typeof(SupportedAspNetCoreVersions))]
public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreApp(string minorVersion)
{
- if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0")
+ if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0" || minorVersion == "6.0")
{
// https://github.com/dotnet/core-sdk/issues/621
return;
diff --git a/test/EndToEnd/GivenUsingDefaultRuntimeFrameworkVersions.cs b/test/EndToEnd/GivenUsingDefaultRuntimeFrameworkVersions.cs
index c115ec918..de7655b86 100644
--- a/test/EndToEnd/GivenUsingDefaultRuntimeFrameworkVersions.cs
+++ b/test/EndToEnd/GivenUsingDefaultRuntimeFrameworkVersions.cs
@@ -65,19 +65,21 @@ namespace EndToEnd
foreach (var version in versions)
{
var frameworkVersionLine = resolvedVersionsFile.Where(line => line.Contains(framework) && line.Contains(version)).FirstOrDefault();
- frameworkVersionLine.Should().NotBeNullOrEmpty();
- var defaultVersion = NuGetVersion.Parse(frameworkVersionLine.Split(" ")[1]);
- var latestVersion = NuGetVersion.Parse(frameworkVersionLine.Split(" ")[2]);
+ if (!string.IsNullOrEmpty(frameworkVersionLine))
+ {
+ var defaultVersion = NuGetVersion.Parse(frameworkVersionLine.Split(" ")[1]);
+ var latestVersion = NuGetVersion.Parse(frameworkVersionLine.Split(" ")[2]);
- if (latestVersion.Patch == 0 && latestVersion.IsPrerelease)
- {
- defaultVersion.Should().Be(latestVersion,
- $"the DefaultRuntimeFrameworkVersion for { framework } { version } in Microsoft.NETCoreSdk.BundledVersions.props does not match latest prerelease version { latestVersion }");
- }
- else
- {
- defaultVersion.Should().Be(new NuGetVersion(latestVersion.Major, latestVersion.Minor, 0),
- $"the DefaultRuntimeFrameworkVersion for { framework } { version } in Microsoft.NETCoreSdk.BundledVersions.props needs to be updated to { version }.0");
+ if (latestVersion.Patch == 0 && latestVersion.IsPrerelease)
+ {
+ defaultVersion.Should().Be(latestVersion,
+ $"the DefaultRuntimeFrameworkVersion for { framework } { version } in Microsoft.NETCoreSdk.BundledVersions.props does not match latest prerelease version { latestVersion }");
+ }
+ else
+ {
+ defaultVersion.Should().Be(new NuGetVersion(latestVersion.Major, latestVersion.Minor, 0),
+ $"the DefaultRuntimeFrameworkVersion for { framework } { version } in Microsoft.NETCoreSdk.BundledVersions.props needs to be updated to { version }.0");
+ }
}
}
}
diff --git a/test/EndToEnd/SupportedNetCoreAppVersions.cs b/test/EndToEnd/SupportedNetCoreAppVersions.cs
index 3eacfcf4c..75862eed3 100644
--- a/test/EndToEnd/SupportedNetCoreAppVersions.cs
+++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs
@@ -28,7 +28,8 @@ namespace EndToEnd
"2.2",
"3.0",
"3.1",
- "5.0"
+ "5.0",
+ "6.0"
};
public static IEnumerable TargetFrameworkShortFolderVersion