huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge in 'release/2.2' changes

This commit is contained in:
dotnet-bot 2019-01-05 00:26:34 +00:00
parent 590fe38284 0926b93b98
commit 48a74801d3
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
View File

@ -118,10 +118,11 @@
Name="_GetRazorDlls" BeforeTargets="GetCopyToOutputDirectoryItems">
<ItemGroup>
<_AllItemsFullPathWithTargetPath Include="$(MSBuildThisFileDirectory)$(IntermediateOutputPath)%(UIFrameworkVersionMoniker.Identity)\$(TargetName).Views.%(UIFrameworkVersionMoniker.Identity).*" />
<_GeneratedRazorViews Include="$(TargetDir)$(TargetName).Views.%(UIFrameworkVersionMoniker.Identity).dll" />
<_GeneratedRazorViews Include="$(TargetDir)$(TargetName).Views.%(UIFrameworkVersionMoniker.Identity).pdb" />
<AllItemsFullPathWithTargetPath Include="%(_AllItemsFullPathWithTargetPath.FullPath)">
<TargetPath>%(Filename)%(Extension)</TargetPath>
<AllItemsFullPathWithTargetPath Include="%(_GeneratedRazorViews.FullPath)">
<TargetPath>%(FileName)%(Extension)</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</AllItemsFullPathWithTargetPath>
</ItemGroup>
@ -143,8 +144,8 @@
<Target Name="VerifyBuildOutputs" AfterTargets="BuildRazorViews">
<ItemGroup>
<ExpectedOutputFile Include="$(OutputPath)Microsoft.AspNetCore.Identity.UI.Views.V3.dll" />
<ExpectedOutputFile Include="$(OutputPath)Microsoft.AspNetCore.Identity.UI.Views.V4.dll" />
<ExpectedOutputFile Include="$(TargetDir)Microsoft.AspNetCore.Identity.UI.Views.V3.dll" />
<ExpectedOutputFile Include="$(TargetDir)Microsoft.AspNetCore.Identity.UI.Views.V4.dll" />
</ItemGroup>
<Error Text="Unable to find precompiled view file %(ExpectedOutputFile.Identity)"

20
src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
View File

@ -24,24 +24,4 @@
</ItemGroup>
<Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
<Target Name="CopyViews" AfterTargets="Build" Condition="$(TargetFramework) != ''">
<ItemGroup>
<_IdentityUIViewsAssemblies Include="$(MSBuildThisFileDirectory)..\..\UI\src\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Identity.UI.Views.*.dll" />
</ItemGroup>
<Copy
SourceFiles="@(_IdentityUIViewsAssemblies)"
DestinationFolder="$(OutputPath)" />
</Target>
<Target Name="VerifyBuildOutputs" AfterTargets="Build" Condition="$(TargetFramework) != ''">
<ItemGroup>
<ExpectedOutputFile Include="$(OutputPath)Microsoft.AspNetCore.Identity.UI.Views.V3.dll" />
<ExpectedOutputFile Include="$(OutputPath)Microsoft.AspNetCore.Identity.UI.Views.V4.dll" />
</ItemGroup>
<Error Text="Unable to find precompiled view file %(ExpectedOutputFile.Identity)"
Condition="!Exists('%(ExpectedOutputFile.Identity)')" />
</Target>
</Project>