net35 does not play nicely with dotnet build from Core SDKs (see https://github.com/Microsoft/msbuild/issues/1333) - therefore removed net35 target (to be discussed if ok)

This commit is contained in:
Christoph Wille 2019-05-25 15:14:36 +02:00
Родитель c7d9de9dd2
Коммит 06b171c502
3 изменённых файлов: 3 добавлений и 20 удалений

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

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>netcoreapp3.0;net40;net45;net35</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net40;net45</TargetFrameworks>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<DefineConstants>TRACE;DOTNET4</DefineConstants>
@ -21,19 +21,12 @@
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
<DefineConstants>TRACE;DOTNET4</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net35' ">
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Web" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj" />
</ItemGroup>

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

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net40;net45;net35</TargetFrameworks>
<TargetFrameworks>net40;net45</TargetFrameworks>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<DefineConstants>TRACE;DOTNET4</DefineConstants>
@ -20,9 +20,6 @@
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
<DefineConstants>TRACE;DOTNET4</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net35' ">
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />

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

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>netcoreapp3.0;net40;net45;net35</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net40;net45</TargetFrameworks>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<DefineConstants>TRACE;DOTNET4</DefineConstants>
@ -38,19 +38,12 @@
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
<DefineConstants>TRACE;DOTNET4</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net35' ">
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Web" />
</ItemGroup>
<ItemGroup>
<None Remove="Search\next.png" />
<None Remove="Search\prev.png" />