Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Client/ShoppingCartStarter.Client.csproj
This commit is contained in:
Jon Hilton 2020-06-24 11:07:41 +01:00
commit c2f6b42ca0

View file

@ -29,4 +29,17 @@
</Content>
</ItemGroup>
<ItemGroup>
<Content Update="Pages\Cart\Item.razor">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
<Content Update="wwwroot\images\test-image.jpg">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="Pages\Cart\Cart.razor">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
</ItemGroup>
</Project>