diff --git a/build/dependencies.props b/build/dependencies.props
index d2cb0c14a9..36524c989a 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -3,45 +3,45 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 2.1.0-preview2-15746
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 0.5.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
- 2.1.0-preview2-30355
+ 2.1.0-preview2-15726
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 0.5.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-pk-corefx0-16426
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
+ 2.1.0-preview2-30220
1.1.0
- 2.1.0-preview2-30355
+ 2.1.0-preview2-30220
2.0.0
- 2.1.0-preview2-26314-02
- 2.1.0-preview2-30355
+ 2.1.0-preview2-26308-01
+ 2.1.0-preview2-30220
15.6.0
7.0.0
- 4.5.0-preview2-26313-01
- 4.5.0-preview2-26313-01
+ 4.5.0-preview2-26308-02
+ 4.5.0-preview2-26308-02
6.1.7601.17515
- 4.5.0-preview2-26313-01
- 4.5.0-preview2-26313-01
- 4.5.0-preview2-26313-01
- 4.5.0-preview2-26313-01
+ 4.5.0-preview2-26308-02
+ 4.5.0-preview2-26308-02
+ 4.5.0-preview2-26308-02
+ 4.5.0-preview2-26308-02
2.3.1
2.4.0-beta.1.build3945
-
+
\ No newline at end of file
diff --git a/build/repo.props b/build/repo.props
index 9c0b8dcd93..4913e566c1 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -19,7 +19,7 @@
Internal.AspNetCore.Universe.Lineup
- https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json
+ https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json
diff --git a/build/sources.props b/build/sources.props
index 36045f12b5..9215df9751 100644
--- a/build/sources.props
+++ b/build/sources.props
@@ -6,7 +6,7 @@
$(RestoreSources);
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
- https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json;
+ https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index e21a153898..bdaa7048b3 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-preview2-15746
-commithash:d5f868ce395d404711be71181179fcf63643641e
+version:2.1.0-preview2-15726
+commithash:599e691c41f502ed9e062b1822ce13b673fc916e
diff --git a/korebuild.json b/korebuild.json
index 663f878233..4893e52bc4 100644
--- a/korebuild.json
+++ b/korebuild.json
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json",
- "channel": "release/2.1",
+ "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
+ "channel": "dev",
"toolsets": {
"visualstudio": {
"required": ["Windows"],
diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs
index 19f272a491..6125b0df84 100644
--- a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs
+++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs
@@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if NETCOREAPP2_0 || NETCOREAPP2_1
+using System;
using System.IO;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Server.IntegrationTesting;
@@ -19,13 +20,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{
}
- [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]
+ [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
public Task HelloWorld_IISExpress_Clr_X64_Portable()
{
return HelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable);
}
- [Fact]
+ [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
public Task HelloWorld_IISExpress_CoreClr_X64_Portable()
{
return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable);
@@ -58,6 +59,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory))
{
var deploymentResult = await deployer.DeployAsync();
+ deploymentResult.HttpClient.Timeout = TimeSpan.FromSeconds(5);
// Request to base address and check if various parts of the body are rendered & measure the cold startup time.
var response = await RetryHelper.RetryRequest(() =>
@@ -84,10 +86,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
response = await deploymentResult.HttpClient.GetAsync("/Auth");
responseText = await response.Content.ReadAsStringAsync();
-
- // We adapted the Http.config file to be used for inprocess too. We specify WindowsAuth is enabled
- // We now expect that windows auth is enabled rather than disabled.
- Assert.True("backcompat;Windows".Equals(responseText) || "latest;Windows".Equals(responseText), "Auth");
+ Assert.True("backcompat;Windows".Equals(responseText) || "latest;null".Equals(responseText), "Auth");
}
catch (XunitException)
{
diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs
index a91a3b78d3..40d1a6f66f 100644
--- a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs
+++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs
@@ -25,13 +25,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{
}
- [Fact(Skip = "Full framework web.config generation is currently incorrect. See: https://github.com/aspnet/websdk/pull/322")]
+ [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
public Task Https_HelloWorld_CLR_X64()
{
return HttpsHelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44396);
}
- [Fact]
+ [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
public Task Https_HelloWorld_CoreCLR_X64_Portable()
{
return HttpsHelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44394);
@@ -93,13 +93,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
}
}
- [Fact]
+ [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable()
{
return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44397, sendClientCert: false);
}
- [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]
+ [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
public Task Https_HelloWorld_NoClientCert_Clr_X64()
{
return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44398, sendClientCert: false);
@@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{
ApplicationBaseUriHint = applicationBaseUrl,
EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld',
- ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/Https.config") : null,
+ ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Https.config") : null,
SiteName = "HttpsTestSite", // This is configured in the Https.config
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0",
ApplicationType = applicationType,
diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
index fe3b583a0f..e0bcb5e5e5 100644
--- a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
+++ b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
@@ -25,13 +25,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{
}
- [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]
+ [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
public Task NtlmAuthentication_Clr_X64()
{
return NtlmAuthentication(RuntimeFlavor.Clr, ApplicationType.Portable, port: 5051);
}
- [Fact]
+ [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
public Task NtlmAuthentication_CoreClr_X64_Portable()
{
return NtlmAuthentication(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 5052);
diff --git a/version.props b/version.props
index 0f0009b555..15ee0fc807 100644
--- a/version.props
+++ b/version.props
@@ -1,7 +1,7 @@
2.1.0
- preview2
+ preview3
$(VersionPrefix)
$(VersionPrefix)-$(VersionSuffix)-final
t000