Converted samples and test projects to run on netcoreapp2.0

aspnet · Apr 4, 2017 · 200207b · 200207b
1 parent 60f009f
commit 200207b
Show file tree

Hide file tree

Showing 48 changed files with 65 additions and 55 deletions.
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -10,6 +10,7 @@
     <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
     <NowinVersion>0.11.0</NowinVersion>
     <OwinVersion>3.0.1</OwinVersion>
+    <RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
     <TestSdkVersion>15.0.0</TestSdkVersion>
     <XunitVersion>2.2.0</XunitVersion>
   </PropertyGroup>

diff --git a/samples/Antiforgery.Angular1/Antiforgery.Angular1.csproj b/samples/Antiforgery.Angular1/Antiforgery.Angular1.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Antiforgery.MvcWithAuthAndAjax/Antiforgery.MvcWithAuthAndAjax.csproj b/samples/Antiforgery.MvcWithAuthAndAjax/Antiforgery.MvcWithAuthAndAjax.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Builder.Filtering.Web/Builder.Filtering.Web.csproj b/samples/Builder.Filtering.Web/Builder.Filtering.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Builder.HelloWorld.Web/Builder.HelloWorld.Web.csproj b/samples/Builder.HelloWorld.Web/Builder.HelloWorld.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Builder.Middleware.Web/Builder.Middleware.Web.csproj b/samples/Builder.Middleware.Web/Builder.Middleware.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...fig.CustomConfigurationProviders.Sample/Config.CustomConfigurationProviders.Sample.csproj b/...fig.CustomConfigurationProviders.Sample/Config.CustomConfigurationProviders.Sample.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/samples/Config.CustomProviders.Web/Config.CustomProviders.Web.csproj b/samples/Config.CustomProviders.Web/Config.CustomProviders.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Config.Options.Snapshot.Web/Config.Options.Snapshot.Web.csproj b/samples/Config.Options.Snapshot.Web/Config.Options.Snapshot.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Config.Providers.Web/Config.Providers.Web.csproj b/samples/Config.Providers.Web/Config.Providers.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Config.SettingObject.Web/Config.SettingObject.Web.csproj b/samples/Config.SettingObject.Web/Config.SettingObject.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Config.WalkingValues.Web/Config.WalkingValues.Web.csproj b/samples/Config.WalkingValues.Web/Config.WalkingValues.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Container.Fallback.Web/Container.Fallback.Web.csproj b/samples/Container.Fallback.Web/Container.Fallback.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Content.Upload.Files/Content.Upload.Files.csproj b/samples/Content.Upload.Files/Content.Upload.Files.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Content.Upload.Form/Content.Upload.Form.csproj b/samples/Content.Upload.Form/Content.Upload.Form.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Content.Upload.Multipart/Content.Upload.Multipart.csproj b/samples/Content.Upload.Multipart/Content.Upload.Multipart.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Data.InMemory/Data.InMemory.csproj b/samples/Data.InMemory/Data.InMemory.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/samples/Data.SqlServer/Data.SqlServer.csproj b/samples/Data.SqlServer/Data.SqlServer.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/samples/Diagnostics.StatusCodes.Mvc/Diagnostics.StatusCodes.Mvc.csproj b/samples/Diagnostics.StatusCodes.Mvc/Diagnostics.StatusCodes.Mvc.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Localization.CustomResourceManager/Localization.CustomResourceManager.csproj b/samples/Localization.CustomResourceManager/Localization.CustomResourceManager.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Localization.CustomResourceManager/Startup.cs b/samples/Localization.CustomResourceManager/Startup.cs
@@ -55,8 +55,11 @@ public void Configure(
                 new CultureInfo("zh"),
                 new CultureInfo("zh-CN")
             };
-#if !NETCOREAPP1_1
+#if NET46
             supportedCultures.Add(new CultureInfo("zh-CHT"));
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif
             var options = new RequestLocalizationOptions
             {
@@ -174,6 +177,9 @@ private static async System.Threading.Tasks.Task WriteCultureSelectOptions(HttpC
             await context.Response.WriteAsync($"    <option value=\"{new CultureInfo("zh-CN").Name}\">{new CultureInfo("zh-CN").DisplayName}</option>");
 #if NET46
             await context.Response.WriteAsync($"    <option value=\"{new CultureInfo("zh-CHT").Name}\">{new CultureInfo("zh-CHT").DisplayName}</option>");
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif
             await context.Response.WriteAsync($"    <option value=\"en-NOTREAL\">English (Not a real locale)</option>");
             await context.Response.WriteAsync($"    <option value=\"pp-NOTREAL\">Made-up (Not a real anything)</option>");

diff --git a/samples/Localization.EntityFramework/Localization.EntityFramework.csproj b/samples/Localization.EntityFramework/Localization.EntityFramework.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Localization.EntityFramework/Startup.cs b/samples/Localization.EntityFramework/Startup.cs
@@ -35,6 +35,9 @@ public void Configure(IApplicationBuilder app, IStringLocalizerFactory localizer
             };
 #if NET46
             supportedCultures.Add(new CultureInfo("zh-CHT"));
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif 
             var options = new RequestLocalizationOptions {
                 DefaultRequestCulture = new RequestCulture("en-US"),
@@ -148,6 +151,9 @@ private static async System.Threading.Tasks.Task WriteCultureSelectOptions(HttpC
             await context.Response.WriteAsync($"    <option value=\"{new CultureInfo("zh-CN").Name}\">{new CultureInfo("zh-CN").DisplayName}</option>");
 #if NET46
             await context.Response.WriteAsync($"    <option value=\"{new CultureInfo("zh-HanT").Name}\">{new CultureInfo("zh-HanT").DisplayName}</option>");
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif
             await context.Response.WriteAsync($"    <option value=\"en-NOTREAL\">English (Not a real locale)</option>");
             await context.Response.WriteAsync($"    <option value=\"pp-NOTREAL\">Made-up (Not a real anything)</option>");

diff --git a/samples/Localization.StarterWeb/Localization.StarterWeb.csproj b/samples/Localization.StarterWeb/Localization.StarterWeb.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <UserSecretsId>aspnet5-Localization.StarterWeb-4772c50f-56f3-4058-bd61-75f1352aeca7</UserSecretsId>
   </PropertyGroup>
 

diff --git a/samples/Logging.Elm/Logging.Elm.csproj b/samples/Logging.Elm/Logging.Elm.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/MusicStore.Spa/MusicStore.Spa.csproj b/samples/MusicStore.Spa/MusicStore.Spa.csproj
@@ -6,7 +6,7 @@
     <IsPackable>false</IsPackable>
     <Description>Music store application on ASP.NET Core as a SPA</Description>
     <Authors>Microsoft</Authors>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.ActionConstraintSample.Web/Mvc.ActionConstraintSample.Web.csproj b/samples/Mvc.ActionConstraintSample.Web/Mvc.ActionConstraintSample.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.CustomRouteSample.Web/Mvc.CustomRouteSample.Web.csproj b/samples/Mvc.CustomRouteSample.Web/Mvc.CustomRouteSample.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.CustomRoutingConvention/Mvc.CustomRoutingConvention.csproj b/samples/Mvc.CustomRoutingConvention/Mvc.CustomRoutingConvention.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.EmbeddedViewSample.Web/Mvc.EmbeddedViewSample.Web.csproj b/samples/Mvc.EmbeddedViewSample.Web/Mvc.EmbeddedViewSample.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.FileUpload/Mvc.FileUpload.csproj b/samples/Mvc.FileUpload/Mvc.FileUpload.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.FormatFilterSample.Web/Mvc.FormatFilterSample.Web.csproj b/samples/Mvc.FormatFilterSample.Web/Mvc.FormatFilterSample.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.Formatters/Mvc.Formatters.csproj b/samples/Mvc.Formatters/Mvc.Formatters.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.GenericControllers/Mvc.GenericControllers.csproj b/samples/Mvc.GenericControllers/Mvc.GenericControllers.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
    </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.InlineConstraintSample.Web/Mvc.InlineConstraintSample.Web.csproj b/samples/Mvc.InlineConstraintSample.Web/Mvc.InlineConstraintSample.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.JsonPatchSample.Web/Mvc.JsonPatchSample.Web.csproj b/samples/Mvc.JsonPatchSample.Web/Mvc.JsonPatchSample.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.Modules/Mvc.Modules.csproj b/samples/Mvc.Modules/Mvc.Modules.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.RenderViewToString/Mvc.RenderViewToString.csproj b/samples/Mvc.RenderViewToString/Mvc.RenderViewToString.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.SubAreaSample.Web/Mvc.SubAreaSample.Web.csproj b/samples/Mvc.SubAreaSample.Web/Mvc.SubAreaSample.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.TagHelperSample.Web/Mvc.TagHelperSample.Web.csproj b/samples/Mvc.TagHelperSample.Web/Mvc.TagHelperSample.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Mvc.UrlHelperSample.Web/Mvc.UrlHelperSample.Web.csproj b/samples/Mvc.UrlHelperSample.Web/Mvc.UrlHelperSample.Web.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>