diff --git a/AspNetCoreModule.sln b/AspNetCoreModule.sln
index fa80b87d35..a6d854e59b 100644
--- a/AspNetCoreModule.sln
+++ b/AspNetCoreModule.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.27107.1
+VisualStudioVersion = 15.0.27110.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCore\AspNetCore.vcxproj", "{439824F9-1455-4CC4-BD79-B44FA0A16552}"
ProjectSection(ProjectDependencies) = postProject
@@ -23,8 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
NuGet.Config = NuGet.Config
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebSocketClientEXE", "test\WebSocketClientEXE\WebSocketClientEXE.csproj", "{4062EA94-75F5-4691-86DC-C8594BA896DE}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -36,8 +34,8 @@ Global
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|Win32.ActiveCfg = Debug|Win32
- {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|Win32.Build.0 = Debug|Win32
+ {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|Win32.ActiveCfg = Release|x64
+ {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|Win32.Build.0 = Release|x64
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x64.ActiveCfg = Debug|x64
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x64.Build.0 = Debug|x64
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|Any CPU.ActiveCfg = Release|Win32
@@ -46,8 +44,8 @@ Global
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.ActiveCfg = Release|x64
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.Build.0 = Release|x64
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Win32.ActiveCfg = Debug|Win32
- {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Win32.Build.0 = Debug|Win32
+ {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Win32.ActiveCfg = Release|x64
+ {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Win32.Build.0 = Release|x64
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.ActiveCfg = Debug|x64
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.Build.0 = Debug|x64
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|Any CPU.ActiveCfg = Release|Win32
@@ -79,18 +77,6 @@ Global
{030225D8-4EE8-47E5-B692-2A96B3B51A38}.Release|Win32.Build.0 = Release|Any CPU
{030225D8-4EE8-47E5-B692-2A96B3B51A38}.Release|x64.ActiveCfg = Release|Any CPU
{030225D8-4EE8-47E5-B692-2A96B3B51A38}.Release|x64.Build.0 = Release|Any CPU
- {4062EA94-75F5-4691-86DC-C8594BA896DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4062EA94-75F5-4691-86DC-C8594BA896DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4062EA94-75F5-4691-86DC-C8594BA896DE}.Debug|Win32.ActiveCfg = Debug|Any CPU
- {4062EA94-75F5-4691-86DC-C8594BA896DE}.Debug|Win32.Build.0 = Debug|Any CPU
- {4062EA94-75F5-4691-86DC-C8594BA896DE}.Debug|x64.ActiveCfg = Debug|Any CPU
- {4062EA94-75F5-4691-86DC-C8594BA896DE}.Debug|x64.Build.0 = Debug|Any CPU
- {4062EA94-75F5-4691-86DC-C8594BA896DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4062EA94-75F5-4691-86DC-C8594BA896DE}.Release|Any CPU.Build.0 = Release|Any CPU
- {4062EA94-75F5-4691-86DC-C8594BA896DE}.Release|Win32.ActiveCfg = Release|Any CPU
- {4062EA94-75F5-4691-86DC-C8594BA896DE}.Release|Win32.Build.0 = Release|Any CPU
- {4062EA94-75F5-4691-86DC-C8594BA896DE}.Release|x64.ActiveCfg = Release|Any CPU
- {4062EA94-75F5-4691-86DC-C8594BA896DE}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -100,7 +86,6 @@ Global
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE} = {FDD2EDF8-1B62-4978-9815-9D95260B8B91}
{4DDA7560-AA29-4161-A5EA-A7E8F3997321} = {02F461DC-5166-4E88-AAD5-CF110016A647}
{030225D8-4EE8-47E5-B692-2A96B3B51A38} = {02F461DC-5166-4E88-AAD5-CF110016A647}
- {4062EA94-75F5-4691-86DC-C8594BA896DE} = {02F461DC-5166-4E88-AAD5-CF110016A647}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0967E9B4-FEE7-40D7-860A-23E340E65840}
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000000..84b1730184
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,13 @@
+
+
+
+
+
+ Microsoft ASP.NET Core
+ https://github.com/aspnet/AspNetCoreModule
+ git
+ $(MSBuildThisFileDirectory)build\Key.snk
+ true
+ true
+
+
\ No newline at end of file
diff --git a/build/Build.Settings b/build/Build.Settings
index ae2912343a..371ec56452 100644
--- a/build/Build.Settings
+++ b/build/Build.Settings
@@ -1,6 +1,5 @@
-
$(MSBuildThisFileDirectory)..\
Debug
diff --git a/build/Version.props b/build/Version.props
deleted file mode 100644
index f5ae3f4b01..0000000000
--- a/build/Version.props
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- 7
- 1
- 1987
- -RTM
-
-
diff --git a/build/common.props b/build/common.props
deleted file mode 100644
index 940c1db088..0000000000
--- a/build/common.props
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
- Microsoft ASP.NET Core
- https://github.com/aspnet/AspNetCoreModule
- git
- $(MSBuildThisFileDirectory)Key.snk
- true
- true
- $(VersionSuffix)-$(BuildNumber)
-
-
-
- RunConfiguration.TargetPlatform=x64
-
-
-
-
-
-
-
diff --git a/build/dependencies.props b/build/dependencies.props
index 37991cfb7d..3524f8edcb 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,9 +1,21 @@
-
+
- 1.2.0-*
- 2.1.1-*
- 15.3.0
- 0.6.1
- 2.3.0-beta4-build3742
+ $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
+
+
+ 2.1.0-preview1-15549
+ 2.0.0
+ 2.1.0-preview1-27424
+ 2.0.0
+ 2.0.0
+ 2.0.0
+ 1.1.0
+ 2.0.0
+ 15.3.0
+ 7.0.0
+ 10.0.10586
+ 4.4.0
+ 2.3.1
+ 2.3.1
\ No newline at end of file
diff --git a/build/repo.props b/build/repo.props
index f38e6b5141..9df3355343 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -1,11 +1,17 @@
-
+
- RunConfiguration.TargetPlatform=x64
+ x64
+
+
+
+
+ Internal.AspNetCore.Universe.Lineup
+ https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 7c709d9092..5f7f568497 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-preview1-15552
-commithash:4af2f444ec8cba0faa866dd867370e6aa6df69ea
+version:2.1.0-preview1-15555
+commithash:97b60e251fce2680a08866ab977aa7e3b4f92b86
diff --git a/test/AspNetCoreModule.Test/AspNetCoreModule.Test.csproj b/test/AspNetCoreModule.Test/AspNetCoreModule.Test.csproj
index eba88b8832..924806ae08 100644
--- a/test/AspNetCoreModule.Test/AspNetCoreModule.Test.csproj
+++ b/test/AspNetCoreModule.Test/AspNetCoreModule.Test.csproj
@@ -1,8 +1,6 @@
-
-
- net46
+ net461
true
true
AspNetCoreModule.Test
@@ -19,18 +17,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/AspNetCoreModule.TestSites.Standard/AspNetCoreModule.TestSites.Standard.csproj b/test/AspNetCoreModule.TestSites.Standard/AspNetCoreModule.TestSites.Standard.csproj
index ad4431d629..3cac8887c4 100644
--- a/test/AspNetCoreModule.TestSites.Standard/AspNetCoreModule.TestSites.Standard.csproj
+++ b/test/AspNetCoreModule.TestSites.Standard/AspNetCoreModule.TestSites.Standard.csproj
@@ -3,6 +3,6 @@
netcoreapp2.0
-
+
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
new file mode 100644
index 0000000000..e9a0d8089f
--- /dev/null
+++ b/test/Directory.Build.props
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/WebSocketClientEXE/WebSocketClientEXE.csproj b/test/WebSocketClientEXE/WebSocketClientEXE.csproj
index 67a5fa5efe..486d2188af 100644
--- a/test/WebSocketClientEXE/WebSocketClientEXE.csproj
+++ b/test/WebSocketClientEXE/WebSocketClientEXE.csproj
@@ -1,17 +1,6 @@
-
- Debug
- AnyCPU
- {4062EA94-75F5-4691-86DC-C8594BA896DE}
- Exe
- WebSocketClientEXE
- WebSocketClientEXE
- v4.6
- 512
- true
-
AnyCPU
true
diff --git a/version.props b/version.props
new file mode 100644
index 0000000000..3b7fe5c4ce
--- /dev/null
+++ b/version.props
@@ -0,0 +1,12 @@
+
+
+ 7
+ 1
+ 1987
+ -RTM
+ $(VersionPrefix)
+ $(VersionPrefix)-$(VersionSuffix)-final
+ t000
+ $(VersionSuffix)-$(BuildNumber)
+
+
\ No newline at end of file
diff --git a/version.xml b/version.xml
deleted file mode 100644
index ebc4d03121..0000000000
--- a/version.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
- dev
-
-