Skip to content
This repository was archived by the owner on Apr 21, 2021. It is now read-only.

Commit 497e618

Browse files
committed
Separate packages.config
VS2015 fix build failure
1 parent c455e5e commit 497e618

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

EventHook/EventHook.csproj

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<DebugType>full</DebugType>
2020
<Optimize>false</Optimize>
2121
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>TRACE;DEBUG</DefineConstants>
22+
<DefineConstants>TRACE;DEBUG;NET40</DefineConstants>
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
2525
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -29,7 +29,7 @@
2929
<DebugType>pdbonly</DebugType>
3030
<Optimize>true</Optimize>
3131
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
32+
<DefineConstants>TRACE;NET40</DefineConstants>
3333
<ErrorReport>prompt</ErrorReport>
3434
<WarningLevel>4</WarningLevel>
3535
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -38,7 +38,7 @@
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-Net45|AnyCPU'">
3939
<DebugSymbols>true</DebugSymbols>
4040
<OutputPath>bin\Debug-Net45\</OutputPath>
41-
<DefineConstants>TRACE;DEBUG</DefineConstants>
41+
<DefineConstants>TRACE;DEBUG;NET45</DefineConstants>
4242
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
4343
<DebugType>full</DebugType>
4444
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -48,7 +48,7 @@
4848
</PropertyGroup>
4949
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-Net45|AnyCPU'">
5050
<OutputPath>bin\Release-Net45\</OutputPath>
51-
<DefineConstants>TRACE</DefineConstants>
51+
<DefineConstants>TRACE;NET45</DefineConstants>
5252
<Optimize>true</Optimize>
5353
<DebugType>pdbonly</DebugType>
5454
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -167,8 +167,13 @@
167167
</ItemGroup>
168168
<ItemGroup>
169169
<None Include="app.config" />
170+
</ItemGroup>
171+
<ItemGroup Condition=" '$(Configuration)'=='Debug' Or '$(Configuration)'=='Release'">
170172
<None Include="packages.config" />
171173
</ItemGroup>
174+
<ItemGroup Condition=" '$(Configuration)'=='Debug-Net45' Or '$(Configuration)'=='Release-Net45'">
175+
<None Include="packages-Net45.config" />
176+
</ItemGroup>
172177
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
173178
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
174179
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">

EventHook/packages-Net45.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net45" />
4+
</packages>

EventHook/packages.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44
<package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40" />
55
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
66
<package id="Nito.AsyncEx" version="2.1.3" targetFramework="net40" />
7-
8-
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net45" />
97
</packages>

0 commit comments

Comments
 (0)