From 5b71a24b4fcae223bd3fa15426e03a1a9a733936 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 4 Apr 2019 06:05:46 -0700 Subject: [PATCH] Fixup \n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/f6dd26121187bd3fa9493bfb1df4d700c9999aac --- .../Microsoft.NET.Sdk.Razor.Configuration.targets | 4 +--- .../Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets | 4 ++-- .../test/IntegrationTests/BuildIntegrationTest.cs | 2 +- .../IntegrationTests/ConfigurationMetadataIntegrationTest.cs | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets index 53c961556a..9267ba8614 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets +++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets @@ -30,12 +30,10 @@ Copyright (c) .NET Foundation. All rights reserved. - - - <_GenerateRazorAssemblyInfoDependsOn Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'"> - _ResolveMvcSpecificRazorConfiguration; + _ResolveMvcAssemblyAttributes; $(_GenerateRazorAssemblyInfoDependsOn); diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs index bb12cd662c..e0bbf50b9c 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs @@ -444,7 +444,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests [Fact] [InitializeTestProject("SimpleMvc")] - public async Task Build_GeneratesHostingAttributesByDefault() + public async Task Build_GeneratesHostingAttributes_WhenGenerateRazorHostingAssemblyInfoIsSet() { var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.AssemblyInfo.cs"); var result = await DotnetMSBuild("Build", "/p:GenerateRazorHostingAssemblyInfo=false"); diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs index 296db5c373..6d57b38214 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests { } - [Fact] + [Fact] [InitializeTestProject("SimpleMvc")] public async Task Build_DoesNotAddHostingMetadata_ByDefault() {