|
|
|
@ -1,37 +1,4 @@
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
|
|
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<PropertyGroup>
|
|
|
|
|
|
|
|
<TargetFramework>net6.0</TargetFramework>
|
|
|
|
|
|
|
|
<Nullable>enable</Nullable>
|
|
|
|
|
|
|
|
<ImplicitUsings>enable</ImplicitUsings>
|
|
|
|
|
|
|
|
<UserSecretsId>41eb41f8-57fb-408a-baab-7328f468e749</UserSecretsId>
|
|
|
|
|
|
|
|
<DockerDefaultTargetOS>Windows</DockerDefaultTargetOS>
|
|
|
|
|
|
|
|
<DockerfileContext>.</DockerfileContext>
|
|
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
|
|
|
<Compile Remove="Shared\HeaderLayout.cs" />
|
|
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
|
|
|
<None Remove="Shared\CraftLayout.css" />
|
|
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
|
|
|
<PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.0" />
|
|
|
|
|
|
|
|
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
|
|
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
|
|
|
<Content Update="wwwroot\Images\CraftSharp-Logo.png">
|
|
|
|
|
|
|
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
|
|
|
|
|
|
</Content>
|
|
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</Project>
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<PropertyGroup>
|
|
|
|
<PropertyGroup>
|
|
|
|
<TargetFramework>net6.0</TargetFramework>
|
|
|
|
<TargetFramework>net6.0</TargetFramework>
|
|
|
|
@ -69,5 +36,3 @@
|
|
|
|
</ItemGroup>
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
|
|
|
|
|
|
</Project>
|
|
|
|
</Project>
|
|
|
|
|
|
|
|
|
|
|
|
>>>>>>> arthur_classes
|
|
|
|
|
|
|
|
|
