SDK updates for components tooling

This is a bug fix for the RazorComponentWithTargetPath xaml rule. We
need to have separate targets for components and views.

The other fix here is a change to the set of workarounds we're using for
components currently. We need this project capability for the correct
project host to be used when loading the project.

(cherry picked from commit dotnet/aspnetcore-tooling@78163f7e4f)
\n\nCommit migrated from f8835ce7a8
This commit is contained in:
Ryan Nowak 2019-01-04 11:17:40 -08:00
parent 19bc651858
commit b10374a368
4 changed files with 16 additions and 6 deletions

View File

@ -59,8 +59,14 @@ Copyright (c) .NET Foundation. All rights reserved.
<Target
Name="RazorGenerateDesignTime"
DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths;ResolveRazorComponentInputs;AssignRazorComponentTargetPaths"
Returns="@(RazorGenerateWithTargetPath);@(RazorComponentWithTargetPath)">
DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths"
Returns="@(RazorGenerateWithTargetPath)">
</Target>
<Target
Name="RazorGenerateComponentDesignTime"
DependsOnTargets="ResolveRazorComponentInputs;AssignRazorComponentTargetPaths"
Returns="@(RazorComponentWithTargetPath)">
</Target>
</Project>

View File

@ -2,14 +2,14 @@
<Rule
Description="Razor Document Properties"
DisplayName="Razor Document Properties"
Name="RazorGenerateWithTargetPath"
Name="RazorComponentWithTargetPath"
PageTemplate="generic"
xmlns="http://schemas.microsoft.com/build/2009/properties">
<Rule.DataSource>
<DataSource
Persistence="ProjectFile"
ItemType="RazorComponentWithTargetPath"
MSBuildTarget="RazorGenerateDesignTime"
MSBuildTarget="RazorGenerateComponentDesignTime"
HasConfigurationCondition="False"
SourceOfDefaultValue="AfterContext"
SourceType="TargetResults" />

View File

@ -67,11 +67,11 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
[Fact]
[InitializeTestProject("ComponentLibrary")]
public async Task RazorGenerateDesignTime_ReturnsRazorComponentWithTargetPath()
public async Task RazorGenerateComponentDesignTime_ReturnsRazorComponentWithTargetPath()
{
TargetFramework = "netstandard2.0";
var result = await DotnetMSBuild("RazorGenerateDesignTime;_IntrospectRazorComponentWithTargetPath");
var result = await DotnetMSBuild("RazorGenerateComponentDesignTime;_IntrospectRazorComponentWithTargetPath");
Assert.BuildPassed(result);

View File

@ -42,6 +42,10 @@
<RazorGenerate Remove="@(RazorGenerate)" />
</ItemGroup>
</Target>
<ItemGroup>
<ProjectCapability Include="DotNetCoreRazorConfiguration" />
</ItemGroup>
<!--
END COMPONENT .cshtml WORKAROUND
-->