diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..17d90aec3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,24 @@
+# EditorConfig is awesome:http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.cs]
+indent_size = 4
+dotnet_sort_system_directives_first = true:warning
+
+# Xml files
+[*.{csproj,config,props,targets,ruleset,config,resx,xml}]
+indent_size = 2
+
+[*.{json, yml}]
+indent_size = 2
+
+[*.{ps1,sh}]
+indent_size = 4
diff --git a/IISIntegration.sln b/IISIntegration.sln
index c5d2ae831..a4067a736 100644
--- a/IISIntegration.sln
+++ b/IISIntegration.sln
@@ -1,71 +1,123 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26201.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04B1EDB6-E967-4D25-89B9-E6F8304038CD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}"
ProjectSection(SolutionItems) = preProject
- global.json = global.json
+ .editorconfig = .editorconfig
NuGet.Config = NuGet.Config
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EF30B533-D715-421A-92B7-92FEF460AC9C}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestSites.Standalone", "test\TestSites.Standalone\TestSites.Standalone.xproj", "{E27453AD-9CA0-49A2-94FA-96337D77677D}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IISSample", "samples\IISSample\IISSample.xproj", "{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "samples\IISSample\IISSample.csproj", "{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{8B3446E8-E6A8-4591-AA63-A95837C6E97C}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.IISIntegration", "src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.xproj", "{8B3446E8-E6A8-4591-AA63-A95837C6E97C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests", "test\Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests\Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.csproj", "{7F2F50C7-610F-4B69-B945-CA283511A587}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests", "test\Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests\Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.xproj", "{7F2F50C7-610F-4B69-B945-CA283511A587}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "test\Microsoft.AspNetCore.Server.IISIntegration.Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{4106DB10-E09F-480E-9CE6-B39235512EE6}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "test\Microsoft.AspNetCore.Server.IISIntegration.Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.xproj", "{4106DB10-E09F-480E-9CE6-B39235512EE6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestSites", "test\TestSites\TestSites.csproj", "{F54715C3-88D8-49E3-A291-C13570FE81FC}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestSites", "test\TestSites\TestSites.xproj", "{F54715C3-88D8-49E3-A291-C13570FE81FC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "..\Hosting\src\Microsoft.AspNetCore.Server.IntegrationTesting\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E27453AD-9CA0-49A2-94FA-96337D77677D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E27453AD-9CA0-49A2-94FA-96337D77677D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E27453AD-9CA0-49A2-94FA-96337D77677D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E27453AD-9CA0-49A2-94FA-96337D77677D}.Release|Any CPU.Build.0 = Release|Any CPU
{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x64.ActiveCfg = Debug|x64
+ {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x64.Build.0 = Debug|x64
+ {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.ActiveCfg = Debug|x86
+ {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.Build.0 = Debug|x86
{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x64.ActiveCfg = Release|x64
+ {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x64.Build.0 = Release|x64
+ {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x86.ActiveCfg = Release|x86
+ {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x86.Build.0 = Release|x86
{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x64.ActiveCfg = Debug|x64
+ {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x64.Build.0 = Debug|x64
+ {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x86.ActiveCfg = Debug|x86
+ {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x86.Build.0 = Debug|x86
{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.ActiveCfg = Release|x64
+ {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.Build.0 = Release|x64
+ {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.ActiveCfg = Release|x86
+ {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.Build.0 = Release|x86
{7F2F50C7-610F-4B69-B945-CA283511A587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7F2F50C7-610F-4B69-B945-CA283511A587}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7F2F50C7-610F-4B69-B945-CA283511A587}.Debug|x64.ActiveCfg = Debug|x64
+ {7F2F50C7-610F-4B69-B945-CA283511A587}.Debug|x64.Build.0 = Debug|x64
+ {7F2F50C7-610F-4B69-B945-CA283511A587}.Debug|x86.ActiveCfg = Debug|x86
+ {7F2F50C7-610F-4B69-B945-CA283511A587}.Debug|x86.Build.0 = Debug|x86
{7F2F50C7-610F-4B69-B945-CA283511A587}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7F2F50C7-610F-4B69-B945-CA283511A587}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7F2F50C7-610F-4B69-B945-CA283511A587}.Release|x64.ActiveCfg = Release|x64
+ {7F2F50C7-610F-4B69-B945-CA283511A587}.Release|x64.Build.0 = Release|x64
+ {7F2F50C7-610F-4B69-B945-CA283511A587}.Release|x86.ActiveCfg = Release|x86
+ {7F2F50C7-610F-4B69-B945-CA283511A587}.Release|x86.Build.0 = Release|x86
{4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x64.ActiveCfg = Debug|x64
+ {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x64.Build.0 = Debug|x64
+ {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.ActiveCfg = Debug|x86
+ {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.Build.0 = Debug|x86
{4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.ActiveCfg = Release|x64
+ {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.Build.0 = Release|x64
+ {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.ActiveCfg = Release|x86
+ {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.Build.0 = Release|x86
{F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x64.ActiveCfg = Debug|x64
+ {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x64.Build.0 = Debug|x64
+ {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x86.ActiveCfg = Debug|x86
+ {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x86.Build.0 = Debug|x86
{F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x64.ActiveCfg = Release|x64
+ {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x64.Build.0 = Release|x64
+ {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x86.ActiveCfg = Release|x86
+ {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x86.Build.0 = Release|x86
+ {9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3}.Debug|x64.ActiveCfg = Debug|x64
+ {9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3}.Debug|x64.Build.0 = Debug|x64
+ {9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3}.Debug|x86.ActiveCfg = Debug|x86
+ {9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3}.Debug|x86.Build.0 = Debug|x86
+ {9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3}.Release|x64.ActiveCfg = Release|x64
+ {9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3}.Release|x64.Build.0 = Release|x64
+ {9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3}.Release|x86.ActiveCfg = Release|x86
+ {9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {E27453AD-9CA0-49A2-94FA-96337D77677D} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}
{8B3446E8-E6A8-4591-AA63-A95837C6E97C} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
{7F2F50C7-610F-4B69-B945-CA283511A587} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
{4106DB10-E09F-480E-9CE6-B39235512EE6} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
{F54715C3-88D8-49E3-A291-C13570FE81FC} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
+ {9AEB9FE7-C88C-40C1-9116-2EFAD73D4DF3} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
EndGlobalSection
EndGlobal
diff --git a/NuGet.config b/NuGet.config
index 20060c934..8e6569561 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,8 +1,8 @@
-
+
-
+
diff --git a/build.ps1 b/build.ps1
index 8f2f99691..0605b59c0 100644
--- a/build.ps1
+++ b/build.ps1
@@ -33,7 +33,7 @@ cd $PSScriptRoot
$repoFolder = $PSScriptRoot
$env:REPO_FOLDER = $repoFolder
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
if ($env:KOREBUILD_ZIP)
{
$koreBuildZip=$env:KOREBUILD_ZIP
diff --git a/build.sh b/build.sh
index 4fd7ede78..07997d6c8 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $repoFolder
-koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
+koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
if [ ! -z $KOREBUILD_ZIP ]; then
koreBuildZip=$KOREBUILD_ZIP
fi
diff --git a/tools/Key.snk b/build/Key.snk
similarity index 100%
rename from tools/Key.snk
rename to build/Key.snk
diff --git a/build/common.props b/build/common.props
new file mode 100644
index 000000000..20661cbb2
--- /dev/null
+++ b/build/common.props
@@ -0,0 +1,24 @@
+
+
+
+
+ Microsoft ASP.NET Core
+ https://github.com/aspnet/IISIntegration
+ git
+ $(MSBuildThisFileDirectory)Key.snk
+ true
+ true
+ 1.2.0-*
+ 1.6.2-*
+ $(VersionSuffix)-$(BuildNumber)
+
+
+
+
+
+
+
+
+
+
+
diff --git a/global.json b/global.json
deleted file mode 100644
index 0ad1995dd..000000000
--- a/global.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "projects": [
- "src"
- ],
- "sdk": {
- "version": "1.0.0-preview2-1-003180"
- }
-}
\ No newline at end of file
diff --git a/makefile.shade b/makefile.shade
deleted file mode 100644
index 562494d14..000000000
--- a/makefile.shade
+++ /dev/null
@@ -1,7 +0,0 @@
-
-var VERSION='0.1'
-var FULL_VERSION='0.1'
-var AUTHORS='Microsoft Open Technologies, Inc.'
-
-use-standard-lifecycle
-k-standard-goals
diff --git a/samples/IISSample/IISSample.csproj b/samples/IISSample/IISSample.csproj
new file mode 100644
index 000000000..d5540fd3e
--- /dev/null
+++ b/samples/IISSample/IISSample.csproj
@@ -0,0 +1,16 @@
+
+
+
+ netcoreapp1.1;net451
+
+ win7-x64
+ Exe
+
+
+
+
+
+
+
+
+
diff --git a/samples/IISSample/IISSample.xproj b/samples/IISSample/IISSample.xproj
deleted file mode 100644
index 032118be1..000000000
--- a/samples/IISSample/IISSample.xproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- e4e2bdc4-a9c6-4ae9-b429-032ec83ede64
- .\obj
- .\bin\
-
-
- 2.0
- 65029
-
-
-
\ No newline at end of file
diff --git a/samples/IISSample/project.json b/samples/IISSample/project.json
deleted file mode 100644
index 0b381b0ec..000000000
--- a/samples/IISSample/project.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "version": "1.1.0-*",
- "dependencies": {
- "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*",
- "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*",
- "Microsoft.Extensions.Logging.Console": "1.2.0-*"
- },
- "buildOptions": {
- "emitEntryPoint": true
- },
- "frameworks": {
- "net451": {},
- "netcoreapp1.1": {
- "dependencies": {
- "Microsoft.NETCore.App": {
- "version": "1.2.0-*",
- "type": "platform"
- }
- }
- }
- },
- "publishOptions": {
- "include": [
- "web.config"
- ]
- },
- "tools": {
- "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-*"
- },
- "scripts": {
- "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
- }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj
new file mode 100644
index 000000000..74cbf8879
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj
@@ -0,0 +1,28 @@
+
+
+
+
+
+ ASP.NET Core components for working with the IIS AspNetCoreModule.
+ net451;netstandard1.3
+ $(NoWarn);CS1591
+ true
+ aspnetcore;iis
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.xproj b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.xproj
deleted file mode 100644
index abf80a406..000000000
--- a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.xproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 8b3446e8-e6a8-4591-aa63-a95837c6e97c
- .\obj
- .\bin\
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs
index 9cf586c3a..f08839f84 100644
--- a/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs
@@ -1,14 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using System.Reflection;
-using System.Resources;
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.IISIntegration.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: NeutralResourcesLanguage("en-us")]
-[assembly: AssemblyCompany("Microsoft Corporation.")]
-[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft ASP.NET Core")]
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/project.json b/src/Microsoft.AspNetCore.Server.IISIntegration/project.json
deleted file mode 100644
index 9b2a01e3c..000000000
--- a/src/Microsoft.AspNetCore.Server.IISIntegration/project.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "version": "1.2.0-*",
- "buildOptions": {
- "warningsAsErrors": true,
- "keyFile": "../../tools/Key.snk",
- "nowarn": [
- "CS1591"
- ],
- "xmlDoc": true
- },
- "description": "ASP.NET Core components for working with the IIS AspNetCoreModule.",
- "packOptions": {
- "repository": {
- "type": "git",
- "url": "git://github.com/aspnet/IISIntegration"
- },
- "tags": [
- "aspnetcore",
- "iis"
- ]
- },
- "dependencies": {
- "Microsoft.AspNetCore.Hosting.Abstractions": "1.2.0-*",
- "Microsoft.AspNetCore.Http": "1.2.0-*",
- "Microsoft.AspNetCore.Http.Extensions": "1.2.0-*",
- "Microsoft.AspNetCore.HttpOverrides": "1.2.0-*",
- "Microsoft.Extensions.Logging.Abstractions": "1.2.0-*",
- "Microsoft.Extensions.Options": "1.2.0-*",
- "Microsoft.Extensions.SecurityHelper.Sources": {
- "type": "build",
- "version": "1.2.0-*"
- },
- "Microsoft.Extensions.TaskCache.Sources": {
- "version": "1.2.0-*",
- "type": "build"
- },
- "NETStandard.Library": "1.6.2-*"
- },
- "frameworks": {
- "net451": {},
- "netstandard1.3": {
- "dependencies": {
- "System.Security.Principal.Windows": "4.4.0-*"
- }
- }
- }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs
index f20213f60..262d17af2 100644
--- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs
+++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs
@@ -22,7 +22,8 @@ public class HelloWorldTests
//[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5061/", ServerType.Kestrel, ApplicationType.Portable)]
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5062/", ServerType.Kestrel, ApplicationType.Portable)]
//[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5063/", ServerType.Kestrel, ApplicationType.Portable)]
- [InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5064/", ServerType.Kestrel, ApplicationType.Standalone)]
+ // TODO reenable when https://github.com/dotnet/sdk/issues/696 is resolved
+ //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5064/", ServerType.Kestrel, ApplicationType.Standalone)]
[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5065/", ServerType.Kestrel, ApplicationType.Portable)]
public Task HelloWorld_IISExpress(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ServerType delegateServer, ApplicationType applicationType)
{
@@ -50,7 +51,7 @@ public async Task HelloWorld(ServerType serverType, RuntimeFlavor runtimeFlavor,
using (logger.BeginScope("HelloWorldTest"))
{
- var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(applicationType), serverType, runtimeFlavor, architecture)
+ var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(), serverType, runtimeFlavor, architecture)
{
ApplicationBaseUriHint = applicationBaseUrl,
EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld',
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Helpers.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Helpers.cs
index 2108aee85..85b740916 100644
--- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Helpers.cs
+++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Helpers.cs
@@ -1,16 +1,22 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+using System;
using System.IO;
-using Microsoft.AspNetCore.Server.IntegrationTesting;
namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{
public class Helpers
{
- public static string GetTestSitesPath(ApplicationType applicationType)
+ public static string GetTestSitesPath()
{
- return Path.GetFullPath(Path.Combine("..", "..", "..", "..", "..", applicationType == ApplicationType.Standalone ? "TestSites.Standalone" : "TestSites"));
+ return Path.GetFullPath(
+ Path.Combine(AppDomain.CurrentDomain.BaseDirectory,
+ "..", // tfm
+ "..", // debug
+ "..", // obj
+ "..", // projectfolder
+ "TestSites"));
}
}
}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs
index 61800e3a3..21b2c35b2 100644
--- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs
+++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs
@@ -21,7 +21,8 @@ public class HttpsTest
[OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)]
//[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "https://localhost:44394/", ApplicationType.Portable)]
- [InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44395/", ApplicationType.Standalone)]
+ // TODO reenable when https://github.com/dotnet/sdk/issues/696 is resolved
+ //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44395/", ApplicationType.Standalone)]
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "https://localhost:44396/", ApplicationType.Portable)]
public Task Https_HelloWorld(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
{
@@ -37,7 +38,7 @@ public async Task HttpsHelloWorld(ServerType serverType, RuntimeFlavor runtimeFl
using (logger.BeginScope("HttpsHelloWorldTest"))
{
- var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(applicationType), serverType, runtimeFlavor, architecture)
+ var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(), serverType, runtimeFlavor, architecture)
{
ApplicationBaseUriHint = applicationBaseUrl,
EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld',
@@ -82,7 +83,8 @@ public async Task HttpsHelloWorld(ServerType serverType, RuntimeFlavor runtimeFl
[ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)]
- [InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44397/", ApplicationType.Standalone)]
+ // TODO reenable when https://github.com/dotnet/sdk/issues/696 is resolved
+ //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44397/", ApplicationType.Standalone)]
[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44398/", ApplicationType.Portable)]
//[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x86, "https://localhost:44399/", ApplicationType.Standalone)]
public Task Https_HelloWorld_NoClientCert(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
@@ -108,7 +110,7 @@ public async Task HttpsHelloWorldCerts(ServerType serverType, RuntimeFlavor runt
using (logger.BeginScope("HttpsHelloWorldTest"))
{
- var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(applicationType), serverType, runtimeFlavor, architecture)
+ var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(), serverType, runtimeFlavor, architecture)
{
ApplicationBaseUriHint = applicationBaseUrl,
EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld',
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.csproj
new file mode 100644
index 000000000..cb37b5c81
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.csproj
@@ -0,0 +1,27 @@
+
+
+
+
+
+ net451
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.xproj b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.xproj
deleted file mode 100644
index 3c372088d..000000000
--- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.xproj
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 7f2f50c7-610f-4b69-b945-ca283511a587
- .\obj
- .\bin\
-
-
- 2.0
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs
index 958bfb2b5..c6c390a74 100644
--- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs
+++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
@@ -7,39 +7,55 @@
using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Testing;
using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.Extensions.Logging;
using Xunit;
using Xunit.Sdk;
+using Xunit.Abstractions;
namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{
// Uses ports ranging 5050 - 5060.
public class NtlmAuthenticationTests
{
+ private readonly ITestOutputHelper _output;
+
+ public NtlmAuthenticationTests(ITestOutputHelper output)
+ {
+ _output = output;
+ }
+
[ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)]
//[InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5050/", ApplicationType.Standalone)]
[InlineData(ServerType.IISExpress, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5051/", ApplicationType.Portable)]
- [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5052/", ApplicationType.Standalone)]
+ // TODO reenable when https://github.com/dotnet/sdk/issues/696 is resolved
+ //[InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5052/", ApplicationType.Standalone)]
public async Task NtlmAuthentication(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
{
- var logger = new LoggerFactory()
- .AddConsole()
- .AddDebug()
- .CreateLogger($"NtlmAuthentication:{serverType}:{runtimeFlavor}:{architecture}");
+ var factory = new LoggerFactory().AddDebug();
+ factory.AddProvider(new XunitLoggerProvider(_output));
+ var logger = factory.CreateLogger($"NtlmAuthentication:{serverType}:{runtimeFlavor}:{architecture}");
using (logger.BeginScope("NtlmAuthenticationTest"))
{
- var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(applicationType), serverType, runtimeFlavor, architecture)
+ var windowsRid = architecture == RuntimeArchitecture.x64
+ ? "win7-x64"
+ : "win7-x86";
+
+ var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(), serverType, runtimeFlavor, architecture)
{
ApplicationBaseUriHint = applicationBaseUrl,
EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication'
ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("NtlmAuthentation.config") : null,
SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.1",
- ApplicationType = applicationType
+ ApplicationType = applicationType,
+ AdditionalPublishParameters = ApplicationType.Standalone == applicationType && RuntimeFlavor.CoreClr == runtimeFlavor
+ ? "-r " + windowsRid
+ : null
};
using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, logger))
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/XunitLogger.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/XunitLogger.cs
new file mode 100644
index 000000000..47ee01c3b
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/XunitLogger.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// See License.txt in the project root for license information
+
+using System;
+using System.Linq;
+using Microsoft.Extensions.Logging;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Testing
+{
+ public class XunitLogger : ILogger, IDisposable
+ {
+ private readonly ITestOutputHelper _output;
+ private readonly string _categoryName;
+
+ public XunitLogger(ITestOutputHelper output, string categoryName)
+ {;
+ _output = output;
+ _categoryName = categoryName;
+ }
+
+ public void Log(
+ LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter)
+ {
+ var firstLinePrefix = $"| {logLevel} [{_categoryName}]: ";
+ var lines = formatter(state, exception).Split('\n');
+ _output.WriteLine(firstLinePrefix + lines.First());
+
+ var additionalLinePrefix = "|" + new string(' ', firstLinePrefix.Length - 1);
+ foreach (var line in lines.Skip(1))
+ {
+ _output.WriteLine(additionalLinePrefix + line.Trim('\r'));
+ }
+ }
+
+ public bool IsEnabled(LogLevel logLevel) => true;
+
+ public IDisposable BeginScope(TState state)
+ => new NullScope();
+
+ private class NullScope : IDisposable
+ {
+ public void Dispose()
+ {
+ }
+ }
+
+ public void Dispose()
+ {
+ }
+ }
+}
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/XunitLoggerProvider.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/XunitLoggerProvider.cs
new file mode 100644
index 000000000..c42129d40
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/XunitLoggerProvider.cs
@@ -0,0 +1,26 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// See License.txt in the project root for license information
+
+using Microsoft.Extensions.Logging;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Testing
+{
+ class XunitLoggerProvider : ILoggerProvider
+ {
+ private readonly ITestOutputHelper _output;
+
+ public XunitLoggerProvider(ITestOutputHelper output)
+ {
+ _output = output;
+ }
+ public ILogger CreateLogger(string categoryName)
+ {
+ return new XunitLogger(_output, categoryName);
+ }
+
+ public void Dispose()
+ {
+ }
+ }
+}
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/project.json
deleted file mode 100644
index bbaddd37f..000000000
--- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/project.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "publishOptions": {
- "include": [
- "Http.config",
- "Https.config",
- "NtlmAuthentation.config"
- ]
- },
- "buildOptions": {
- "warningsAsErrors": true,
- "copyToOutput": {
- "include": [
- "Http.config",
- "Https.config",
- "NtlmAuthentation.config"
- ]
- }
- },
- "dependencies": {
- "dotnet-test-xunit": "2.2.0-*",
- "Microsoft.AspNetCore.Server.IntegrationTesting": "0.3.0-*",
- "Microsoft.Extensions.Logging": "1.2.0-*",
- "Microsoft.Extensions.Logging.Console": "1.2.0-*",
- "Microsoft.Extensions.Logging.Debug": "1.2.0-*",
- "NETStandard.Library": "1.6.2-*",
- "xunit": "2.2.0-*"
- },
- "frameworks": {
- "net451": {
- "frameworkAssemblies": {
- "System.Data": "",
- "System.Net.Http": "",
- "System.Net.Http.WebRequest": "",
- "System.Runtime": "",
- "System.Xml": ""
- }
- }
- },
- "testRunner": "xunit",
- "runtimes": {
- "win7-x86": {},
- "win7-x64": {}
- }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj
new file mode 100644
index 000000000..d1bb39954
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj
@@ -0,0 +1,21 @@
+
+
+
+
+
+ netcoreapp1.1;net451
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.xproj b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.xproj
deleted file mode 100644
index 8b22b6e6e..000000000
--- a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.xproj
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 4106db10-e09f-480e-9ce6-b39235512ee6
- .\obj
- .\bin\
-
-
- 2.0
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/project.json b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/project.json
deleted file mode 100644
index 06f2ff125..000000000
--- a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/project.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "version": "1.1.0-*",
- "buildOptions": {
- "keyFile": "../../tools/Key.snk"
- },
- "dependencies": {
- "dotnet-test-xunit": "2.2.0-*",
- "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*",
- "Microsoft.AspNetCore.TestHost": "1.2.0-*",
- "xunit": "2.2.0-*"
- },
- "frameworks": {
- "netcoreapp1.1": {
- "dependencies": {
- "Microsoft.NETCore.App": {
- "version": "1.2.0-*",
- "type": "platform"
- }
- }
- },
- "net451": {}
- },
- "testRunner": "xunit"
-}
\ No newline at end of file
diff --git a/test/TestSites.Standalone/Program.cs b/test/TestSites.Standalone/Program.cs
deleted file mode 100644
index a20e9fc4a..000000000
--- a/test/TestSites.Standalone/Program.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.AspNetCore.Hosting;
-
-namespace TestSites.Standalone
-{
- public static class Program
- {
- public static void Main(string[] args)
- {
- var host = new WebHostBuilder()
- .UseIISIntegration()
- .UseStartup("TestSites.Standalone")
- .UseKestrel()
- .Build();
-
- host.Run();
- }
- }
-}
-
diff --git a/test/TestSites.Standalone/TestSites.Standalone.xproj b/test/TestSites.Standalone/TestSites.Standalone.xproj
deleted file mode 100644
index 5e32a0742..000000000
--- a/test/TestSites.Standalone/TestSites.Standalone.xproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- e27453ad-9ca0-49a2-94fa-96337d77677d
- .\obj
- .\bin\
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/test/TestSites.Standalone/project.json b/test/TestSites.Standalone/project.json
deleted file mode 100644
index f153b8e2c..000000000
--- a/test/TestSites.Standalone/project.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "version": "1.1.0-*",
- "buildOptions": {
- "emitEntryPoint": true,
- "compile": {
- "include": "../TestSites/Startup*.cs"
- }
- },
- "publishOptions": {
- "include": [
- "web.config"
- ]
- },
- "dependencies": {
- "Microsoft.AspNetCore.AspNetCoreModule": "1.0.0-*",
- "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*",
- "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*",
- "Microsoft.AspNetCore.WebUtilities": "1.2.0-*",
- "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.2.0-*",
- "Microsoft.Extensions.Configuration.Json": "1.2.0-*",
- "Microsoft.Extensions.Logging.Console": "1.2.0-*",
- "xunit": "2.2.0-*"
- },
- "frameworks": {
- "netcoreapp1.1": {
- "dependencies": {
- "Microsoft.NETCore.App": "1.2.0-*"
- }
- }
- },
- "tools": {
- "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-*"
- },
- "scripts": {
- "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
- },
- "runtimes": {
- "win7-x64": {},
- "win7-x86": {},
- "osx.10.10-x64": {},
- "osx.10.11-x64": {},
- "osx.10.12-x64": {},
- "ubuntu.14.04-x64": {},
- "ubuntu.15.04-x64": {}
- }
-}
\ No newline at end of file
diff --git a/test/TestSites.Standalone/web.config b/test/TestSites.Standalone/web.config
deleted file mode 100644
index d889af8ba..000000000
--- a/test/TestSites.Standalone/web.config
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/TestSites/.notest b/test/TestSites/.notest
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/TestSites.Standalone/Properties/launchSettings.json b/test/TestSites/Properties/launchSettings.json
similarity index 60%
rename from test/TestSites.Standalone/Properties/launchSettings.json
rename to test/TestSites/Properties/launchSettings.json
index e5322bfd5..e68a14535 100644
--- a/test/TestSites.Standalone/Properties/launchSettings.json
+++ b/test/TestSites/Properties/launchSettings.json
@@ -3,7 +3,7 @@
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
- "applicationUrl": "http://localhost:25334/",
+ "applicationUrl": "http://localhost:29247/",
"sslPort": 0
}
},
@@ -16,12 +16,7 @@
}
},
"TestSites": {
- "commandName": "Project",
- "launchBrowser": true,
- "launchUrl": "http://localhost:5000",
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
+ "commandName": "Project"
}
}
-}
+}
\ No newline at end of file
diff --git a/test/TestSites/TestSites.csproj b/test/TestSites/TestSites.csproj
new file mode 100644
index 000000000..a8b9d56d4
--- /dev/null
+++ b/test/TestSites/TestSites.csproj
@@ -0,0 +1,24 @@
+
+
+
+
+
+ netcoreapp1.1;net451
+ win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.15.04-x64
+
+ win7-x64
+ Exe
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/TestSites/TestSites.xproj b/test/TestSites/TestSites.xproj
deleted file mode 100644
index 477f1c67d..000000000
--- a/test/TestSites/TestSites.xproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- f54715c3-88d8-49e3-a291-c13570fe81fc
- .\obj
- .\bin\
-
-
- 2.0
-
-
-
diff --git a/test/TestSites/project.json b/test/TestSites/project.json
deleted file mode 100644
index 1e836fdca..000000000
--- a/test/TestSites/project.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "version": "1.1.0-*",
- "buildOptions": {
- "emitEntryPoint": true
- },
- "publishOptions": {
- "include": [
- "web.config"
- ]
- },
- "dependencies": {
- "Microsoft.AspNetCore.AspNetCoreModule": "1.0.0-*",
- "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*",
- "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*",
- "Microsoft.AspNetCore.WebUtilities": "1.2.0-*",
- "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.2.0-*",
- "Microsoft.Extensions.Configuration.Json": "1.2.0-*",
- "Microsoft.Extensions.Logging.Console": "1.2.0-*",
- "xunit": "2.2.0-*"
- },
- "frameworks": {
- "netcoreapp1.1": {
- "dependencies": {
- "Microsoft.NETCore.App": {
- "version": "1.2.0-*",
- "type": "platform"
- }
- }
- },
- "net451": {}
- },
- "tools": {
- "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-*"
- },
- "scripts": {
- "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
- }
-}
\ No newline at end of file
diff --git a/version.props b/version.props
new file mode 100644
index 000000000..17fd5ac36
--- /dev/null
+++ b/version.props
@@ -0,0 +1,7 @@
+
+
+
+ 1.2.0
+ preview1
+
+