Fixing a couple issues by adding properties to the common targets:

* Pain in the ass to keep all the csproj framework versions in sync. So just update one place.
* All the csprojs were missing DEBUG being #defined as well as pdb generation (which shouldly was complaining about).
This commit is contained in:
Scott Bilas 2018-11-07 14:25:08 +01:00
Родитель 12c7f1b1b1
Коммит b7a81ea28d
7 изменённых файлов: 15 добавлений и 20 удалений

Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../common.targets" /> <Import Project="../common.targets" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net461</TargetFramework> <TargetFrameworks>$(Unity_DotNetTargetFrameworks)</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations"> <PackageReference Include="JetBrains.Annotations">

Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../common.targets" /> <Import Project="../common.targets" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net461</TargetFramework> <TargetFrameworks>$(Unity_DotNetTargetFrameworks)</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations"> <PackageReference Include="JetBrains.Annotations">

Просмотреть файл

@ -1,11 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../common.targets" /> <Import Project="../common.targets" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net461</TargetFramework> <TargetFrameworks>$(Unity_DotNetTargetFrameworks)</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations"> <PackageReference Include="JetBrains.Annotations">
<Version>2018.2.1</Version> <Version>2018.2.1</Version>
@ -14,5 +11,4 @@
<Version>4.5.0</Version> <Version>4.5.0</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

Просмотреть файл

@ -1,5 +1,11 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<DefaultItemExcludes>$(DefaultItemExcludes);**\*.bak;**\*.orig</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);**\*.bak;**\*.orig</DefaultItemExcludes>
<Unity_DotNetTargetFrameworks>net461</Unity_DotNetTargetFrameworks>
<Unity_CoreTargetFrameworks>netstandard2.0;net35</Unity_CoreTargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>Full</DebugType>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../source/common.targets" /> <Import Project="../../source/common.targets" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net461</TargetFramework> <TargetFrameworks>$(Unity_DotNetTargetFrameworks)</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations"> <PackageReference Include="JetBrains.Annotations">

Просмотреть файл

@ -1,9 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../source/common.targets" /> <Import Project="../../../source/common.targets" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;net35</TargetFrameworks> <TargetFrameworks>$(Unity_CoreTargetFrameworks)</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

Просмотреть файл

@ -1,13 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../source/common.targets" /> <Import Project="../../../source/common.targets" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;net35</TargetFrameworks> <TargetFrameworks>$(Unity_CoreTargetFrameworks)</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\DependentAssembly\DependentAssembly.csproj" /> <ProjectReference Include="..\DependentAssembly\DependentAssembly.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>