42 lines
1.7 KiB
XML
42 lines
1.7 KiB
XML
<<<<<<< HEAD
|
||
<Project>
|
||
<Import
|
||
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
|
||
Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
|
||
|
||
=======
|
||
<Project>
|
||
>>>>>>> ANCM/dev
|
||
<Import Project="version.props" />
|
||
<Import Project="build\dependencies.props" />
|
||
<Import Project="build\sources.props" />
|
||
|
||
<<<<<<< HEAD
|
||
<PropertyGroup>
|
||
<Product>Microsoft ASP.NET Core</Product>
|
||
<RepositoryUrl>https://github.com/aspnet/IISIntegration</RepositoryUrl>
|
||
<RepositoryType>git</RepositoryType>
|
||
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
|
||
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
|
||
<SignAssembly>true</SignAssembly>
|
||
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
|
||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||
</PropertyGroup>
|
||
|
||
<ItemGroup>
|
||
<!-- This is an experimental version of the compiler. See https://github.com/dotnet/csharplang/issues/666 for more details. -->
|
||
<PackageReference Include="Microsoft.NETCore.Compilers" Version="$(MicrosoftNETCoreCompilersPackageVersion)" PrivateAssets="All" />
|
||
</ItemGroup>
|
||
|
||
=======
|
||
<PropertyGroup>
|
||
<Product>Microsoft ASP.NET Core</Product>
|
||
<RepositoryUrl>https://github.com/aspnet/AspNetCoreModule</RepositoryUrl>
|
||
<RepositoryType>git</RepositoryType>
|
||
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
|
||
<SignAssembly>true</SignAssembly>
|
||
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
|
||
</PropertyGroup>
|
||
>>>>>>> ANCM/dev
|
||
</Project>
|