Skip to content

Commit 6aaf694

Browse files
committed
Ensure Microsoft.AspNetCore.Razor.RuntimeCompilation has the right build targets
* Include build and build transitive folders in RuntimeCompilation package * Use a different folder name to allow GitHub indexing. See #14846 * Add a test to verify transitive build targets work Fixes #14813 Fixes #12768
1 parent 48ba501 commit 6aaf694

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<None Include="build\$(DefaultNetCoreTargetFramework)\*" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)" />
26+
<None Include="targets\$(PackageId).targets" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)\$(PackageId).targets" />
27+
<None Include="targets\$(PackageId).targets" Pack="true" PackagePath="buildTransitive\$(DefaultNetCoreTargetFramework)\$(PackageId).targets" />
2728
</ItemGroup>
2829
</Project>

src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
5-
<DefineConstants>$(DefineConstants)</DefineConstants>
65
<!-- We have tests that test runtime view compilation. -->
76
<RazorCompileOnBuild>false</RazorCompileOnBuild>
87
<IsTestAssetProject>true</IsTestAssetProject>
@@ -21,4 +20,6 @@
2120
<Reference Include="Microsoft.AspNetCore.Diagnostics" />
2221
</ItemGroup>
2322

23+
<Import Project="..\..\..\Mvc.Razor.RuntimeCompilation\src\targets\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.targets" />
24+
2425
</Project>

src/ProjectTemplates/test/MvcTemplateTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ public MvcTemplateTest(ProjectFactoryFixture projectFactory, ITestOutputHelper o
2525
public ProjectFactoryFixture ProjectFactory { get; }
2626
public ITestOutputHelper Output { get; }
2727

28-
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/14022")]
28+
[Fact]
2929
public async Task MvcTemplate_NoAuthFSharp() => await MvcTemplateCore(languageOverride: "F#");
3030

3131
[Fact]
3232
public async Task MvcTemplate_NoAuthCSharp() => await MvcTemplateCore(languageOverride: null);
3333

34-
3534
private async Task MvcTemplateCore(string languageOverride)
3635
{
3736
Project = await ProjectFactory.GetOrCreateProject("mvcnoauth" + (languageOverride == "F#" ? "fsharp" : "csharp"), Output);

0 commit comments

Comments
 (0)