Adding support for the .NET Core 2.0 runtime. (#785)

ivannaranjo · web-flow · commit bb327ee6bf2b · 2017-08-25T16:40:33.000+01:00
* Adding support for the .NET Core 2.0 runtime.

* Fixing typo.
diff --git a/GoogleCloudExtension/GoogleCloudExtension.Deployment/KnownProjectTypes.cs b/GoogleCloudExtension/GoogleCloudExtension.Deployment/KnownProjectTypes.cs
@@ -38,5 +38,10 @@ public enum KnownProjectTypes
         /// An ASP.NET Core 1.1 app
         /// </summary>
         NetCoreWebApplication1_1,
+
+        /// <summary>
+        /// An ASP.NET Core 2.0 app
+        /// </summary>
+        NetCoreWebApplication2_0,
     }
 }
diff --git a/GoogleCloudExtension/GoogleCloudExtension.Deployment/NetCoreAppUtils.cs b/GoogleCloudExtension/GoogleCloudExtension.Deployment/NetCoreAppUtils.cs
@@ -33,7 +33,8 @@ internal static class NetCoreAppUtils
         private static readonly Dictionary<KnownProjectTypes, string> s_knownRuntimeImages = new Dictionary<KnownProjectTypes, string>
         {
             [ KnownProjectTypes.NetCoreWebApplication1_0 ] = "gcr.io/google-appengine/aspnetcore:1.0",
-            [ KnownProjectTypes.NetCoreWebApplication1_1 ] = "gcr.io/google-appengine/aspnetcore:1.1"
+            [ KnownProjectTypes.NetCoreWebApplication1_1 ] = "gcr.io/google-appengine/aspnetcore:1.1",
+            [ KnownProjectTypes.NetCoreWebApplication2_0 ] = "gcr.io/google-appengine/aspnetcore:2.0"
         };
 
         /// <summary>
diff --git a/GoogleCloudExtension/GoogleCloudExtension/Projects/DotNetCore/CsprojProject.cs b/GoogleCloudExtension/GoogleCloudExtension/Projects/DotNetCore/CsprojProject.cs
@@ -53,6 +53,10 @@ public CsprojProject(Project project, string targetFramework)
                     ProjectType = KnownProjectTypes.NetCoreWebApplication1_1;
                     break;
 
+                case "netcoreapp2.0":
+                    ProjectType = KnownProjectTypes.NetCoreWebApplication2_0;
+                    break;
+
                 default:
                     GcpOutputWindow.OutputDebugLine($"Unsopported target framework {targetFramework}");
                     ProjectType = KnownProjectTypes.None;
diff --git a/GoogleCloudExtension/GoogleCloudExtension/PublishDialog/PublishDialogWindow.cs b/GoogleCloudExtension/GoogleCloudExtension/PublishDialog/PublishDialogWindow.cs
@@ -55,7 +55,8 @@ public static bool CanPublish(IParsedProject project)
             var projectType = project.ProjectType;
             return projectType == KnownProjectTypes.WebApplication ||
                 projectType == KnownProjectTypes.NetCoreWebApplication1_0 ||
-                projectType == KnownProjectTypes.NetCoreWebApplication1_1;
+                projectType == KnownProjectTypes.NetCoreWebApplication1_1 ||
+                projectType == KnownProjectTypes.NetCoreWebApplication2_0;
         }
     }
 }
diff --git a/GoogleCloudExtension/GoogleCloudExtension/PublishDialogSteps/ChoiceStep/ChoiceStepViewModel.cs b/GoogleCloudExtension/GoogleCloudExtension/PublishDialogSteps/ChoiceStep/ChoiceStepViewModel.cs
@@ -136,6 +136,7 @@ public static IPublishDialogStep CreateStep()
 
         private static bool IsSupportedNetCoreProject(IParsedProject project)
             => project.ProjectType == KnownProjectTypes.NetCoreWebApplication1_0 ||
-               project.ProjectType == KnownProjectTypes.NetCoreWebApplication1_1;
+               project.ProjectType == KnownProjectTypes.NetCoreWebApplication1_1 ||
+               project.ProjectType == KnownProjectTypes.NetCoreWebApplication2_0;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,10 @@ public enum KnownProjectTypes`
`38`	`38`	`/// An ASP.NET Core 1.1 app`
`39`	`39`	`/// </summary>`
`40`	`40`	`NetCoreWebApplication1_1,`
	`41`	`+`
	`42`	`+ /// <summary>`
	`43`	`+ /// An ASP.NET Core 2.0 app`
	`44`	`+ /// </summary>`
	`45`	`+ NetCoreWebApplication2_0,`
`41`	`46`	`}`
`42`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ internal static class NetCoreAppUtils`
`33`	`33`	`private static readonly Dictionary<KnownProjectTypes, string> s_knownRuntimeImages = new Dictionary<KnownProjectTypes, string>`
`34`	`34`	`{`
`35`	`35`	`[ KnownProjectTypes.NetCoreWebApplication1_0 ] = "gcr.io/google-appengine/aspnetcore:1.0",`
`36`		`- [ KnownProjectTypes.NetCoreWebApplication1_1 ] = "gcr.io/google-appengine/aspnetcore:1.1"`
	`36`	`+ [ KnownProjectTypes.NetCoreWebApplication1_1 ] = "gcr.io/google-appengine/aspnetcore:1.1",`
	`37`	`+ [ KnownProjectTypes.NetCoreWebApplication2_0 ] = "gcr.io/google-appengine/aspnetcore:2.0"`
`37`	`38`	`};`
`38`	`39`
`39`	`40`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ public static bool CanPublish(IParsedProject project)`
`55`	`55`	`var projectType = project.ProjectType;`
`56`	`56`	`return projectType == KnownProjectTypes.WebApplication \|\|`
`57`	`57`	`projectType == KnownProjectTypes.NetCoreWebApplication1_0 \|\|`
`58`		`- projectType == KnownProjectTypes.NetCoreWebApplication1_1;`
	`58`	`+ projectType == KnownProjectTypes.NetCoreWebApplication1_1 \|\|`
	`59`	`+ projectType == KnownProjectTypes.NetCoreWebApplication2_0;`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ public static IPublishDialogStep CreateStep()`
`136`	`136`
`137`	`137`	`private static bool IsSupportedNetCoreProject(IParsedProject project)`
`138`	`138`	`=> project.ProjectType == KnownProjectTypes.NetCoreWebApplication1_0 \|\|`
`139`		`- project.ProjectType == KnownProjectTypes.NetCoreWebApplication1_1;`
	`139`	`+ project.ProjectType == KnownProjectTypes.NetCoreWebApplication1_1 \|\|`
	`140`	`+ project.ProjectType == KnownProjectTypes.NetCoreWebApplication2_0;`
`140`	`141`	`}`
`141`	`142`	`}`