Permalink
Browse files

Updating to use cli

Fixes #3908
  • Loading branch information...
1 parent 779edb6 commit 5b805bb12db3e47b380038cf6aa5d149f9f02421 @pranavkm pranavkm committed Jan 14, 2016
Showing with 699 additions and 433 deletions.
  1. +2 −0 .gitattributes
  2. +2 −0 .gitignore
  3. +2 −3 .travis.yml
  4. +1 −1 appveyor.yml
  5. +32 −32 build.cmd
  6. +25 −20 build.sh
  7. +1 −0 samples/ActionConstraintSample.Web/Startup.cs
  8. +0 −3 samples/ActionConstraintSample.Web/hosting.json
  9. +9 −3 samples/ActionConstraintSample.Web/project.json
  10. +1 −0 samples/CustomRouteSample.Web/Startup.cs
  11. +0 −3 samples/CustomRouteSample.Web/hosting.json
  12. +8 −4 samples/CustomRouteSample.Web/project.json
  13. +1 −0 samples/EmbeddedViewSample.Web/Startup.cs
  14. +0 −3 samples/EmbeddedViewSample.Web/hosting.json
  15. +8 −4 samples/EmbeddedViewSample.Web/project.json
  16. +1 −0 samples/FormatFilterSample.Web/Startup.cs
  17. +0 −3 samples/FormatFilterSample.Web/hosting.json
  18. +6 −3 samples/FormatFilterSample.Web/project.json
  19. +1 −0 samples/InlineConstraintSample.Web/Startup.cs
  20. +0 −3 samples/InlineConstraintSample.Web/hosting.json
  21. +8 −4 samples/InlineConstraintSample.Web/project.json
  22. +1 −0 samples/JsonPatchSample.Web/Startup.cs
  23. +0 −3 samples/JsonPatchSample.Web/hosting.json
  24. +9 −3 samples/JsonPatchSample.Web/project.json
  25. +1 −0 samples/LocalizationSample.Web/Startup.cs
  26. +0 −3 samples/LocalizationSample.Web/hosting.json
  27. +8 −4 samples/LocalizationSample.Web/project.json
  28. +2 −1 samples/MvcSandbox/Startup.cs
  29. +0 −3 samples/MvcSandbox/hosting.json
  30. +6 −3 samples/MvcSandbox/project.json
  31. +1 −0 samples/MvcSubAreaSample.Web/Startup.cs
  32. +0 −3 samples/MvcSubAreaSample.Web/hosting.json
  33. +6 −3 samples/MvcSubAreaSample.Web/project.json
  34. +1 −0 samples/TagHelperSample.Web/Startup.cs
  35. +0 −3 samples/TagHelperSample.Web/hosting.json
  36. +6 −3 samples/TagHelperSample.Web/project.json
  37. +1 −0 samples/UrlHelperSample.Web/Startup.cs
  38. +0 −3 samples/UrlHelperSample.Web/hosting.json
  39. +8 −4 samples/UrlHelperSample.Web/project.json
  40. +3 −1 src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json
  41. +17 −0 src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DependencyContextAssemblyProvider.cs
  42. +1 −0 src/Microsoft.AspNetCore.Mvc.Core/project.json
  43. +3 −1 src/Microsoft.AspNetCore.Mvc.Cors/project.json
  44. +1 −0 src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json
  45. +3 −1 src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json
  46. +1 −0 src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json
  47. +3 −1 src/Microsoft.AspNetCore.Mvc.Localization/project.json
  48. +4 −21 src/Microsoft.AspNetCore.Mvc.Razor/Internal/DependencyContextCompilationService.cs
  49. +31 −24 src/Microsoft.AspNetCore.Mvc.Razor/Internal/DependencyContextRazorViewEngineOptionsSetup.cs
  50. +14 −7 src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptionsSetup.cs
  51. +1 −0 src/Microsoft.AspNetCore.Mvc.Razor/project.json
  52. +1 −0 src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json
  53. +3 −1 src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json
  54. +1 −0 src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json
  55. +3 −1 src/Microsoft.AspNetCore.Mvc/project.json
  56. +11 −3 test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json
  57. +11 −3 test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json
  58. +1 −2 test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
  59. +3 −1 test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultAssemblyProviderTests.cs
  60. +2 −2 test/Microsoft.AspNetCore.Mvc.Core.Test/NonDisposableStreamTest.cs
  61. +12 −3 test/Microsoft.AspNetCore.Mvc.Core.Test/project.json
  62. +11 −3 test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json
  63. +11 −3 test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json
  64. +11 −3 test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json
  65. +11 −3 test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json
  66. +2 −2 test/Microsoft.AspNetCore.Mvc.FunctionalTests/ActionConstraintSampleTest.cs
  67. +3 −3 test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs
  68. +2 −2 test/Microsoft.AspNetCore.Mvc.FunctionalTests/CustomRouteSampleTest.cs
  69. +2 −2 test/Microsoft.AspNetCore.Mvc.FunctionalTests/CustomUrlHelperTest.cs
  70. +2 −2 test/Microsoft.AspNetCore.Mvc.FunctionalTests/EmbeddedViewSampleTest.cs
  71. +2 −2 test/Microsoft.AspNetCore.Mvc.FunctionalTests/FormatFilterSampleTest.cs
  72. +2 −2 test/Microsoft.AspNetCore.Mvc.FunctionalTests/InlineConstraintSampleTest.cs
  73. +2 −2 test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonPatchSampleTest.cs
  74. +2 −2 test/Microsoft.AspNetCore.Mvc.FunctionalTests/LocalizationSampleTest.cs
  75. +2 −2 test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcEncodedTestFixtureOfT.cs
  76. +13 −0 test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSampleFixture.cs
  77. +2 −2 test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSandboxTest.cs
  78. +18 −8 test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs
  79. +0 −3 test/Microsoft.AspNetCore.Mvc.FunctionalTests/RouteDataTest.cs
  80. +2 −2 test/Microsoft.AspNetCore.Mvc.FunctionalTests/SubAreaTests.cs
  81. +2 −2 test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelperSampleTest.cs
  82. +14 −4 test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json
  83. +12 −3 test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json
  84. +11 −3 test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json
  85. +11 −3 test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json
  86. +2 −0 test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRoslynCompilationServiceTest.cs
  87. +13 −2 test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ExpressionRewriterTest.cs
  88. +12 −5 test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json
  89. +11 −3 test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json
  90. +4 −0 test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs
  91. +21 −5 test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs
  92. +14 −4 test/Microsoft.AspNetCore.Mvc.Test/project.json
  93. +2 −2 test/Microsoft.AspNetCore.Mvc.TestCommon/project.json
  94. +2 −2 test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json
  95. +11 −3 test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json
  96. +7 −3 test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json
  97. +1 −0 test/WebSites/ApiExplorerWebSite/Startup.cs
  98. +0 −3 test/WebSites/ApiExplorerWebSite/hosting.json
  99. +6 −3 test/WebSites/ApiExplorerWebSite/project.json
  100. +1 −0 test/WebSites/ApplicationModelWebSite/Startup.cs
  101. +0 −3 test/WebSites/ApplicationModelWebSite/hosting.json
  102. +6 −3 test/WebSites/ApplicationModelWebSite/project.json
  103. +5 −3 test/WebSites/BasicWebSite/Startup.cs
  104. +0 −3 test/WebSites/BasicWebSite/hosting.json
  105. +6 −3 test/WebSites/BasicWebSite/project.json
  106. +6 −3 test/WebSites/ControllersFromServicesClassLibrary/project.json
  107. +1 −0 test/WebSites/ControllersFromServicesWebSite/Startup.cs
  108. +0 −3 test/WebSites/ControllersFromServicesWebSite/hosting.json
  109. +6 −3 test/WebSites/ControllersFromServicesWebSite/project.json
  110. +1 −0 test/WebSites/CorsWebSite/Startup.cs
  111. +0 −3 test/WebSites/CorsWebSite/hosting.json
  112. +6 −3 test/WebSites/CorsWebSite/project.json
  113. +1 −0 test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
  114. +0 −3 test/WebSites/ErrorPageMiddlewareWebSite/hosting.json
  115. +6 −3 test/WebSites/ErrorPageMiddlewareWebSite/project.json
  116. +1 −0 test/WebSites/FilesWebSite/Startup.cs
  117. +0 −3 test/WebSites/FilesWebSite/hosting.json
  118. +6 −3 test/WebSites/FilesWebSite/project.json
  119. +1 −0 test/WebSites/FiltersWebSite/Startup.cs
  120. +0 −3 test/WebSites/FiltersWebSite/hosting.json
  121. +6 −3 test/WebSites/FiltersWebSite/project.json
  122. +1 −0 test/WebSites/FormatterWebSite/Startup.cs
  123. +0 −3 test/WebSites/FormatterWebSite/hosting.json
  124. +6 −3 test/WebSites/FormatterWebSite/project.json
  125. +1 −0 test/WebSites/HtmlGenerationWebSite/Startup.cs
  126. +0 −3 test/WebSites/HtmlGenerationWebSite/hosting.json
  127. +6 −3 test/WebSites/HtmlGenerationWebSite/project.json
  128. +13 −10 test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json
  129. +1 −0 test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs
  130. +0 −3 test/WebSites/RazorPageExecutionInstrumentationWebSite/hosting.json
  131. +6 −3 test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json
  132. +5 −5 test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs
  133. +2 −3 test/WebSites/RazorWebSite/Startup.cs
  134. +2 −2 test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml
  135. +0 −3 test/WebSites/RazorWebSite/hosting.json
  136. +6 −4 test/WebSites/RazorWebSite/project.json
  137. +1 −0 test/WebSites/RoutingWebSite/Startup.cs
  138. +0 −3 test/WebSites/RoutingWebSite/hosting.json
  139. +6 −3 test/WebSites/RoutingWebSite/project.json
  140. +1 −0 test/WebSites/SimpleWebSite/Startup.cs
  141. +0 −3 test/WebSites/SimpleWebSite/hosting.json
  142. +6 −3 test/WebSites/SimpleWebSite/project.json
  143. +1 −0 test/WebSites/TagHelpersWebSite/Startup.cs
  144. +0 −3 test/WebSites/TagHelpersWebSite/hosting.json
  145. +6 −3 test/WebSites/TagHelpersWebSite/project.json
  146. +7 −7 test/WebSites/UserClassLibrary/project.json
  147. +1 −0 test/WebSites/VersioningWebSite/Startup.cs
  148. +0 −3 test/WebSites/VersioningWebSite/hosting.json
  149. +6 −3 test/WebSites/VersioningWebSite/project.json
  150. +1 −0 test/WebSites/WebApiCompatShimWebSite/Startup.cs
  151. +0 −3 test/WebSites/WebApiCompatShimWebSite/hosting.json
  152. +6 −3 test/WebSites/WebApiCompatShimWebSite/project.json
  153. +1 −0 test/WebSites/XmlFormattersWebSite/Startup.cs
  154. +0 −3 test/WebSites/XmlFormattersWebSite/hosting.json
  155. +4 −2 test/WebSites/XmlFormattersWebSite/project.json
View
@@ -48,3 +48,5 @@
*.fsproj text=auto
*.dbproj text=auto
*.sln text=auto eol=crlf
+
+*.sh eol=lf
View
@@ -2,6 +2,8 @@
[Bb]in/
TestResults/
.nuget/
+.build/
+.testPublish/
*.sln.ide/
_ReSharper.*/
packages/
View
@@ -12,12 +12,11 @@ addons:
- zlib1g
before_install:
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install icu4c; fi
-env:
- - KOREBUILD_DNU_RESTORE_CORECLR=true MONO_THREADS_PER_CPU=2000 MONO_MANAGED_WATCHER=disabled KOREBUILD_TEST_DNXCORE=true NO_PARALLEL_TEST_PROJECTS=Microsoft.AspNetCore.Mvc.FunctionalTests
mono:
- 4.0.5
os:
- linux
- osx
+osx_image: xcode7.1
script:
- - ./build.sh --quiet verify
+ - ./build.sh --quiet verify
View
@@ -1,7 +1,7 @@
init:
- git config --global core.autocrlf true
build_script:
- - build.cmd --quiet --parallel verify
+ - build.cmd --quiet verify
clone_depth: 1
test: off
deploy: off
View
@@ -1,40 +1,40 @@
-@echo off
-cd %~dp0
-
+@ECHO off
SETLOCAL
+
+SET REPO_FOLDER=%~dp0
+CD "%REPO_FOLDER%"
+
+SET BUILD_FOLDER=.build
+SET KOREBUILD_FOLDER=%BUILD_FOLDER%\KoreBuild-dotnet
+SET KOREBUILD_VERSION=
+
+SET NUGET_PATH=%BUILD_FOLDER%\NuGet.exe
SET NUGET_VERSION=latest
SET CACHED_NUGET=%LocalAppData%\NuGet\nuget.%NUGET_VERSION%.exe
-SET BUILDCMD_KOREBUILD_VERSION=
-SET BUILDCMD_DNX_VERSION=
-
-IF EXIST %CACHED_NUGET% goto copynuget
-echo Downloading latest version of NuGet.exe...
-IF NOT EXIST %LocalAppData%\NuGet md %LocalAppData%\NuGet
-@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://dist.nuget.org/win-x86-commandline/%NUGET_VERSION%/nuget.exe' -OutFile '%CACHED_NUGET%'"
-
-:copynuget
-IF EXIST .nuget\nuget.exe goto restore
-md .nuget
-copy %CACHED_NUGET% .nuget\nuget.exe > nul
-
-:restore
-IF EXIST packages\Sake goto getdnx
-IF "%BUILDCMD_KOREBUILD_VERSION%"=="" (
- .nuget\nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
-) ELSE (
- .nuget\nuget.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
+
+IF NOT EXIST %BUILD_FOLDER% (
+ md %BUILD_FOLDER%
)
-.nuget\NuGet.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
-:getdnx
-IF "%BUILDCMD_DNX_VERSION%"=="" (
- SET BUILDCMD_DNX_VERSION=latest
+IF NOT EXIST %NUGET_PATH% (
+ IF NOT EXIST %CACHED_NUGET% (
+ echo Downloading latest version of NuGet.exe...
+ IF NOT EXIST %LocalAppData%\NuGet (
+ md %LocalAppData%\NuGet
+ )
+ @powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://dist.nuget.org/win-x86-commandline/%NUGET_VERSION%/nuget.exe' -OutFile '%CACHED_NUGET%'"
+ )
+
+ copy %CACHED_NUGET% %NUGET_PATH% > nul
)
-IF "%SKIP_DNX_INSTALL%"=="" (
- CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CoreCLR -arch x86 -alias default
- CALL packages\KoreBuild\build\dnvm install default -runtime CLR -arch x86 -alias default
-) ELSE (
- CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
+
+IF NOT EXIST %KOREBUILD_FOLDER% (
+ SET KOREBUILD_DOWNLOAD_ARGS=
+ IF NOT "%KOREBUILD_VERSION%"=="" (
+ SET KOREBUILD_DOWNLOAD_ARGS=-version %KOREBUILD_VERSION%
+ )
+
+ %BUILD_FOLDER%\nuget.exe install KoreBuild-dotnet -ExcludeVersion -o %BUILD_FOLDER% -nocache -pre %KOREBUILD_DOWNLOAD_ARGS%
)
-packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
+"%KOREBUILD_FOLDER%\build\KoreBuild.cmd" %*
View
@@ -1,5 +1,18 @@
#!/usr/bin/env bash
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+ SOURCE="$(readlink "$SOURCE")"
+ [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+repoFolder="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+
+buildFolder=.build
+koreBuildFolder=$buildFolder/KoreBuild-dotnet
+
+nugetPath=$buildFolder/nuget.exe
+
if test `uname` = Darwin; then
cachedir=~/Library/Caches/KBuild
else
@@ -11,33 +24,25 @@ else
fi
mkdir -p $cachedir
nugetVersion=latest
-cachePath=$cachedir/nuget.$nugetVersion.exe
+cacheNuget=$cachedir/nuget.$nugetVersion.exe
-url=https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe
+nugetUrl=https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe
-if test ! -f $cachePath; then
- wget -O $cachePath $url 2>/dev/null || curl -o $cachePath --location $url /dev/null
+if test ! -d $buildFolder; then
+ mkdir $buildFolder
fi
-if test ! -e .nuget; then
- mkdir .nuget
- cp $cachePath .nuget/nuget.exe
-fi
+if test ! -f $nugetPath; then
+ if test ! -f $cacheNuget; then
+ wget -O $cacheNuget $nugetUrl 2>/dev/null || curl -o $cacheNuget --location $nugetUrl /dev/null
+ fi
-if test ! -d packages/Sake; then
- mono .nuget/nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
- mono .nuget/nuget.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
+ cp $cacheNuget $nugetPath
fi
-if ! type dnvm > /dev/null 2>&1; then
- source packages/KoreBuild/build/dnvm.sh
+if test ! -d $koreBuildFolder; then
+ mono $nugetPath install KoreBuild-dotnet -ExcludeVersion -o $buildFolder -nocache -pre
fi
-if ! type dnx > /dev/null 2>&1 || [ -z "$SKIP_DNX_INSTALL" ]; then
- dnvm install latest -runtime coreclr -alias default
- dnvm install default -runtime mono -alias default
-else
- dnvm use default -runtime mono
-fi
+source $koreBuildFolder/build/KoreBuild.sh
-mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@"
@@ -32,6 +32,7 @@ public static void Main(string[] args)
var host = new WebHostBuilder()
.UseDefaultConfiguration(args)
.UseIISPlatformHandlerUrl()
+ .UseServer("Microsoft.AspNetCore.Server.Kestrel")
.UseStartup<Startup>()
.Build();
@@ -1,3 +0,0 @@
-{
- "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
@@ -1,6 +1,7 @@
{
"compilationOptions": {
- "emitEntryPoint": true
+ "emitEntryPoint": true,
+ "preserveCompilationContext": true
},
"commands": {
"web": "ActionConstraintSample.Web"
@@ -11,7 +12,12 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
- "dnx451": {},
- "dnxcore50": {}
+ "net451": { },
+ "dnxcore50": {
+ "imports": "portable-net451+win8",
+ "dependencies": {
+ "Microsoft.NETCore.Platforms": "1.0.1-*"
+ }
+ }
}
}
@@ -29,6 +29,7 @@ public static void Main(string[] args)
var host = new WebHostBuilder()
.UseDefaultConfiguration(args)
.UseIISPlatformHandlerUrl()
+ .UseServer("Microsoft.AspNetCore.Server.Kestrel")
.UseStartup<Startup>()
.Build();
@@ -1,3 +0,0 @@
-{
- "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
@@ -1,17 +1,21 @@
{
"compilationOptions": {
- "emitEntryPoint": true
+ "emitEntryPoint": true,
+ "preserveCompilationContext": true
},
"commands": {
"web": "CustomRouteSample.Web"
},
"dependencies": {
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
- "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
+ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
+ "Microsoft.NETCore.Platforms": "1.0.1-*"
},
"frameworks": {
- "dnx451": {},
- "dnxcore50": {}
+ "net451": {},
+ "dnxcore50": {
+ "imports": "portable-net451+win8"
+ }
}
}
@@ -46,6 +46,7 @@ public static void Main(string[] args)
var host = new WebHostBuilder()
.UseDefaultConfiguration(args)
.UseIISPlatformHandlerUrl()
+ .UseServer("Microsoft.AspNetCore.Server.Kestrel")
.UseStartup<Startup>()
.Build();
@@ -1,3 +0,0 @@
-{
- "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
@@ -1,6 +1,7 @@
{
"compilationOptions": {
- "emitEntryPoint": true
+ "emitEntryPoint": true,
+ "preserveCompilationContext": true
},
"commands": {
"web": "EmbeddedViewSample.Web"
@@ -10,10 +11,13 @@
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
- "Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*"
+ "Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*",
+ "Microsoft.NETCore.Platforms": "1.0.1-*"
},
"frameworks": {
- "dnx451": {},
- "dnxcore50": {}
+ "net451": {},
+ "dnxcore50": {
+ "imports": "portable-net451+win8"
+ }
}
}
@@ -42,6 +42,7 @@ public static void Main(string[] args)
var host = new WebHostBuilder()
.UseDefaultConfiguration(args)
.UseIISPlatformHandlerUrl()
+ .UseServer("Microsoft.AspNetCore.Server.Kestrel")
.UseStartup<Startup>()
.Build();
@@ -1,3 +0,0 @@
-{
- "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
@@ -1,6 +1,7 @@
{
"compilationOptions": {
- "emitEntryPoint": true
+ "emitEntryPoint": true,
+ "preserveCompilationContext": true
},
"commands": {
"web": "FormatFilterSample.Web"
@@ -13,7 +14,9 @@
"Microsoft.NETCore.Platforms": "1.0.1-*"
},
"frameworks": {
- "dnx451": {},
- "dnxcore50": {}
+ "net451": {},
+ "dnxcore50": {
+ "imports": "portable-net451+win8"
+ }
}
}
@@ -41,6 +41,7 @@ public static void Main(string[] args)
var host = new WebHostBuilder()
.UseDefaultConfiguration(args)
.UseIISPlatformHandlerUrl()
+ .UseServer("Microsoft.AspNetCore.Server.Kestrel")
.UseStartup<Startup>()
.Build();
@@ -1,3 +0,0 @@
-{
- "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
@@ -1,17 +1,21 @@
{
"compilationOptions": {
- "emitEntryPoint": true
+ "emitEntryPoint": true,
+ "preserveCompilationContext": true
},
"commands": {
"web": "InlineConstraintSample.Web"
},
"dependencies": {
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
- "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
+ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
+ "Microsoft.NETCore.Platforms": "1.0.1-*"
},
"frameworks": {
- "dnx451": {},
- "dnxcore50": {}
+ "net451": {},
+ "dnxcore50": {
+ "imports": "portable-net451+win8"
+ }
}
}
@@ -27,6 +27,7 @@ public static void Main(string[] args)
var host = new WebHostBuilder()
.UseDefaultConfiguration(args)
.UseIISPlatformHandlerUrl()
+ .UseServer("Microsoft.AspNetCore.Server.Kestrel")
.UseStartup<Startup>()
.Build();
@@ -1,3 +0,0 @@
-{
- "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
Oops, something went wrong.

0 comments on commit 5b805bb

Please sign in to comment.