add abstract property

ShiningRush · Jan 5, 2018 · 6824be4 · 6824be4
1 parent 1d53e05
commit 6824be4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/src/ServiceAnt.IocInstaller.Castle/ServiceAnt.IocInstaller.Castle.csproj b/src/ServiceAnt.IocInstaller.Castle/ServiceAnt.IocInstaller.Castle.csproj
@@ -5,7 +5,10 @@
  <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
  </PropertyGroup>
 
- <ItemGroup>
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+ <PackageReference Include="Castle.Windsor" Version="3.4.0" />
+ </ItemGroup>
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
  <PackageReference Include="Castle.Windsor" Version="4.1.0" />
  </ItemGroup>
 

diff --git a/src/ServiceAnt/Handler/SingletonHandlerFactory.cs b/src/ServiceAnt/Handler/SingletonHandlerFactory.cs
@@ -2,7 +2,7 @@
 
 namespace ServiceAnt.Handler
 {
- public class SingletonHandlerFactory : IHandlerFactory
+ internal class SingletonHandlerFactory : IHandlerFactory
  {
  private IHandler _instance;
  private Type _localEventType;

diff --git a/src/ServiceAnt/Handler/TransportTray.cs b/src/ServiceAnt/Handler/TransportTray.cs
@@ -6,7 +6,7 @@
 
 namespace ServiceAnt.Handler
 {
- public class TransportTray
+ public abstract class TransportTray
  {
  public TransportTray()
  {
@@ -18,7 +18,7 @@ public TransportTray()
  public DateTime CreationDate { get; }
  }
 
- public class TransportTray<TEntity> : TransportTray
+ public abstract class TransportTray<TEntity> : TransportTray
  {
  public TEntity TransportEntity { get; set; }
 

diff --git a/src/ServiceAnt/ServiceAnt.csproj b/src/ServiceAnt/ServiceAnt.csproj
@@ -9,7 +9,7 @@
  <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
  </ItemGroup>
 
- <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
  </ItemGroup>
 
  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">

diff --git a/test/ServiceAnt.IocInstaller.Castle.test/ServiceAnt.IocInstaller.Castle.Test.csproj b/test/ServiceAnt.IocInstaller.Castle.test/ServiceAnt.IocInstaller.Castle.Test.csproj
@@ -10,8 +10,13 @@
  <ProjectReference Include="..\..\src\ServiceAnt.IocInstaller.Castle\ServiceAnt.IocInstaller.Castle.csproj" />
  </ItemGroup>
 
- <ItemGroup>
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+ <PackageReference Include="Castle.Windsor" Version="3.3.0" />
+ </ItemGroup>
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
  <PackageReference Include="Castle.Windsor" Version="4.1.0" />
+ </ItemGroup>
+ <ItemGroup>
  <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
  <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>