Skip to content

Commit

Permalink
fix some whitespaces and update test target to netcoreapp2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
lg2de committed May 12, 2020
1 parent 0503dfd commit 3075903
Show file tree
Hide file tree
Showing 13 changed files with 119 additions and 104 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ root = true
indent_style = tab

[*.csproj]
indent_style = space
indent_style = tab
indent_size = 2

[*.cs]
Expand Down
1 change: 1 addition & 0 deletions Castle.Core.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ VisualStudioVersion = 16.0.30011.22
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Castle Build", "Castle Build", "{1B999D24-B7AB-4997-96E7-08FA05325694}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.gitattributes = .gitattributes
.gitignore = .gitignore
appveyor.yml = appveyor.yml
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ for:
# -----------------
matrix:
only:
- image: Previous Ubuntu
- image: Ubuntu

# build and run tests
build_script:
Expand Down
8 changes: 4 additions & 4 deletions buildscripts/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<DiagnosticsConstants>DEBUG</DiagnosticsConstants>
<NetStandard13Constants>TRACE;FEATURE_NETCORE_REFLECTION_API;FEATURE_TEST_SERILOGINTEGRATION</NetStandard13Constants>
<NetStandard15Constants>$(NetStandard13Constants);FEATURE_CUSTOMMODIFIERS</NetStandard15Constants>
<NetStandard20Constants>TRACE;FEATURE_BINDINGLIST;FEATURE_DICTIONARYADAPTER_XML;FEATURE_CUSTOMMODIFIERS;FEATURE_EVENTLOG;FEATURE_GAC;FEATURE_IDATAERRORINFO;FEATURE_ISUPPORTINITIALIZE;FEATURE_LISTSORT;FEATURE_SMTP;FEATURE_TARGETEXCEPTION;FEATURE_TEST_DATASET;FEATURE_TEST_SERILOGINTEGRATION;FEATURE_NETSTANDARD2_COMPATIBILITY</NetStandard20Constants>
<NetStandard21Constants>TRACE;FEATURE_BINDINGLIST;FEATURE_DICTIONARYADAPTER_XML;FEATURE_CUSTOMMODIFIERS;FEATURE_EVENTLOG;FEATURE_GAC;FEATURE_IDATAERRORINFO;FEATURE_ISUPPORTINITIALIZE;FEATURE_LISTSORT;FEATURE_SMTP;FEATURE_TARGETEXCEPTION;FEATURE_TEST_DATASET;FEATURE_TEST_SERILOGINTEGRATION;FEATURE_NETSTANDARD2_COMPATIBILITY</NetStandard21Constants>
<NetStandard20Constants>TRACE;FEATURE_BINDINGLIST;FEATURE_DICTIONARYADAPTER_XML;FEATURE_CUSTOMMODIFIERS;FEATURE_GAC;FEATURE_IDATAERRORINFO;FEATURE_ISUPPORTINITIALIZE;FEATURE_LISTSORT;FEATURE_SMTP;FEATURE_TARGETEXCEPTION;FEATURE_TEST_DATASET;FEATURE_TEST_SERILOGINTEGRATION;FEATURE_NETSTANDARD2_COMPATIBILITY</NetStandard20Constants>
<NetStandard21Constants>TRACE;FEATURE_BINDINGLIST;FEATURE_DICTIONARYADAPTER_XML;FEATURE_CUSTOMMODIFIERS;FEATURE_GAC;FEATURE_IDATAERRORINFO;FEATURE_ISUPPORTINITIALIZE;FEATURE_LISTSORT;FEATURE_SMTP;FEATURE_TARGETEXCEPTION;FEATURE_TEST_DATASET;FEATURE_TEST_SERILOGINTEGRATION;FEATURE_NETSTANDARD2_COMPATIBILITY</NetStandard21Constants>
<CommonDesktopClrConstants>TRACE;FEATURE_APPDOMAIN;FEATURE_ASSEMBLYBUILDER_SAVE;FEATURE_BINDINGLIST;FEATURE_DICTIONARYADAPTER_XML;FEATURE_CUSTOMMODIFIERS;FEATURE_EVENTLOG;FEATURE_GAC;FEATURE_GET_REFERENCED_ASSEMBLIES;FEATURE_IDATAERRORINFO;FEATURE_ISUPPORTINITIALIZE;FEATURE_LISTSORT;FEATURE_REMOTING;FEATURE_SECURITY_PERMISSIONS;FEATURE_SERIALIZATION;FEATURE_SMTP;FEATURE_SYSTEM_CONFIGURATION;FEATURE_TARGETEXCEPTION;FEATURE_TEST_COM;FEATURE_TEST_DATASET;FEATURE_TEST_SERILOGINTEGRATION</CommonDesktopClrConstants>
<DesktopClrConstants Condition="'$(OS)'=='Unix'">$(CommonDesktopClrConstants)</DesktopClrConstants>
<DesktopClrConstants Condition="'$(OS)'=='Windows_NT'">$(CommonDesktopClrConstants);FEATURE_TEST_PEVERIFY</DesktopClrConstants>
Expand Down Expand Up @@ -118,11 +118,11 @@
<DefineConstants>$(NetStandard15Constants)</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)|$(Configuration)'=='netcoreapp2.0|Debug'">
<PropertyGroup Condition="'$(TargetFramework)|$(Configuration)'=='netcoreapp2.1|Debug'">
<DefineConstants>$(DiagnosticsConstants);$(NetStandard20Constants)</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)|$(Configuration)'=='netcoreapp2.0|Release'">
<PropertyGroup Condition="'$(TargetFramework)|$(Configuration)'=='netcoreapp2.1|Release'">
<DefineConstants>$(NetStandard20Constants)</DefineConstants>
</PropertyGroup>

Expand Down
46 changes: 28 additions & 18 deletions ref/Castle.Core-netstandard2.0.cs
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,28 @@ public class RemoveIfEmptyAttribute : Castle.Components.DictionaryAdapter.Remove
{
public RemoveIfEmptyAttribute() { }
}
public class SetProjection<T> : Castle.Components.DictionaryAdapter.ListProjection<T>, System.Collections.Generic.ICollection<T>, System.Collections.Generic.IEnumerable<T>, System.Collections.Generic.ISet<T>, System.Collections.IEnumerable
{
public SetProjection(Castle.Components.DictionaryAdapter.ICollectionAdapter<T> adapter) { }
public override bool Add(T item) { }
public override void Clear() { }
public override bool Contains(T item) { }
public override void EndNew(int index) { }
public void ExceptWith(System.Collections.Generic.IEnumerable<T> other) { }
public void IntersectWith(System.Collections.Generic.IEnumerable<T> other) { }
public bool IsProperSubsetOf(System.Collections.Generic.IEnumerable<T> other) { }
public bool IsProperSupersetOf(System.Collections.Generic.IEnumerable<T> other) { }
public bool IsSubsetOf(System.Collections.Generic.IEnumerable<T> other) { }
public bool IsSupersetOf(System.Collections.Generic.IEnumerable<T> other) { }
protected override bool OnInserting(T value) { }
protected override bool OnReplacing(T oldValue, T newValue) { }
public bool Overlaps(System.Collections.Generic.IEnumerable<T> other) { }
public override bool Remove(T item) { }
public override void RemoveAt(int index) { }
public bool SetEquals(System.Collections.Generic.IEnumerable<T> other) { }
public void SymmetricExceptWith(System.Collections.Generic.IEnumerable<T> other) { }
public void UnionWith(System.Collections.Generic.IEnumerable<T> other) { }
}
[System.AttributeUsageAttribute(System.AttributeTargets.Property | System.AttributeTargets.All, AllowMultiple=false, Inherited=false)]
public class StringFormatAttribute : Castle.Components.DictionaryAdapter.DictionaryBehaviorAttribute, Castle.Components.DictionaryAdapter.IDictionaryBehavior, Castle.Components.DictionaryAdapter.IDictionaryPropertyGetter
{
Expand Down Expand Up @@ -1633,6 +1655,12 @@ public bool UnderlyingPositionEquals(Castle.Components.DictionaryAdapter.Xml.IXm
public System.Xml.XmlWriter WriteAttributes() { }
public System.Xml.XmlWriter WriteChildren() { }
}
public class XmlSetSerializer : Castle.Components.DictionaryAdapter.Xml.XmlCollectionSerializer
{
public static readonly Castle.Components.DictionaryAdapter.Xml.XmlSetSerializer Instance;
protected XmlSetSerializer() { }
public override System.Type ListTypeConstructor { get; }
}
public class static XmlSimpleSerializer
{
public static readonly Castle.Components.DictionaryAdapter.Xml.XmlTypeSerializer ForBoolean;
Expand Down Expand Up @@ -1678,7 +1706,6 @@ public XmlSubtreeReader(Castle.Components.DictionaryAdapter.Xml.IXmlNode node, s
public override string BaseURI { get; }
public override int Depth { get; }
public override bool EOF { get; }
public override bool HasValue { get; }
public bool IsAtRootElement { get; }
public bool IsDisposed { get; }
public override bool IsEmptyElement { get; }
Expand Down Expand Up @@ -2000,23 +2027,6 @@ public ConsoleLogger(string name, Castle.Core.Logging.LoggerLevel logLevel) { }
public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
}
public class DiagnosticsLogger : Castle.Core.Logging.LevelFilteredLogger, System.IDisposable
{
public DiagnosticsLogger(string logName) { }
public DiagnosticsLogger(string logName, string source) { }
public DiagnosticsLogger(string logName, string machineName, string source) { }
public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
public void Dispose() { }
protected virtual void Dispose(bool disposing) { }
protected override void Finalize() { }
protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
}
public class DiagnosticsLoggerFactory : Castle.Core.Logging.AbstractLoggerFactory
{
public DiagnosticsLoggerFactory() { }
public override Castle.Core.Logging.ILogger Create(string name) { }
public override Castle.Core.Logging.ILogger Create(string name, Castle.Core.Logging.LoggerLevel level) { }
}
public interface IContextProperties
{
object this[string key] { get; set; }
Expand Down
46 changes: 28 additions & 18 deletions ref/Castle.Core-netstandard2.1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,28 @@ public class RemoveIfEmptyAttribute : Castle.Components.DictionaryAdapter.Remove
{
public RemoveIfEmptyAttribute() { }
}
public class SetProjection<T> : Castle.Components.DictionaryAdapter.ListProjection<T>, System.Collections.Generic.ICollection<T>, System.Collections.Generic.IEnumerable<T>, System.Collections.Generic.ISet<T>, System.Collections.IEnumerable
{
public SetProjection(Castle.Components.DictionaryAdapter.ICollectionAdapter<T> adapter) { }
public override bool Add(T item) { }
public override void Clear() { }
public override bool Contains(T item) { }
public override void EndNew(int index) { }
public void ExceptWith(System.Collections.Generic.IEnumerable<T> other) { }
public void IntersectWith(System.Collections.Generic.IEnumerable<T> other) { }
public bool IsProperSubsetOf(System.Collections.Generic.IEnumerable<T> other) { }
public bool IsProperSupersetOf(System.Collections.Generic.IEnumerable<T> other) { }
public bool IsSubsetOf(System.Collections.Generic.IEnumerable<T> other) { }
public bool IsSupersetOf(System.Collections.Generic.IEnumerable<T> other) { }
protected override bool OnInserting(T value) { }
protected override bool OnReplacing(T oldValue, T newValue) { }
public bool Overlaps(System.Collections.Generic.IEnumerable<T> other) { }
public override bool Remove(T item) { }
public override void RemoveAt(int index) { }
public bool SetEquals(System.Collections.Generic.IEnumerable<T> other) { }
public void SymmetricExceptWith(System.Collections.Generic.IEnumerable<T> other) { }
public void UnionWith(System.Collections.Generic.IEnumerable<T> other) { }
}
[System.AttributeUsageAttribute(System.AttributeTargets.Property | System.AttributeTargets.All, AllowMultiple=false, Inherited=false)]
public class StringFormatAttribute : Castle.Components.DictionaryAdapter.DictionaryBehaviorAttribute, Castle.Components.DictionaryAdapter.IDictionaryBehavior, Castle.Components.DictionaryAdapter.IDictionaryPropertyGetter
{
Expand Down Expand Up @@ -1633,6 +1655,12 @@ public bool UnderlyingPositionEquals(Castle.Components.DictionaryAdapter.Xml.IXm
public System.Xml.XmlWriter WriteAttributes() { }
public System.Xml.XmlWriter WriteChildren() { }
}
public class XmlSetSerializer : Castle.Components.DictionaryAdapter.Xml.XmlCollectionSerializer
{
public static readonly Castle.Components.DictionaryAdapter.Xml.XmlSetSerializer Instance;
protected XmlSetSerializer() { }
public override System.Type ListTypeConstructor { get; }
}
public class static XmlSimpleSerializer
{
public static readonly Castle.Components.DictionaryAdapter.Xml.XmlTypeSerializer ForBoolean;
Expand Down Expand Up @@ -1678,7 +1706,6 @@ public XmlSubtreeReader(Castle.Components.DictionaryAdapter.Xml.IXmlNode node, s
public override string BaseURI { get; }
public override int Depth { get; }
public override bool EOF { get; }
public override bool HasValue { get; }
public bool IsAtRootElement { get; }
public bool IsDisposed { get; }
public override bool IsEmptyElement { get; }
Expand Down Expand Up @@ -2000,23 +2027,6 @@ public ConsoleLogger(string name, Castle.Core.Logging.LoggerLevel logLevel) { }
public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
}
public class DiagnosticsLogger : Castle.Core.Logging.LevelFilteredLogger, System.IDisposable
{
public DiagnosticsLogger(string logName) { }
public DiagnosticsLogger(string logName, string source) { }
public DiagnosticsLogger(string logName, string machineName, string source) { }
public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
public void Dispose() { }
protected virtual void Dispose(bool disposing) { }
protected override void Finalize() { }
protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
}
public class DiagnosticsLoggerFactory : Castle.Core.Logging.AbstractLoggerFactory
{
public DiagnosticsLoggerFactory() { }
public override Castle.Core.Logging.ILogger Create(string name) { }
public override Castle.Core.Logging.ILogger Create(string name, Castle.Core.Logging.LoggerLevel level) { }
}
public interface IContextProperties
{
object this[string key] { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\buildscripts\common.props"></Import>

<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down
66 changes: 30 additions & 36 deletions src/Castle.Core.Tests/Castle.Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\buildscripts\common.props"></Import>

<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -20,13 +20,7 @@
<StartupObject>Program</StartupObject>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
<Compile Remove="Components.DictionaryAdapter.Tests\Xml\**" />
<Compile Remove="Services.Logging.Tests\log4netIntegration\**" />
<Compile Remove="Services.Logging.Tests\NLogIntegration\**" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0' or '$(TargetFramework)'=='netcoreapp3.1'">
<Compile Remove="Components.DictionaryAdapter.Tests\Xml\**" />
<Compile Remove="Services.Logging.Tests\log4netIntegration\**" />
<Compile Remove="Services.Logging.Tests\NLogIntegration\**" />
Expand All @@ -44,7 +38,7 @@
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="NUnit" Version="3.6.1" />
<PackageReference Include="NUnit.Console" Version="3.6.1" />
Expand All @@ -54,38 +48,38 @@
<PackageReference Include="NLog" Version="4.5.0" />
<PackageReference Include="Serilog" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.TextWriter" Version="2.0.0" />
<ProjectReference Include="..\Castle.Core\Castle.Core.csproj" />
<ProjectReference Include="..\Castle.Services.Logging.log4netIntegration\Castle.Services.Logging.log4netIntegration.csproj" />
<ProjectReference Include="..\Castle.Services.Logging.NLogIntegration\Castle.Services.Logging.NLogIntegration.csproj" />
<ProjectReference Include="..\Castle.Services.Logging.SerilogIntegration\Castle.Services.Logging.SerilogIntegration.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
<PackageReference Include="System.Net.Primitives" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
<ProjectReference Include="..\Castle.Core\Castle.Core.csproj" />
<ProjectReference Include="..\Castle.Services.Logging.log4netIntegration\Castle.Services.Logging.log4netIntegration.csproj" />
<ProjectReference Include="..\Castle.Services.Logging.NLogIntegration\Castle.Services.Logging.NLogIntegration.csproj" />
<ProjectReference Include="..\Castle.Services.Logging.SerilogIntegration\Castle.Services.Logging.SerilogIntegration.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
<PackageReference Include="System.Net.Primitives" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net461'">
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Windows.Forms" />
<Reference Include="WindowsBase" />
<PackageReference Include="PublicApiGenerator" Version="9.3.0" />
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
<PackageReference Include="System.Runtime.CompilerServices.VisualC" Version="4.3.0" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
<PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
<PackageReference Include="System.Xml.XPath" Version="4.3.0" />
<PackageReference Include="System.Xml.XPath.XDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
<PackageReference Include="System.Runtime.CompilerServices.VisualC" Version="4.3.0" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
<PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
<PackageReference Include="System.Xml.XPath" Version="4.3.0" />
<PackageReference Include="System.Xml.XPath.XDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2004-2010 Castle Project - http://www.castleproject.org/
//
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
Loading

0 comments on commit 3075903

Please sign in to comment.