From c702cd5a53a770d15635d99029c35cc4a1f0ba2a Mon Sep 17 00:00:00 2001 From: Ivan Naranjo Date: Tue, 22 Aug 2017 17:08:34 +0100 Subject: [PATCH 1/2] Adding support for the .NET Core 2.0 runtime. --- .../GoogleCloudExtension.Deployment/KnownProjectTypes.cs | 5 +++++ .../GoogleCloudExtension.Deployment/NetCoreAppUtils.cs | 3 ++- .../Projects/DotNetCore/CsprojProject.cs | 4 ++++ .../PublishDialog/PublishDialogWindow.cs | 3 ++- .../PublishDialogSteps/ChoiceStep/ChoiceStepViewModel.cs | 3 ++- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/GoogleCloudExtension/GoogleCloudExtension.Deployment/KnownProjectTypes.cs b/GoogleCloudExtension/GoogleCloudExtension.Deployment/KnownProjectTypes.cs index 565b8fea0..14b842073 100644 --- 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 /// NetCoreWebApplication1_1, + + /// + /// An ASP.NET Core 2.0 app + /// + NetCoreWEbApplication2_0, } } \ No newline at end of file diff --git a/GoogleCloudExtension/GoogleCloudExtension.Deployment/NetCoreAppUtils.cs b/GoogleCloudExtension/GoogleCloudExtension.Deployment/NetCoreAppUtils.cs index 5208bc73b..f17cc4ab7 100644 --- a/GoogleCloudExtension/GoogleCloudExtension.Deployment/NetCoreAppUtils.cs +++ b/GoogleCloudExtension/GoogleCloudExtension.Deployment/NetCoreAppUtils.cs @@ -33,7 +33,8 @@ internal static class NetCoreAppUtils private static readonly Dictionary s_knownRuntimeImages = new Dictionary { [ 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" }; /// diff --git a/GoogleCloudExtension/GoogleCloudExtension/Projects/DotNetCore/CsprojProject.cs b/GoogleCloudExtension/GoogleCloudExtension/Projects/DotNetCore/CsprojProject.cs index 58680eac6..51fe816c3 100644 --- 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 index b706c4149..d17f40fcc 100644 --- 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 index 0f7eba809..3e4aeb593 100644 --- 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; } } From e068e1ace578007fc8957da780be3b2c751bab44 Mon Sep 17 00:00:00 2001 From: Ivan Naranjo Date: Thu, 24 Aug 2017 14:27:06 +0100 Subject: [PATCH 2/2] Fixing typo. --- .../GoogleCloudExtension.Deployment/KnownProjectTypes.cs | 2 +- .../GoogleCloudExtension.Deployment/NetCoreAppUtils.cs | 2 +- .../GoogleCloudExtension/Projects/DotNetCore/CsprojProject.cs | 2 +- .../GoogleCloudExtension/PublishDialog/PublishDialogWindow.cs | 2 +- .../PublishDialogSteps/ChoiceStep/ChoiceStepViewModel.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GoogleCloudExtension/GoogleCloudExtension.Deployment/KnownProjectTypes.cs b/GoogleCloudExtension/GoogleCloudExtension.Deployment/KnownProjectTypes.cs index 14b842073..8a2169b3c 100644 --- a/GoogleCloudExtension/GoogleCloudExtension.Deployment/KnownProjectTypes.cs +++ b/GoogleCloudExtension/GoogleCloudExtension.Deployment/KnownProjectTypes.cs @@ -42,6 +42,6 @@ public enum KnownProjectTypes /// /// An ASP.NET Core 2.0 app /// - NetCoreWEbApplication2_0, + NetCoreWebApplication2_0, } } \ No newline at end of file diff --git a/GoogleCloudExtension/GoogleCloudExtension.Deployment/NetCoreAppUtils.cs b/GoogleCloudExtension/GoogleCloudExtension.Deployment/NetCoreAppUtils.cs index f17cc4ab7..f74683d74 100644 --- a/GoogleCloudExtension/GoogleCloudExtension.Deployment/NetCoreAppUtils.cs +++ b/GoogleCloudExtension/GoogleCloudExtension.Deployment/NetCoreAppUtils.cs @@ -34,7 +34,7 @@ internal static class NetCoreAppUtils { [ KnownProjectTypes.NetCoreWebApplication1_0 ] = "gcr.io/google-appengine/aspnetcore:1.0", [ KnownProjectTypes.NetCoreWebApplication1_1 ] = "gcr.io/google-appengine/aspnetcore:1.1", - [ KnownProjectTypes.NetCoreWEbApplication2_0 ] = "gcr.io/google-appengine/aspnetcore:2.0" + [ KnownProjectTypes.NetCoreWebApplication2_0 ] = "gcr.io/google-appengine/aspnetcore:2.0" }; /// diff --git a/GoogleCloudExtension/GoogleCloudExtension/Projects/DotNetCore/CsprojProject.cs b/GoogleCloudExtension/GoogleCloudExtension/Projects/DotNetCore/CsprojProject.cs index 51fe816c3..0ee63c8ec 100644 --- a/GoogleCloudExtension/GoogleCloudExtension/Projects/DotNetCore/CsprojProject.cs +++ b/GoogleCloudExtension/GoogleCloudExtension/Projects/DotNetCore/CsprojProject.cs @@ -54,7 +54,7 @@ public CsprojProject(Project project, string targetFramework) break; case "netcoreapp2.0": - ProjectType = KnownProjectTypes.NetCoreWEbApplication2_0; + ProjectType = KnownProjectTypes.NetCoreWebApplication2_0; break; default: diff --git a/GoogleCloudExtension/GoogleCloudExtension/PublishDialog/PublishDialogWindow.cs b/GoogleCloudExtension/GoogleCloudExtension/PublishDialog/PublishDialogWindow.cs index d17f40fcc..664d16435 100644 --- a/GoogleCloudExtension/GoogleCloudExtension/PublishDialog/PublishDialogWindow.cs +++ b/GoogleCloudExtension/GoogleCloudExtension/PublishDialog/PublishDialogWindow.cs @@ -56,7 +56,7 @@ public static bool CanPublish(IParsedProject project) return projectType == KnownProjectTypes.WebApplication || projectType == KnownProjectTypes.NetCoreWebApplication1_0 || projectType == KnownProjectTypes.NetCoreWebApplication1_1 || - projectType == KnownProjectTypes.NetCoreWEbApplication2_0; + projectType == KnownProjectTypes.NetCoreWebApplication2_0; } } } diff --git a/GoogleCloudExtension/GoogleCloudExtension/PublishDialogSteps/ChoiceStep/ChoiceStepViewModel.cs b/GoogleCloudExtension/GoogleCloudExtension/PublishDialogSteps/ChoiceStep/ChoiceStepViewModel.cs index 3e4aeb593..82b1b79ef 100644 --- a/GoogleCloudExtension/GoogleCloudExtension/PublishDialogSteps/ChoiceStep/ChoiceStepViewModel.cs +++ b/GoogleCloudExtension/GoogleCloudExtension/PublishDialogSteps/ChoiceStep/ChoiceStepViewModel.cs @@ -137,6 +137,6 @@ public static IPublishDialogStep CreateStep() private static bool IsSupportedNetCoreProject(IParsedProject project) => project.ProjectType == KnownProjectTypes.NetCoreWebApplication1_0 || project.ProjectType == KnownProjectTypes.NetCoreWebApplication1_1 || - project.ProjectType == KnownProjectTypes.NetCoreWEbApplication2_0; + project.ProjectType == KnownProjectTypes.NetCoreWebApplication2_0; } }