Merge pull request #59 from vescon/feature/netstandard-netcore

Feature/netstandard netcore
vescon · Jan 7, 2019 · d4025ff · d4025ff
2 parents cede97c + f44c73b
commit d4025ff
Show file tree

Hide file tree

Showing 206 changed files with 968 additions and 609 deletions.
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ Short sample how a transaction aspect could be implemented.
 #### The aspect code
 
 ```csharp
-using MethodBoundaryAspect.Fody;
+using MethodBoundaryAspect.Fody.Attributes;
 
 public sealed class TransactionScopeAttribute : OnMethodBoundaryAspect
 {
@@ -91,7 +91,7 @@ Consider an aspect written like this.
 
 ```csharp
 using static System.Console;
-using MethodBoundaryAspect.Fody;
+using MethodBoundaryAspect.Fody.Attributes;
 
 public sealed class LogAttribute : OnMethodBoundaryAspect
 {
@@ -183,7 +183,7 @@ Note that, unlike for synchronous methods, an aspect for an asynchronous method
 
 ```csharp
 using static System.Console;
-using MethodBoundaryAspect.Fody;
+using MethodBoundaryAspect.Fody.Attributes;
 
 public sealed class LogAttribute : OnMethodBoundaryAspect
 {
@@ -212,7 +212,7 @@ One additional note about the asynchronous behavior: the `OnExit` handler runs w
 
 ```csharp
 using static System.Console;
-using MethodBoundaryAspect.Fody;
+using MethodBoundaryAspect.Fody.Attributes;
 
 public sealed class LogAttribute : OnMethodBoundaryAspect
 {

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.0.{build}
+version: 2.0.{build}
 image: Visual Studio 2017
 configuration: Release
 platform: Any CPU
@@ -12,14 +12,11 @@ dotnet_csproj:
   informational_version: '{version}'
 before_build:
 - cmd: dotnet restore src
-build:
-  verbosity: minimal
-  project: src\MethodBoundaryAspect.Fody.sln
-after_build:
-- cmd: >-
-    nuget pack src\MethodBoundaryAspect.Fody\MethodBoundaryAspect.Fody.nuspec -Properties "version=%APPVEYOR_BUILD_VERSION%" -OutputDirectory src
+build_script:
+  - cmd: dotnet build src\ --configuration Release -p:Version=%APPVEYOR_BUILD_VERSION% --no-restore
 test_script:
-- cmd: dotnet test src\MethodBoundaryAspect.Fody.UnitTests --configuration Release
+- cmd: dotnet test src\MethodBoundaryAspect.Fody.UnitTests.NetFramework --configuration Release
+- cmd: dotnet test src\MethodBoundaryAspect.Fody.UnitTests.NetCore --configuration Release
 artifacts:
 - path: src\MethodBoundaryAspect.Fody\bin\$(configuration)
   name: Binaries

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Version>1.0-localBuild</Version>
+  </PropertyGroup>
+</Project>
diff --git a/...dBoundaryAspect.Fody.UnitTests.NetCore/MethodBoundaryAspect.Fody.UnitTests.NetCore.csproj b/...dBoundaryAspect.Fody.UnitTests.NetCore/MethodBoundaryAspect.Fody.UnitTests.NetCore.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="5.2.0" />
+    <PackageReference Include="FodyHelpers" Version="3.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetCore\MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetCore.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/MethodBoundaryAspect.Fody.UnitTests.NetCore/SpecialAspectTests.cs b/src/MethodBoundaryAspect.Fody.UnitTests.NetCore/SpecialAspectTests.cs
@@ -0,0 +1,37 @@
+using System;
+using FluentAssertions;
+using MethodBoundaryAspect.Fody.UnitTests.Shared;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
+using Xunit;
+
+namespace MethodBoundaryAspect.Fody.UnitTests.NetCore
+{
+    public class SpecialAspectTests : MethodBoundaryAspectTestBase
+    {
+        [Fact]
+        public void IfNetCoreClassIsWeaved_ThenTheAssemblyShouldBeValid()
+        {
+            // Arrange
+            var testClassType = typeof(SpecialAspectMethods);
+
+            // Act
+            Action call = () => WeaveAssemblyClass(testClassType);
+
+            // Assert
+            call.Should().NotThrow();
+        }
+
+        [Fact]
+        public void IfNetStandardClassIsWeaved_ThenTheAssemblyShouldBeValid()
+        {
+            // Arrange
+            var testClassType = typeof(TestAssembly.NetStandard.SpecialAspectMethods);
+
+            // Act
+            Action call = () => WeaveAssemblyClass(testClassType);
+
+            // Assert
+            call.Should().NotThrow();
+        }
+    }
+}
diff --git a/....Fody.UnitTests/ArrayTakingAspectTests.cs → ...ts.NetFramework/ArrayTakingAspectTests.cs b/....Fody.UnitTests/ArrayTakingAspectTests.cs → ...ts.NetFramework/ArrayTakingAspectTests.cs
@@ -1,11 +1,12 @@
-using FluentAssertions;
+using System;
+using FluentAssertions;
 using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
-using System;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
 using Xunit;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
-    public class ArrayTakingAspectTests : MethodBoundaryAspectTestBase
+    public class ArrayTakingAspectTests : MethodBoundaryAspectNetFrameworkTestBase
     {
         static readonly Type TestClassType = typeof(ArrayTakingAspectMethod);
 

diff --git a/...Aspect.Fody.UnitTests/AspectOrderTests.cs → ...nitTests.NetFramework/AspectOrderTests.cs b/...Aspect.Fody.UnitTests/AspectOrderTests.cs → ...nitTests.NetFramework/AspectOrderTests.cs
@@ -5,7 +5,7 @@
 using MethodBoundaryAspect.Fody.Ordering;
 using Xunit;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
     public class AspectOrderTests
     {

diff --git a/...ryAspect.Fody.UnitTests/AssemblyLoader.cs → ....UnitTests.NetFramework/AssemblyLoader.cs b/...ryAspect.Fody.UnitTests/AssemblyLoader.cs → ....UnitTests.NetFramework/AssemblyLoader.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Linq;
-using System.Net;
 using System.Reflection;
 using System.Runtime.Remoting;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
     public class AssemblyLoader : MarshalByRefObject
     {

diff --git a/...spect.Fody.UnitTests/AsyncGenericTests.cs → ...itTests.NetFramework/AsyncGenericTests.cs b/...spect.Fody.UnitTests/AsyncGenericTests.cs → ...itTests.NetFramework/AsyncGenericTests.cs
@@ -1,12 +1,13 @@
-using FluentAssertions;
+using System;
+using FluentAssertions;
 using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
-using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.Aspects;
-using System;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework.Aspects;
 using Xunit;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
-    public class AsyncGenericTests : MethodBoundaryAspectTestBase
+    public class AsyncGenericTests : MethodBoundaryAspectNetFrameworkTestBase
     {
         Type OpenClass = typeof(AsyncClass<>);
         TypeInfo Closed = typeof(AsyncClass<>).TypeInfoWithGenericParameters(typeof(Placeholder));

diff --git a/...undaryAspect.Fody.UnitTests/AsyncTests.cs → ...Fody.UnitTests.NetFramework/AsyncTests.cs b/...undaryAspect.Fody.UnitTests/AsyncTests.cs → ...Fody.UnitTests.NetFramework/AsyncTests.cs
@@ -1,10 +1,11 @@
 using FluentAssertions;
 using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
 using Xunit;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
-    public class AsyncTests : MethodBoundaryAspectTestBase
+    public class AsyncTests : MethodBoundaryAspectNetFrameworkTestBase
     {
         [Fact]
         public void IfAsyncStaticMethodIsWeavedForOnExit_ThenTaskIsPassedToAspectReturnValue()

diff --git a/...t.Fody.UnitTests/ClassWithIndexerTests.cs → ...sts.NetFramework/ClassWithIndexerTests.cs b/...t.Fody.UnitTests/ClassWithIndexerTests.cs → ...sts.NetFramework/ClassWithIndexerTests.cs
@@ -1,11 +1,12 @@
 using System;
 using FluentAssertions;
 using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
 using Xunit;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
-    public class ClassWithIndexerTests : MethodBoundaryAspectTestBase
+    public class ClassWithIndexerTests : MethodBoundaryAspectNetFrameworkTestBase
     {
         [Fact]
         public void IfClassContainsIndexer_ThenTheAssemblyShouldBeValid()

diff --git a/...pect.Fody.UnitTests/ComplexAspectTests.cs → ...tTests.NetFramework/ComplexAspectTests.cs b/...pect.Fody.UnitTests/ComplexAspectTests.cs → ...tTests.NetFramework/ComplexAspectTests.cs
@@ -1,15 +1,15 @@
-using FluentAssertions;
-using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
-using MethodBoundaryAspect.Fody.UnitTests.TestAssemblyAspects;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using FluentAssertions;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework.External.Aspects;
 using Xunit;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
-    public class ComplexAspectTests : MethodBoundaryAspectTestBase
+    public class ComplexAspectTests : MethodBoundaryAspectNetFrameworkTestBase
     {
         static readonly Type TestClassType = typeof(ComplexAspectTestClass);
 

diff --git a/...Aspect.Fody.UnitTests/DebugAspectTests.cs → ...nitTests.NetFramework/DebugAspectTests.cs b/...Aspect.Fody.UnitTests/DebugAspectTests.cs → ...nitTests.NetFramework/DebugAspectTests.cs
@@ -2,11 +2,12 @@
 using System.IO;
 using FluentAssertions;
 using MethodBoundaryAspect.Fody.UnitTests.TestProgram;
+using MethodBoundaryAspect.Fody.UnitTests.TestProgram.NetFramework;
 using Xunit;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
-    public class DebugAspectTests : MethodBoundaryAspectTestBase
+    public class DebugAspectTests : MethodBoundaryAspectNetFrameworkTestBase
     {
         [Fact(Skip = "Needs to be clarified")]
         public void IfWeavedTestProgramIsExecuted_ThenTheDebugSymbolsShouldWorkAndTheDebuggerShouldBeAttachable()

diff --git a/...aryAspect.Fody.UnitTests/DelegateTests.cs → ...y.UnitTests.NetFramework/DelegateTests.cs b/...aryAspect.Fody.UnitTests/DelegateTests.cs → ...y.UnitTests.NetFramework/DelegateTests.cs
@@ -1,12 +1,12 @@
 using System;
 using FluentAssertions;
 using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
 using Xunit;
 
-
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
-    public class DelegateTests : MethodBoundaryAspectTestBase
+    public class DelegateTests : MethodBoundaryAspectNetFrameworkTestBase
     {
         [Fact]
         public void IfClassWithDelegateIsWeaved_ThenThereShouldBeNoException()

diff --git a/...spect.Fody.UnitTests/FlowBehaviorTests.cs → ...itTests.NetFramework/FlowBehaviorTests.cs b/...spect.Fody.UnitTests/FlowBehaviorTests.cs → ...itTests.NetFramework/FlowBehaviorTests.cs
@@ -1,12 +1,13 @@
-using FluentAssertions;
-using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
-using System;
+using System;
 using System.Reflection;
+using FluentAssertions;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
 using Xunit;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
-    public class FlowBehaviorTests : MethodBoundaryAspectTestBase
+    public class FlowBehaviorTests : MethodBoundaryAspectNetFrameworkTestBase
     {
         private static readonly Type TestClassType = typeof(FlowBehaviorClass);
 

diff --git a/....UnitTests/GenericClassWithArity1Tests.cs → ...tFramework/GenericClassWithArity1Tests.cs b/....UnitTests/GenericClassWithArity1Tests.cs → ...tFramework/GenericClassWithArity1Tests.cs
@@ -1,9 +1,10 @@
-using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
-using System;
+using System;
 using System.Collections.Generic;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
 using Xunit;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
     public class GenericClassWithArity1Tests : GenericTestBase
     {

diff --git a/....UnitTests/GenericClassWithArity2Tests.cs → ...tFramework/GenericClassWithArity2Tests.cs b/....UnitTests/GenericClassWithArity2Tests.cs → ...tFramework/GenericClassWithArity2Tests.cs
@@ -1,8 +1,9 @@
-using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
 using Xunit;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
     public class GenericClassWithArity2Tests : GenericTestBase
     {

diff --git a/....UnitTests/GenericForeignAssemblyTests.cs → ...tFramework/GenericForeignAssemblyTests.cs b/....UnitTests/GenericForeignAssemblyTests.cs → ...tFramework/GenericForeignAssemblyTests.cs
@@ -1,10 +1,11 @@
-using FluentAssertions;
-using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
-using System;
+using System;
 using System.Collections.Generic;
+using FluentAssertions;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
 using Xunit;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
     public class GenericForeignAssemblyTests : GenericTestBase
     {

diff --git a/...Fody.UnitTests/GenericNestedClassTests.cs → ...s.NetFramework/GenericNestedClassTests.cs b/...Fody.UnitTests/GenericNestedClassTests.cs → ...s.NetFramework/GenericNestedClassTests.cs
@@ -1,8 +1,9 @@
-using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
 using Xunit;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
     public class GenericNestedClassTests : GenericTestBase
     {

diff --git a/...yAspect.Fody.UnitTests/GenericTestBase.cs → ...UnitTests.NetFramework/GenericTestBase.cs b/...yAspect.Fody.UnitTests/GenericTestBase.cs → ...UnitTests.NetFramework/GenericTestBase.cs
@@ -1,15 +1,15 @@
-using FluentAssertions;
-using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
-using MethodBoundaryAspect.Fody.UnitTests.TestAssemblyAspects;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
+using FluentAssertions;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework.External.Aspects;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
-    public class GenericTestBase : MethodBoundaryAspectTestBase
+    public class GenericTestBase : MethodBoundaryAspectNetFrameworkTestBase
     {
         protected static IEnumerable<object[]> GetMethodNames(Type typeToSearch)
         {

diff --git a/...dy.UnitTests/GenericWithRefReturnTests.cs → ...NetFramework/GenericWithRefReturnTests.cs b/...dy.UnitTests/GenericWithRefReturnTests.cs → ...NetFramework/GenericWithRefReturnTests.cs
@@ -1,10 +1,12 @@
-using FluentAssertions;
+using System.Collections.Generic;
+using FluentAssertions;
 using MethodBoundaryAspect.Fody.UnitTests.TestAssembly;
+using MethodBoundaryAspect.Fody.UnitTests.TestAssembly.NetFramework;
 using MethodBoundaryAspect.Fody.UnitTests.UnverifiableTestAssembly;
-using System.Collections.Generic;
+using MethodBoundaryAspect.Fody.UnitTests.UnverifiableTestAssembly.NetFramework;
 using Xunit;
 
-namespace MethodBoundaryAspect.Fody.UnitTests
+namespace MethodBoundaryAspect.Fody.UnitTests.NetFramework
 {
     public class GenericWithRefReturnTests : GenericTestBase
     {