Skip to content

Commit 0926b93

Browse files
author
Nate McMaster
committed
Ensure Identity.Views.{V3, V4}.dll are the AllItemsFullPathWithTargetPath group so they get copied across ProjectReferences
1 parent 9556cc1 commit 0926b93

File tree

2 files changed

+6
-25
lines changed

2 files changed

+6
-25
lines changed

src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,11 @@
118118
Name="_GetRazorDlls" BeforeTargets="GetCopyToOutputDirectoryItems">
119119

120120
<ItemGroup>
121-
<_AllItemsFullPathWithTargetPath Include="$(MSBuildThisFileDirectory)$(IntermediateOutputPath)%(UIFrameworkVersionMoniker.Identity)\$(TargetName).Views.%(UIFrameworkVersionMoniker.Identity).*" />
121+
<_GeneratedRazorViews Include="$(TargetDir)$(TargetName).Views.%(UIFrameworkVersionMoniker.Identity).dll" />
122+
<_GeneratedRazorViews Include="$(TargetDir)$(TargetName).Views.%(UIFrameworkVersionMoniker.Identity).pdb" />
122123

123-
<AllItemsFullPathWithTargetPath Include="%(_AllItemsFullPathWithTargetPath.FullPath)">
124-
<TargetPath>%(Filename)%(Extension)</TargetPath>
124+
<AllItemsFullPathWithTargetPath Include="%(_GeneratedRazorViews.FullPath)">
125+
<TargetPath>%(FileName)%(Extension)</TargetPath>
125126
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
126127
</AllItemsFullPathWithTargetPath>
127128
</ItemGroup>
@@ -143,8 +144,8 @@
143144

144145
<Target Name="VerifyBuildOutputs" AfterTargets="BuildRazorViews">
145146
<ItemGroup>
146-
<ExpectedOutputFile Include="$(OutputPath)Microsoft.AspNetCore.Identity.UI.Views.V3.dll" />
147-
<ExpectedOutputFile Include="$(OutputPath)Microsoft.AspNetCore.Identity.UI.Views.V4.dll" />
147+
<ExpectedOutputFile Include="$(TargetDir)Microsoft.AspNetCore.Identity.UI.Views.V3.dll" />
148+
<ExpectedOutputFile Include="$(TargetDir)Microsoft.AspNetCore.Identity.UI.Views.V4.dll" />
148149
</ItemGroup>
149150

150151
<Error Text="Unable to find precompiled view file %(ExpectedOutputFile.Identity)"

src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,4 @@
2424
</ItemGroup>
2525

2626
<Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
27-
28-
<Target Name="CopyViews" AfterTargets="Build" Condition="$(TargetFramework) != ''">
29-
<ItemGroup>
30-
<_IdentityUIViewsAssemblies Include="$(MSBuildThisFileDirectory)..\..\UI\src\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Identity.UI.Views.*.dll" />
31-
</ItemGroup>
32-
<Copy
33-
SourceFiles="@(_IdentityUIViewsAssemblies)"
34-
DestinationFolder="$(OutputPath)" />
35-
</Target>
36-
37-
<Target Name="VerifyBuildOutputs" AfterTargets="Build" Condition="$(TargetFramework) != ''">
38-
<ItemGroup>
39-
<ExpectedOutputFile Include="$(OutputPath)Microsoft.AspNetCore.Identity.UI.Views.V3.dll" />
40-
<ExpectedOutputFile Include="$(OutputPath)Microsoft.AspNetCore.Identity.UI.Views.V4.dll" />
41-
</ItemGroup>
42-
43-
<Error Text="Unable to find precompiled view file %(ExpectedOutputFile.Identity)"
44-
Condition="!Exists('%(ExpectedOutputFile.Identity)')" />
45-
</Target>
46-
4727
</Project>

0 commit comments

Comments
 (0)