diff --git a/AzureIntegration.sln b/AzureIntegration.sln
index fc19f48496..38b55a072a 100644
--- a/AzureIntegration.sln
+++ b/AzureIntegration.sln
@@ -1,9 +1,9 @@
-
+
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("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.AzureAppServicesIntegration", "src\Microsoft.AspNetCore.AzureAppServicesIntegration\Microsoft.AspNetCore.AzureAppServicesIntegration.xproj", "{5916BEB5-0969-469B-976C-A392E015DFAC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.AzureAppServicesIntegration", "src\Microsoft.AspNetCore.AzureAppServicesIntegration\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj", "{5916BEB5-0969-469B-976C-A392E015DFAC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FF9B744E-6C59-40CC-9E41-9D2EBD292435}"
EndProject
@@ -13,18 +13,27 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.AzureA
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2FFE2B87-BF8A-4B38-ADAB-2FE2F9BC4A7C}"
ProjectSection(SolutionItems) = preProject
- global.json = global.json
NuGet.config = NuGet.config
EndProjectSection
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AzureAppServicesSample", "sample\AzureAppServicesSample\AzureAppServicesSample.xproj", "{05A4D308-B162-4194-BC5E-88CCB4DBD318}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureAppServicesSample", "sample\AzureAppServicesSample\AzureAppServicesSample.csproj", "{05A4D308-B162-4194-BC5E-88CCB4DBD318}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{37237C93-6855-40D9-9E60-418B093EF49A}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CD650B4B-81C2-4A44-AEF2-A251A877C1F0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.AspNetCore.AzureAppServicesIntegration.Tests", "Microsoft.AspNetCore.AzureAppServicesIntegration.Tests", "{6DF043FC-D3A8-4838-A669-B40115331C10}"
+EndProject
+Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Microsoft.AspNetCore.AzureAppServicesIntegration.Tests", "test\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj", "{9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5916BEB5-0969-469B-976C-A392E015DFAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -39,6 +48,18 @@ Global
{05A4D308-B162-4194-BC5E-88CCB4DBD318}.Debug|Any CPU.Build.0 = Debug|Any CPU
{05A4D308-B162-4194-BC5E-88CCB4DBD318}.Release|Any CPU.ActiveCfg = Release|Any CPU
{05A4D308-B162-4194-BC5E-88CCB4DBD318}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Debug|x64.ActiveCfg = Debug|x64
+ {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Debug|x64.Build.0 = Debug|x64
+ {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Debug|x86.ActiveCfg = Debug|x86
+ {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Debug|x86.Build.0 = Debug|x86
+ {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Release|x64.ActiveCfg = Release|x64
+ {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Release|x64.Build.0 = Release|x64
+ {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Release|x86.ActiveCfg = Release|x86
+ {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -47,5 +68,7 @@ Global
{5916BEB5-0969-469B-976C-A392E015DFAC} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435}
{4106DB10-E09F-480E-9CE6-B39235512EE6} = {33C2323B-0BCC-471B-86D0-AF872FDC7BEA}
{05A4D308-B162-4194-BC5E-88CCB4DBD318} = {37237C93-6855-40D9-9E60-418B093EF49A}
+ {6DF043FC-D3A8-4838-A669-B40115331C10} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0}
+ {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA} = {6DF043FC-D3A8-4838-A669-B40115331C10}
EndGlobalSection
EndGlobal
diff --git a/NuGet.config b/NuGet.config
index 826a1f9035..8e65695611 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,7 +1,8 @@
-
+
+
-
\ No newline at end of file
+
diff --git a/appveyor.yml b/appveyor.yml
index b9a9bcd1e6..741873cbe5 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 2015
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..100a51d4cd
--- /dev/null
+++ b/build/common.props
@@ -0,0 +1,24 @@
+
+
+
+
+ Microsoft ASP.NET Core
+ https://github.com/aspnet/AzureIntegration
+ 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/makefile.shade b/makefile.shade
deleted file mode 100644
index 7246a0fc8f..0000000000
--- a/makefile.shade
+++ /dev/null
@@ -1,64 +0,0 @@
-use import="Environment"
-
-var VERSION='0.1'
-var FULL_VERSION='0.1'
-var AUTHORS='Microsoft Open Technologies, Inc.'
-
-use-standard-lifecycle
-k-standard-goals
-
-var Configuration_Local = '${E("Configuration")}'
-default BASE_DIR_LOCAL='${Directory.GetCurrentDirectory()}'
-default TARGET_DIR_LOCAL='${Path.Combine(BASE_DIR_LOCAL, "artifacts")}'
-default BUILD_DIR_LOCAL='${Path.Combine(TARGET_DIR_LOCAL, "build")}'
-default SRC_PROJECT_GLOB_LOCAL="src/*/project.json"
-default TEST_PROJECT_GLOB_LOCAL="test/*/project.json"
-
-#build-compile target='compile' if='Directory.Exists("src")'
- @{
- // Don't remove the if clause in the target above - removing it will break CI test runs.
-
- Directory.CreateDirectory(TARGET_DIR_LOCAL);
-
- string commitHash = null;
- if (AddAssemblyInfo)
- {
- var commitHashFile = Path.Combine(TARGET_DIR_LOCAL, "commit");
- GitCommand("rev-parse HEAD >> " + commitHashFile);
- commitHash = File.ReadAllLines(commitHashFile)[0];
- }
-
- var srcProjects = Files.Include(SRC_PROJECT_GLOB_LOCAL).ToList();
- if (IsLinux)
- {
- srcProjects.Remove("src/Microsoft.AspNetCore.DataProtection.SystemWeb/project.json");
- }
- srcProjects.ForEach(projectFile =>
- {
- if (AddAssemblyInfo)
- {
- var projectText = File.ReadAllText(projectFile);
- var project = (JsonObject)Json.Deserialize(projectText);
- var isSharedProject = project.Keys.Contains("shared");
-
- // We don't want to embed the commit hash in it because
- // the consumers would get that file
- if (!isSharedProject)
- {
- Console.WriteLine("Embedding commit hash in assembly");
- var projectFolder = Path.GetDirectoryName(projectFile);
- var commitHashAttribute = String.Format("[assembly: System.Reflection.AssemblyMetadata(\"CommitHash\", \"{0}\")]", commitHash);
-
- var buildInfoFile = Path.Combine(projectFolder, "BuildInfo.generated.cs");
- File.WriteAllText(buildInfoFile, commitHashAttribute);
- }
- }
- DotnetPack(projectFile, BUILD_DIR_LOCAL, Configuration_Local, "");
- });
- DotnetBuild(TEST_PROJECT_GLOB_LOCAL, Configuration_Local, BuildFramework);
-
- foreach (var nupkg in Files.Include(Path.Combine(BUILD_DIR_LOCAL, "*/" + Configuration_Local + "/*.nupkg")))
- {
- File.Copy(nupkg, Path.Combine(BUILD_DIR_LOCAL, Path.GetFileName(nupkg)), true);
- }
- }
\ No newline at end of file
diff --git a/sample/AzureAppServicesSample/AzureAppServicesSample.csproj b/sample/AzureAppServicesSample/AzureAppServicesSample.csproj
new file mode 100644
index 0000000000..922e4ebbf8
--- /dev/null
+++ b/sample/AzureAppServicesSample/AzureAppServicesSample.csproj
@@ -0,0 +1,23 @@
+
+
+
+ net451;netcoreapp1.1
+ win7-x64
+ Exe
+ $(PackageTargetFallback);portable-net40+sl5+win8+wp8+wpa81;portable-net45+win8+wp8+wpa81
+ 1.2.0-*
+
+
+
+
+ PreserveNewest
+
+
+
+
+
+
+
+
+
+
diff --git a/sample/AzureAppServicesSample/AzureAppServicesSample.xproj b/sample/AzureAppServicesSample/AzureAppServicesSample.xproj
deleted file mode 100644
index 54972a2230..0000000000
--- a/sample/AzureAppServicesSample/AzureAppServicesSample.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- 14.0.25420
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 05a4d308-b162-4194-bc5e-88ccb4dbd318
- AzureAppServicesSample
- .\obj
- .\bin\
-
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/sample/AzureAppServicesSample/project.json b/sample/AzureAppServicesSample/project.json
deleted file mode 100644
index feaf5de88b..0000000000
--- a/sample/AzureAppServicesSample/project.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "version": "1.2.0-*",
- "dependencies": {
- "Microsoft.AspNetCore.AzureAppServicesIntegration": "1.0.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"
- }
- },
- "imports": [
- "portable-net40+sl5+win8+wp8+wpa81",
- "portable-net45+win8+wp8+wpa81"
- ]
- }
- },
- "publishOptions": {
- "include": [
- "web.config"
- ]
- }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj b/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj
new file mode 100644
index 0000000000..4117a1ba88
--- /dev/null
+++ b/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj
@@ -0,0 +1,21 @@
+
+
+
+
+
+ ASP.NET Core integration with Azure AppServices.
+ net451;netstandard1.3
+ $(NoWarn);CS1591
+ true
+ true
+ aspnetcore;azure;appservices
+ $(PackageTargetFallback);portable-net40+sl5+win8+wp8+wpa81;portable-net45+win8+wp8+wpa81
+
+
+
+
+
+
+
+
+
diff --git a/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.xproj b/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.xproj
deleted file mode 100644
index dc3c1475fd..0000000000
--- a/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.xproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 5916beb5-0969-469b-976c-a392e015dfac
- $(Name)
- .\obj
- .\bin\
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Properties/AssemblyInfo.cs
index e55c7255e2..15e5bb66e2 100644
--- a/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Properties/AssemblyInfo.cs
@@ -1,14 +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: InternalsVisibleTo("Microsoft.AspNetCore.Hosting.Azure.AppServices.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.AzureAppServicesIntegration/project.json b/src/Microsoft.AspNetCore.AzureAppServicesIntegration/project.json
deleted file mode 100644
index 19d39eb967..0000000000
--- a/src/Microsoft.AspNetCore.AzureAppServicesIntegration/project.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "version": "1.1.0-*",
- "description": "ASP.NET Core integration with Azure AppServices.",
- "packOptions": {
- "repository": {
- "type": "git",
- "url": "git://github.com/aspnet/azureintegration"
- },
- "tags": [
- "aspnetcore",
- "azure",
- "appservices"
- ]
- },
- "dependencies": {
- "Microsoft.AspNetCore.Hosting.Abstractions": "1.2.0-*",
- "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*",
- "Microsoft.Extensions.Logging.AzureAppServices": "1.1.0-*"
- },
- "frameworks": {
- "net451": {
- "frameworkAssemblies": {}
- },
- "netstandard1.3": {
- "imports": [
- "portable-net40+sl5+win8+wp8+wpa81",
- "portable-net45+win8+wp8+wpa81"
- ]
- }
- },
- "buildOptions": {
- "allowUnsafe": true,
- "warningsAsErrors": true,
- "keyFile": "../../tools/Key.snk",
- "nowarn": [
- "CS1591"
- ],
- "xmlDoc": true
- }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Test.xproj b/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Test.xproj
deleted file mode 100644
index 8b22b6e6e7..0000000000
--- a/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Test.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.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj b/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj
new file mode 100644
index 0000000000..ffe7e563bb
--- /dev/null
+++ b/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj
@@ -0,0 +1,19 @@
+
+
+
+
+
+ netcoreapp1.1;net451
+ $(PackageTargetFallback);portable-net40+sl5+win8+wp8+wpa81;portable-net45+win8+wp8+wpa81
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/project.json b/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/project.json
deleted file mode 100644
index 6825b0594a..0000000000
--- a/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/project.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "version": "1.2.0-*",
- "buildOptions": {
- "keyFile": "../../tools/Key.snk"
- },
- "dependencies": {
- "dotnet-test-xunit": "2.2.0-*",
- "Microsoft.AspNetCore.AzureAppServicesIntegration": "1.1.0-*",
- "Microsoft.AspNetCore.TestHost": "1.2.0-*",
- "xunit": "2.2.0-*",
- "Moq": "4.6.36-*"
- },
- "frameworks": {
- "netcoreapp1.1": {
- "dependencies": {
- "Microsoft.NETCore.App": {
- "version": "1.2.0-*",
- "type": "platform"
- }
- },
- "imports": [
- "portable-net40+sl5+win8+wp8+wpa81",
- "portable-net45+win8+wp8+wpa81"
- ]
- },
- "net451": {}
- },
- "testRunner": "xunit"
-}
\ No newline at end of file
diff --git a/version.props b/version.props
new file mode 100644
index 0000000000..cd53f064e5
--- /dev/null
+++ b/version.props
@@ -0,0 +1,7 @@
+
+
+
+ 1.1.0
+ preview1
+
+