Skip to content

Commit c1a0800

Browse files
kerryjiangkerryjiang
committed
start to use AnyLog; improved the composite targets implementation
1 parent ec80b78 commit c1a0800

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+289
-277
lines changed

‎Agent/SuperSocket.Agent.Net40.csproj

+15
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
15+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16+
<RestorePackages>true</RestorePackages>
1517
</PropertyGroup>
1618
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1719
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,6 +35,9 @@
3335
<WarningLevel>4</WarningLevel>
3436
</PropertyGroup>
3537
<ItemGroup>
38+
<Reference Include="AnyLog">
39+
<HintPath>..\packages\AnyLog.0.1.1.0\lib\net40\AnyLog.dll</HintPath>
40+
</Reference>
3641
<Reference Include="System" />
3742
<Reference Include="System.configuration" />
3843
<Reference Include="System.Core" />
@@ -61,7 +66,17 @@
6166
<Name>SuperSocket.SocketEngine.Net40</Name>
6267
</ProjectReference>
6368
</ItemGroup>
69+
<ItemGroup>
70+
<None Include="packages.config" />
71+
</ItemGroup>
6472
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
73+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
74+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
75+
<PropertyGroup>
76+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
77+
</PropertyGroup>
78+
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
79+
</Target>
6580
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6681
Other similar extension points exist, see Microsoft.Common.targets.
6782
<Target Name="BeforeBuild">

‎Agent/SuperSocket.Agent.Net45.csproj

+15
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<SignAssembly>false</SignAssembly>
5+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
6+
<RestorePackages>true</RestorePackages>
57
</PropertyGroup>
68
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
79
<PropertyGroup>
@@ -38,6 +40,9 @@
3840
<Prefer32Bit>false</Prefer32Bit>
3941
</PropertyGroup>
4042
<ItemGroup>
43+
<Reference Include="AnyLog">
44+
<HintPath>..\packages\AnyLog.0.1.1.0\lib\net40\AnyLog.dll</HintPath>
45+
</Reference>
4146
<Reference Include="System" />
4247
<Reference Include="System.configuration" />
4348
<Reference Include="System.Core" />
@@ -66,7 +71,17 @@
6671
<Name>SuperSocket.SocketEngine.Net45</Name>
6772
</ProjectReference>
6873
</ItemGroup>
74+
<ItemGroup>
75+
<None Include="packages.config" />
76+
</ItemGroup>
6977
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
78+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
79+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
80+
<PropertyGroup>
81+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
82+
</PropertyGroup>
83+
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
84+
</Target>
7085
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7186
Other similar extension points exist, see Microsoft.Common.targets.
7287
<Target Name="BeforeBuild">

‎Agent/WorkItemAgent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
using System.Linq;
44
using System.Runtime.Remoting.Lifetime;
55
using System.Text;
6+
using AnyLog;
67
using SuperSocket.SocketBase;
78
using SuperSocket.SocketBase.Config;
8-
using SuperSocket.SocketBase.Logging;
99
using SuperSocket.SocketBase.Metadata;
1010
using SuperSocket.SocketBase.Provider;
1111
using SuperSocket.SocketEngine;

‎Agent/packages.config

+4
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="AnyLog" version="0.1.1.0" targetFramework="net45" />
4+
</packages>

‎Dlr/DynamicCommandLoaderBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using SuperSocket.SocketBase;
99
using SuperSocket.SocketBase.Command;
1010
using SuperSocket.SocketBase.Config;
11-
using SuperSocket.SocketBase.Logging;
11+
using AnyLog;
1212
using SuperSocket.SocketBase.Protocol;
1313

1414
namespace SuperSocket.Dlr

0 commit comments

Comments
 (0)