From 8e23eb38b40ce6c5ef8dec5e1168009678165e32 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Wed, 25 Jul 2018 19:08:55 -0700
Subject: [PATCH] Honor NoBuild flag during publish

---
 .../Sdk.Razor.CurrentVersion.targets          |  2 +-
 .../IntegrationTests/Assert.cs                |  4 +-
 .../PublishIntegrationTest.cs                 | 41 +++++++++++++++++++
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index d100b112cc..885d21988d 100644
--- a/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -396,7 +396,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     Name="_RazorPrepareForPublish"
     AfterTargets="PrepareForPublish"
     DependsOnTargets="RazorCompile"
-    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true'">
+    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true' and '$(NoBuild)'!='true'">
   </Target>
 
   <!--
diff --git a/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/Assert.cs b/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/Assert.cs
index 74bfdb1992..4d3d035e3b 100644
--- a/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/Assert.cs
+++ b/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/Assert.cs
@@ -221,7 +221,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        public static void FileExists(MSBuildResult result, params string[] paths)
+        public static string FileExists(MSBuildResult result, params string[] paths)
         {
             if (result == null)
             {
@@ -233,6 +233,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             {
                 throw new FileMissingException(result, filePath);
             }
+
+            return filePath;
         }
 
         public static void FileCountEquals(MSBuildResult result, int expected, string directoryPath, string searchPattern)
diff --git a/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PublishIntegrationTest.cs b/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PublishIntegrationTest.cs
index aa3c141987..7e9eb1f797 100644
--- a/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PublishIntegrationTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PublishIntegrationTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -401,5 +402,45 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(result, PublishOutputPath, "ClassLibrary2.Views.dll");
             Assert.FileExists(result, PublishOutputPath, "ClassLibrary2.Views.pdb");
         }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_WithNoBuild_FailsWithoutBuild()
+        {
+            // Publish without building shouldn't succeed.
+            var result = await DotnetMSBuild("Publish", "/p:NoBuild=true");
+
+            Assert.BuildFailed(result);
+            Assert.BuildError(result, "MSB3030"); // Could not copy the file "obj/Debug/netcoreapp2.2/SimpleMvc.dll because it couldn't be found.
+
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_WithNoBuild_CopiesAlreadyCompiledViews()
+        {
+            // Build
+            var result = await DotnetMSBuild("Build", "/p:AssemblyVersion=1.1.1.1");
+
+            Assert.BuildPassed(result);
+            var assemblyPath = Assert.FileExists(result, OutputPath, "SimpleMvc.dll");
+            var viewsAssemblyPath = Assert.FileExists(result, OutputPath, "SimpleMvc.Views.dll");
+            var assemblyVersion = AssemblyName.GetAssemblyName(assemblyPath).Version;
+            var viewsAssemblyVersion = AssemblyName.GetAssemblyName(viewsAssemblyPath).Version;
+
+            // Publish should copy dlls from OutputPath
+            result = await DotnetMSBuild("Publish", "/p:NoBuild=true");
+
+            Assert.BuildPassed(result);
+            var publishAssemblyPath = Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            var publishViewsAssemblyPath = Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            var publishAssemblyVersion = AssemblyName.GetAssemblyName(publishAssemblyPath).Version;
+            var publishViewsAssemblyVersion = AssemblyName.GetAssemblyName(publishViewsAssemblyPath).Version;
+
+            Assert.Equal(assemblyVersion, publishAssemblyVersion);
+            Assert.Equal(viewsAssemblyVersion, publishViewsAssemblyVersion);
+        }
     }
 }