From d1ee93b94bd6c3edfaf5d4422f5883443aa806fe Mon Sep 17 00:00:00 2001 From: David Fowler <davidfowl@gmail.com> Date: Tue, 5 Mar 2019 09:19:28 -0800 Subject: [PATCH] Allow disabling automatic MVC reference (#8167) --- eng/Workarounds.targets | 2 +- .../Kestrel/samples/Http2SampleApp/Http2SampleApp.csproj | 1 + .../Kestrel/samples/LargeResponseApp/LargeResponseApp.csproj | 1 + src/Servers/Kestrel/samples/PlaintextApp/PlaintextApp.csproj | 1 + src/Servers/Kestrel/samples/SampleApp/SampleApp.csproj | 1 + .../Kestrel/samples/SystemdTestApp/SystemdTestApp.csproj | 1 + src/SignalR/samples/JwtSample/JwtSample.csproj | 1 + src/SignalR/samples/SignalRSamples/SignalRSamples.csproj | 1 + src/SignalR/samples/SocialWeather/SocialWeather.csproj | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets index fe4ed39cca4..923051792bd 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -7,7 +7,7 @@ <ItemGroup> <FrameworkReference Remove="Microsoft.AspNetCore.App" /> <!-- Required because the Razor SDK will generate attributes --> - <Reference Include="Microsoft.AspNetCore.Mvc" Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' AND '$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> + <Reference Include="Microsoft.AspNetCore.Mvc" Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' AND '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(GenerateRazorAssemblyInfo)' == 'true'" /> </ItemGroup> <!-- Workaround https://github.com/dotnet/cli/issues/10528 --> diff --git a/src/Servers/Kestrel/samples/Http2SampleApp/Http2SampleApp.csproj b/src/Servers/Kestrel/samples/Http2SampleApp/Http2SampleApp.csproj index c7eb03c2c1c..78b907bd80b 100644 --- a/src/Servers/Kestrel/samples/Http2SampleApp/Http2SampleApp.csproj +++ b/src/Servers/Kestrel/samples/Http2SampleApp/Http2SampleApp.csproj @@ -4,6 +4,7 @@ <TargetFramework>netcoreapp3.0</TargetFramework> <IsPackable>false</IsPackable> <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile> + <GenerateRazorAssemblyInfo>false</GenerateRazorAssemblyInfo> </PropertyGroup> <ItemGroup> diff --git a/src/Servers/Kestrel/samples/LargeResponseApp/LargeResponseApp.csproj b/src/Servers/Kestrel/samples/LargeResponseApp/LargeResponseApp.csproj index 976d4df073d..86fd68771b9 100644 --- a/src/Servers/Kestrel/samples/LargeResponseApp/LargeResponseApp.csproj +++ b/src/Servers/Kestrel/samples/LargeResponseApp/LargeResponseApp.csproj @@ -4,6 +4,7 @@ <TargetFramework>netcoreapp3.0</TargetFramework> <IsPackable>false</IsPackable> <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile> + <GenerateRazorAssemblyInfo>false</GenerateRazorAssemblyInfo> </PropertyGroup> <ItemGroup> diff --git a/src/Servers/Kestrel/samples/PlaintextApp/PlaintextApp.csproj b/src/Servers/Kestrel/samples/PlaintextApp/PlaintextApp.csproj index 976d4df073d..86fd68771b9 100644 --- a/src/Servers/Kestrel/samples/PlaintextApp/PlaintextApp.csproj +++ b/src/Servers/Kestrel/samples/PlaintextApp/PlaintextApp.csproj @@ -4,6 +4,7 @@ <TargetFramework>netcoreapp3.0</TargetFramework> <IsPackable>false</IsPackable> <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile> + <GenerateRazorAssemblyInfo>false</GenerateRazorAssemblyInfo> </PropertyGroup> <ItemGroup> diff --git a/src/Servers/Kestrel/samples/SampleApp/SampleApp.csproj b/src/Servers/Kestrel/samples/SampleApp/SampleApp.csproj index 1e7a08eff73..10bf6d8d092 100644 --- a/src/Servers/Kestrel/samples/SampleApp/SampleApp.csproj +++ b/src/Servers/Kestrel/samples/SampleApp/SampleApp.csproj @@ -4,6 +4,7 @@ <TargetFramework>netcoreapp3.0</TargetFramework> <IsPackable>false</IsPackable> <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile> + <GenerateRazorAssemblyInfo>false</GenerateRazorAssemblyInfo> </PropertyGroup> <ItemGroup> diff --git a/src/Servers/Kestrel/samples/SystemdTestApp/SystemdTestApp.csproj b/src/Servers/Kestrel/samples/SystemdTestApp/SystemdTestApp.csproj index b651cc6cf97..114c9b5fedf 100644 --- a/src/Servers/Kestrel/samples/SystemdTestApp/SystemdTestApp.csproj +++ b/src/Servers/Kestrel/samples/SystemdTestApp/SystemdTestApp.csproj @@ -4,6 +4,7 @@ <TargetFramework>netcoreapp3.0</TargetFramework> <IsPackable>false</IsPackable> <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile> + <GenerateRazorAssemblyInfo>false</GenerateRazorAssemblyInfo> </PropertyGroup> <ItemGroup> diff --git a/src/SignalR/samples/JwtSample/JwtSample.csproj b/src/SignalR/samples/JwtSample/JwtSample.csproj index c1a56e75a47..126fc1573f8 100644 --- a/src/SignalR/samples/JwtSample/JwtSample.csproj +++ b/src/SignalR/samples/JwtSample/JwtSample.csproj @@ -2,6 +2,7 @@ <PropertyGroup> <TargetFramework>netcoreapp3.0</TargetFramework> + <GenerateRazorAssemblyInfo>false</GenerateRazorAssemblyInfo> </PropertyGroup> <ItemGroup> diff --git a/src/SignalR/samples/SignalRSamples/SignalRSamples.csproj b/src/SignalR/samples/SignalRSamples/SignalRSamples.csproj index 283fe8d1bb3..45adb3b3cde 100644 --- a/src/SignalR/samples/SignalRSamples/SignalRSamples.csproj +++ b/src/SignalR/samples/SignalRSamples/SignalRSamples.csproj @@ -2,6 +2,7 @@ <PropertyGroup> <TargetFramework>netcoreapp3.0</TargetFramework> + <GenerateRazorAssemblyInfo>false</GenerateRazorAssemblyInfo> </PropertyGroup> <ItemGroup> diff --git a/src/SignalR/samples/SocialWeather/SocialWeather.csproj b/src/SignalR/samples/SocialWeather/SocialWeather.csproj index 2c70cd80b8a..17c1c0059d7 100644 --- a/src/SignalR/samples/SocialWeather/SocialWeather.csproj +++ b/src/SignalR/samples/SocialWeather/SocialWeather.csproj @@ -2,6 +2,7 @@ <PropertyGroup> <TargetFramework>netcoreapp3.0</TargetFramework> + <GenerateRazorAssemblyInfo>false</GenerateRazorAssemblyInfo> </PropertyGroup> <ItemGroup> -- GitLab