Update the ASP.NET Core on GCE warning message. (#1066)

* Update the ASP.NET Core on GCE warning message.
GoogleCloudPlatform · Oct 12, 2018 · 86bfaec · 86bfaec
1 parent e21761c
commit 86bfaec
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 12 deletions.
diff --git a/...on/GoogleCloudExtension/PublishDialog/Steps/CoreGceWarning/CoreGceWarningStepContent.xaml b/...on/GoogleCloudExtension/PublishDialog/Steps/CoreGceWarning/CoreGceWarningStepContent.xaml
@@ -28,7 +28,7 @@
              d:DesignHeight="247"
              d:DesignWidth="476"
              d:DataContext="{d:DesignInstance local:CoreGceWarningStepViewModel}">
-    <DockPanel VerticalAlignment="Stretch" Margin="36,0,36,0">
+    <DockPanel VerticalAlignment="Stretch" Margin="24,0,24,0">
         <CheckBox DockPanel.Dock="Bottom"
                   IsChecked="{Binding Options.DoNotShowAspNetCoreGceWarning}"
                   HorizontalAlignment="Right"
@@ -45,18 +45,30 @@
 
             <TextBlock TextWrapping="Wrap" VerticalAlignment="Center">
                 <Run Text="{x:Static ext:Resources.PublishGceWarningStepLine1}" />
-
-                <LineBreak/>
-                <LineBreak/>
+                <LineBreak />
+                <LineBreak />
 
                 <wpf:WhitespaceDiscardingSpan>
                     <Run Text="{x:Static ext:Resources.PublishGceWarningStepLine2BeforeLink}" />
 
+                    <Hyperlink Command="{Binding BrowseAspNetMarketplaceImage}">
+                        <Run Text="{x:Static ext:Resources.PublishGceWarningStepLine2MarketplaceLink}" />
+                    </Hyperlink>
+
+                    <Run Text="{x:Static ext:Resources.PublishGceWarningStepLine2AfterLink}" />
+                </wpf:WhitespaceDiscardingSpan>
+
+                <LineBreak />
+                <LineBreak />
+
+                <wpf:WhitespaceDiscardingSpan>
+                    <Run Text="{x:Static ext:Resources.PublishGceWarningStepLine3BeforeLink}" />
+
                     <Hyperlink Command="{Binding BrowseAspNetCoreIisDocs}">
-                        <Run Text="{x:Static ext:Resources.PublishGceWarningStepLine2HyperLink}" />
+                        <Run Text="{x:Static ext:Resources.PublishGceWarningStepLine3DocsLink}" />
                     </Hyperlink>
 
-                    <Run Text="{x:Static ext:Resources.PublishGceWarningStepLine2AfterLink}"/>
+                    <Run Text="{x:Static ext:Resources.PublishGceWarningStepLine3AfterLink}" />
                 </wpf:WhitespaceDiscardingSpan>
             </TextBlock>
         </DockPanel>

diff --git a/...on/GoogleCloudExtension/PublishDialog/Steps/CoreGceWarning/CoreGceWarningStepViewModel.cs b/...on/GoogleCloudExtension/PublishDialog/Steps/CoreGceWarning/CoreGceWarningStepViewModel.cs
@@ -27,6 +27,9 @@ public class CoreGceWarningStepViewModel : ValidatingViewModelBase, IPublishDial
     {
         public const string AspNetCoreIisDocsLink = "https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/iis/";
 
+        public const string AspNetMarketplaceImageLink =
+            "https://console.cloud.google.com/marketplace/details/click-to-deploy-images/aspnet";
+
         private readonly IPublishDialog _publishDialog;
         private readonly GceStepContent _nextStepContent;
         private readonly Lazy<IBrowserService> _browserService;
@@ -57,16 +60,22 @@ public class CoreGceWarningStepViewModel : ValidatingViewModelBase, IPublishDial
         public ProtectedCommand BrowseAspNetCoreIisDocs { get; }
         private IBrowserService BrowserService => _browserService.Value;
 
+        public ProtectedCommand BrowseAspNetMarketplaceImage { get; }
+
         public CoreGceWarningStepViewModel(IPublishDialog publishDialog)
         {
             _publishDialog = publishDialog;
             BrowseAspNetCoreIisDocs = new ProtectedCommand(OnBrowseAspNetCoreIisDocs);
+            BrowseAspNetMarketplaceImage = new ProtectedCommand(OnBrowseAspNeMarketplaceImage);
             Title = string.Format(Resources.GcePublishStepTitle, publishDialog.Project.Name);
             ActionCommand = new ProtectedCommand(OnNextCommand);
             _nextStepContent = new GceStepContent(_publishDialog);
             _browserService = GoogleCloudExtensionPackage.Instance.GetMefServiceLazy<IBrowserService>();
         }
 
+        private void OnBrowseAspNeMarketplaceImage() =>
+            BrowserService.OpenBrowser(AspNetMarketplaceImageLink);
+
         private void OnBrowseAspNetCoreIisDocs() =>
             BrowserService.OpenBrowser(AspNetCoreIisDocsLink);
 

diff --git a/GoogleCloudExtension/GoogleCloudExtension/Resources.Designer.cs b/GoogleCloudExtension/GoogleCloudExtension/Resources.Designer.cs
diff --git a/GoogleCloudExtension/GoogleCloudExtension/Resources.resx b/GoogleCloudExtension/GoogleCloudExtension/Resources.resx
@@ -2489,14 +2489,26 @@ Delete corrupted file?</value>
     <comment>The first line of the ASP.NET Core on GCE warning dialog.</comment>
   </data>
   <data name="PublishGceWarningStepLine2BeforeLink" xml:space="preserve">
-    <value>Hosting ASP.NET Core applications on Compute Engine requires </value>
+    <value>Hosting ASP.NET Core applications on Compute Engine should use the </value>
     <comment>The first part of the second line of the ASP.NET Core on GCE warning dialog.</comment>
   </data>
-  <data name="PublishGceWarningStepLine2HyperLink" xml:space="preserve">
+  <data name="PublishGceWarningStepLine2MarketplaceLink" xml:space="preserve">
+    <value>ASP.NET Framework Marketplace Image</value>
+    <comment>The text of the link to the ASP.NET Framework Marketplace </comment>
+  </data>
+  <data name="PublishGceWarningStepLine2AfterLink" xml:space="preserve">
+    <value>.</value>
+    <comment>The text after the link of the second line of the ASP.NET Core on GCE warning dialog.</comment>
+  </data>
+  <data name="PublishGceWarningStepLine3BeforeLink" xml:space="preserve">
+    <value>The default windows image will require </value>
+    <comment>The part between the links of the second line of the ASP.NET Core on GCE warning dialog.</comment>
+  </data>
+  <data name="PublishGceWarningStepLine3DocsLink" xml:space="preserve">
     <value>manual configuration of IIS</value>
     <comment>The text of the hyperlink on the ASP.NET Core on GCE Warning dialog.</comment>
   </data>
-  <data name="PublishGceWarningStepLine2AfterLink" xml:space="preserve">
+  <data name="PublishGceWarningStepLine3AfterLink" xml:space="preserve">
     <value>.</value>
     <comment>The end part of the second line of the ASP.NET Core on GCE warning dialog.</comment>
   </data>

diff --git a/...ExtensionUnitTests/PublishDialog/Steps/CoreGceWarning/CoreGceWarningStepViewModelTests.cs b/...ExtensionUnitTests/PublishDialog/Steps/CoreGceWarning/CoreGceWarningStepViewModelTests.cs
@@ -192,5 +192,13 @@ public void TestBrowseAspNetCoreIisDocs_OpensBrowser()
 
             _browserServiceMock.Verify(b => b.OpenBrowser(CoreGceWarningStepViewModel.AspNetCoreIisDocsLink));
         }
+
+        [TestMethod]
+        public void TestBrowsAspNetMarketplaceImage_OpensBrowser()
+        {
+            _objectUnderTest.BrowseAspNetMarketplaceImage.Execute(null);
+
+            _browserServiceMock.Verify(b => b.OpenBrowser(CoreGceWarningStepViewModel.AspNetMarketplaceImageLink));
+        }
     }
 }