diff --git a/NuGet.config b/NuGet.config
index 0fd623ffdd..8e65695611 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,7 +1,8 @@
-
+
+
diff --git a/ResponseCaching.sln b/ResponseCaching.sln
index 43b8d0f0b8..23eb129413 100644
--- a/ResponseCaching.sln
+++ b/ResponseCaching.sln
@@ -1,7 +1,7 @@
-
+
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26127.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{367AABAF-E03C-4491-A9A7-BDDE8903D1B4}"
EndProject
@@ -9,18 +9,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C51D
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{89A50974-E9D4-4F87-ACF2-6A6005E64931}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ResponseCachingSample", "samples\ResponseCachingSample\ResponseCachingSample.xproj", "{1139BDEE-FA15-474D-8855-0AB91F23CF26}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResponseCachingSample", "samples\ResponseCachingSample\ResponseCachingSample.csproj", "{1139BDEE-FA15-474D-8855-0AB91F23CF26}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F787A492-C2FF-4569-A663-F8F24B900657}"
- ProjectSection(SolutionItems) = preProject
- global.json = global.json
- EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.ResponseCaching.Tests", "test\Microsoft.AspNetCore.ResponseCaching.Tests\Microsoft.AspNetCore.ResponseCaching.Tests.csproj", "{151B2027-3936-44B9-A4A0-E1E5902125AB}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.ResponseCaching.Tests", "test\Microsoft.AspNetCore.ResponseCaching.Tests\Microsoft.AspNetCore.ResponseCaching.Tests.xproj", "{151B2027-3936-44B9-A4A0-E1E5902125AB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.ResponseCaching", "src\Microsoft.AspNetCore.ResponseCaching\Microsoft.AspNetCore.ResponseCaching.csproj", "{D1031270-DBD3-4F02-A3DC-3E7DADE8EBE6}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.ResponseCaching", "src\Microsoft.AspNetCore.ResponseCaching\Microsoft.AspNetCore.ResponseCaching.xproj", "{D1031270-DBD3-4F02-A3DC-3E7DADE8EBE6}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.ResponseCaching.Abstractions", "src\Microsoft.AspNetCore.ResponseCaching.Abstractions\Microsoft.AspNetCore.ResponseCaching.Abstractions.xproj", "{2D1022E8-CBB6-478D-A420-CB888D0EF7B7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.ResponseCaching.Abstractions", "src\Microsoft.AspNetCore.ResponseCaching.Abstractions\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj", "{2D1022E8-CBB6-478D-A420-CB888D0EF7B7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/appveyor.yml b/appveyor.yml
index b9a9bcd1e6..df67923781 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,4 +10,5 @@ build_script:
- build.cmd verify
clone_depth: 1
test: off
-deploy: off
\ No newline at end of file
+deploy: off
+os: Visual Studio 2017 RC
diff --git a/build.ps1 b/build.ps1
index 8f2f99691a..0605b59c01 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 4fd7ede788..07997d6c83 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 0000000000..8c19f09a32
--- /dev/null
+++ b/build/common.props
@@ -0,0 +1,24 @@
+
+
+
+
+ Microsoft ASP.NET Core
+ https://github.com/aspnet/ResponseCaching
+ 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 0ad1995dd2..0000000000
--- 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/samples/ResponseCachingSample/ResponseCachingSample.csproj b/samples/ResponseCachingSample/ResponseCachingSample.csproj
new file mode 100644
index 0000000000..a86b0e11b3
--- /dev/null
+++ b/samples/ResponseCachingSample/ResponseCachingSample.csproj
@@ -0,0 +1,17 @@
+
+
+
+ net451;netcoreapp1.1
+
+ win7-x64
+ Exe
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ResponseCachingSample/ResponseCachingSample.xproj b/samples/ResponseCachingSample/ResponseCachingSample.xproj
deleted file mode 100644
index 43167a3606..0000000000
--- a/samples/ResponseCachingSample/ResponseCachingSample.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 1139bdee-fa15-474d-8855-0ab91f23cf26
- ResponseCachingSample
- .\obj
- .\bin\
-
-
- 2.0
- 2931
-
-
-
\ No newline at end of file
diff --git a/samples/ResponseCachingSample/project.json b/samples/ResponseCachingSample/project.json
deleted file mode 100644
index fde231f6d4..0000000000
--- a/samples/ResponseCachingSample/project.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "dependencies": {
- "Microsoft.AspNetCore.ResponseCaching": "1.2.0-*",
- "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*",
- "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*",
- "Microsoft.Extensions.Caching.Memory": "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.0.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.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj b/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj
new file mode 100644
index 0000000000..2cdfa4d58a
--- /dev/null
+++ b/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj
@@ -0,0 +1,16 @@
+
+
+
+
+
+ ASP.NET Core response caching middleware abstractions and feature interface definitions.
+ net451;netstandard1.3
+ true
+ aspnetcore;cache;caching
+
+
+
+
+
+
+
diff --git a/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.xproj b/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.xproj
deleted file mode 100644
index d06ce2e8f9..0000000000
--- a/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
-
- 2d1022e8-cbb6-478d-a420-cb888d0ef7b7
- Microsoft.AspNetCore.ResponseCaching.Abstractions
- .\obj
- .\bin\
- v4.5.2
-
-
-
- 2.0
-
-
-
diff --git a/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Properties/AssemblyInfo.cs
deleted file mode 100644
index 32dcddfc57..0000000000
--- a/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,11 +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 System.Reflection;
-using System.Resources;
-
-[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")]
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/project.json b/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/project.json
deleted file mode 100644
index db41492279..0000000000
--- a/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/project.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "version": "1.2.0-*",
- "buildOptions": {
- "warningsAsErrors": true,
- "keyFile": "../../tools/Key.snk",
- "xmlDoc": true
- },
- "description": "ASP.NET Core response caching middleware abstractions and feature interface definitions.",
- "packOptions": {
- "repository": {
- "type": "git",
- "url": "git://github.com/aspnet/ResponseCaching"
- },
- "tags": [
- "aspnetcore",
- "cache",
- "caching"
- ]
- },
- "dependencies": {
- "Microsoft.Extensions.Primitives": "1.2.0-*"
- },
- "frameworks": {
- "net451": {},
- "netstandard1.3": {
- "dependencies": {
- "NETStandard.Library": "1.6.2-*"
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj b/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj
new file mode 100644
index 0000000000..aa20232fa8
--- /dev/null
+++ b/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj
@@ -0,0 +1,23 @@
+
+
+
+
+
+ ASP.NET Core middleware for caching HTTP responses on the server.
+ net451;netstandard1.3
+ $(NoWarn);CS1591
+ true
+ true
+ aspnetcore;cache;caching
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.xproj b/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.xproj
deleted file mode 100644
index a4d4533df7..0000000000
--- a/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- d1031270-dbd3-4f02-a3dc-3e7dade8ebe6
-
-
- .\obj
- .\bin\
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.ResponseCaching/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.ResponseCaching/Properties/AssemblyInfo.cs
index f6017986e9..7a0fd0e4de 100644
--- a/src/Microsoft.AspNetCore.ResponseCaching/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.ResponseCaching/Properties/AssemblyInfo.cs
@@ -1,13 +1,6 @@
// 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: AssemblyMetadata("Serviceable", "True")]
-[assembly: NeutralResourcesLanguage("en-us")]
-[assembly: AssemblyCompany("Microsoft Corporation.")]
-[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft ASP.NET Core")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.ResponseCaching.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.ResponseCaching/project.json b/src/Microsoft.AspNetCore.ResponseCaching/project.json
deleted file mode 100644
index c4a0254f95..0000000000
--- a/src/Microsoft.AspNetCore.ResponseCaching/project.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": "1.2.0-*",
- "buildOptions": {
- "warningsAsErrors": true,
- "allowUnsafe": true,
- "keyFile": "../../tools/Key.snk",
- "nowarn": [
- "CS1591"
- ],
- "xmlDoc": true
- },
- "description": "ASP.NET Core middleware for caching HTTP responses on the server.",
- "packOptions": {
- "repository": {
- "type": "git",
- "url": "git://github.com/aspnet/ResponseCaching"
- },
- "tags": [
- "aspnetcore",
- "cache",
- "caching"
- ]
- },
- "dependencies": {
- "Microsoft.AspNetCore.Http": "1.2.0-*",
- "Microsoft.AspNetCore.Http.Extensions": "1.2.0-*",
- "Microsoft.AspNetCore.ResponseCaching.Abstractions": {
- "target": "project"
- },
- "Microsoft.Extensions.Caching.Memory": "1.2.0-*",
- "Microsoft.Extensions.Logging.Abstractions": "1.2.0-*",
- "Microsoft.Extensions.TaskCache.Sources": {
- "version": "1.2.0-*",
- "type": "build"
- },
- "NETStandard.Library": "1.6.2-*"
- },
- "frameworks": {
- "net451": {},
- "netstandard1.3": {}
- }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.csproj b/test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.csproj
new file mode 100644
index 0000000000..666a99690e
--- /dev/null
+++ b/test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.csproj
@@ -0,0 +1,19 @@
+
+
+
+
+
+ netcoreapp1.1;net451
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.xproj b/test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.xproj
deleted file mode 100644
index ea971b7729..0000000000
--- a/test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 151b2027-3936-44b9-a4a0-e1e5902125ab
- Microsoft.AspNetCore.ResponseCaching.Tests
- .\obj
- .\bin\
-
-
- 2.0
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json b/test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json
deleted file mode 100644
index 909d049885..0000000000
--- a/test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "buildOptions": {
- "warningsAsErrors": true,
- "keyFile": "../../tools/Key.snk"
- },
- "dependencies": {
- "dotnet-test-xunit": "2.2.0-*",
- "Microsoft.AspNetCore.ResponseCaching": "1.2.0-*",
- "Microsoft.AspNetCore.TestHost": "1.2.0-*",
- "Microsoft.Extensions.Logging.Testing": "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/version.props b/version.props
new file mode 100644
index 0000000000..17fd5ac36d
--- /dev/null
+++ b/version.props
@@ -0,0 +1,7 @@
+
+
+
+ 1.2.0
+ preview1
+
+