Clean up project structure (#194)

dotnetcore · Dec 8, 2019 · 9fefe3c · 9fefe3c
1 parent 2082174
commit 9fefe3c
Show file tree

Hide file tree

Showing 460 changed files with 773 additions and 3,120 deletions.
diff --git a/AspectCore-Framework.sln b/AspectCore-Framework.sln
diff --git a/aspectscope/AspectCore.AspectScope.sln b/aspectscope/AspectCore.AspectScope.sln
diff --git a/...re.Extensions.Reflection.Benchmark.csproj → ...re.Extensions.Reflection.Benchmark.csproj b/...re.Extensions.Reflection.Benchmark.csproj → ...re.Extensions.Reflection.Benchmark.csproj
diff --git a/...chmarks/ConstructorReflectorBenchmarks.cs → ...chmarks/ConstructorReflectorBenchmarks.cs b/...chmarks/ConstructorReflectorBenchmarks.cs → ...chmarks/ConstructorReflectorBenchmarks.cs
diff --git a/...rks/CustomAttributeReflectorBenchmarks.cs → ...rks/CustomAttributeReflectorBenchmarks.cs b/...rks/CustomAttributeReflectorBenchmarks.cs → ...rks/CustomAttributeReflectorBenchmarks.cs
diff --git a/...rk/Benchmarks/FieldReflectorBenchmarks.cs → ...rk/Benchmarks/FieldReflectorBenchmarks.cs b/...rk/Benchmarks/FieldReflectorBenchmarks.cs → ...rk/Benchmarks/FieldReflectorBenchmarks.cs
diff --git a/...k/Benchmarks/MethodReflectorBenchmarks.cs → ...k/Benchmarks/MethodReflectorBenchmarks.cs b/...k/Benchmarks/MethodReflectorBenchmarks.cs → ...k/Benchmarks/MethodReflectorBenchmarks.cs
diff --git a/...Benchmarks/PropertyReflectorBenchmarks.cs → ...Benchmarks/PropertyReflectorBenchmarks.cs b/...Benchmarks/PropertyReflectorBenchmarks.cs → ...Benchmarks/PropertyReflectorBenchmarks.cs
diff --git a/...ction.Benchmark/Fakes/ConstructorFakes.cs → ...ction.Benchmark/Fakes/ConstructorFakes.cs b/...ction.Benchmark/Fakes/ConstructorFakes.cs → ...ction.Benchmark/Fakes/ConstructorFakes.cs
diff --git a/....Reflection.Benchmark/Fakes/FieldFakes.cs → ....Reflection.Benchmark/Fakes/FieldFakes.cs b/....Reflection.Benchmark/Fakes/FieldFakes.cs → ....Reflection.Benchmark/Fakes/FieldFakes.cs
diff --git a/...Reflection.Benchmark/Fakes/MethodFakes.cs → ...Reflection.Benchmark/Fakes/MethodFakes.cs b/...Reflection.Benchmark/Fakes/MethodFakes.cs → ...Reflection.Benchmark/Fakes/MethodFakes.cs
diff --git a/...flection.Benchmark/Fakes/PropertyFakes.cs → ...flection.Benchmark/Fakes/PropertyFakes.cs b/...flection.Benchmark/Fakes/PropertyFakes.cs → ...flection.Benchmark/Fakes/PropertyFakes.cs
diff --git a/...xtensions.Reflection.Benchmark/Program.cs → ...xtensions.Reflection.Benchmark/Program.cs b/...xtensions.Reflection.Benchmark/Program.cs → ...xtensions.Reflection.Benchmark/Program.cs
@@ -8,11 +8,11 @@ static class Program
     {
         static void Main(string[] args)
         {
-            //BenchmarkRunner.Run<ConstructorReflectorBenchmarks>();
-            //BenchmarkRunner.Run<FieldReflectorBenchmarks>();
-            //BenchmarkRunner.Run<MethodReflectorBenchmarks>();
+            BenchmarkRunner.Run<ConstructorReflectorBenchmarks>();
+            BenchmarkRunner.Run<FieldReflectorBenchmarks>();
+            BenchmarkRunner.Run<MethodReflectorBenchmarks>();
             BenchmarkRunner.Run<PropertyReflectorBenchmarks>();
-            //BenchmarkRunner.Run<CustomAttributeReflectorBenchmarks>();
+            BenchmarkRunner.Run<CustomAttributeReflectorBenchmarks>();
         }
     }
 }
diff --git a/build/version.cake b/build/version.cake
@@ -37,10 +37,10 @@ public class BuildParameters
 
 	private void InitializeCore()
 	{
-		Projects = Context.GetDirectories("./*/src/*");
-		TestProjects = Context.GetDirectories("./*/test/*");
-		ProjectFiles = Context.GetFiles("./*/src/*/*.csproj");
-		TestProjectFiles = Context.GetFiles("./*/test/*/*.csproj");
+		Projects = Context.GetDirectories("./src/*");
+		TestProjects = Context.GetDirectories("./tests/*");
+		ProjectFiles = Context.GetFiles("./src/*/*.csproj");
+		TestProjectFiles = Context.GetFiles("./tests/*/*.csproj");
 
 		var buildSystem = Context.BuildSystem();
 		if (!buildSystem.IsLocalBuild)

diff --git a/build/version.props b/build/version.props
@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
-		<VersionMajor>1</VersionMajor>
-		<VersionMinor>3</VersionMinor>
+		<VersionMajor>2</VersionMajor>
+		<VersionMinor>0</VersionMinor>
 		<VersionPatch>0</VersionPatch>
 		<VersionQuality></VersionQuality>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>

diff --git a/configuration/AspectCore.Extensions.Configuration.sln b/configuration/AspectCore.Extensions.Configuration.sln
diff --git a/configuration/src/AspectCore.Extensions.Configuration/ServiceContainerExtensions.cs b/configuration/src/AspectCore.Extensions.Configuration/ServiceContainerExtensions.cs
diff --git a/core/AspectCore.Core.sln b/core/AspectCore.Core.sln
diff --git a/core/README.md b/core/README.md
diff --git a/core/performance/AspectCore.Benchmark/AspectCore.Benchmark.csproj b/core/performance/AspectCore.Benchmark/AspectCore.Benchmark.csproj
diff --git a/core/performance/AspectCore.Benchmark/Program.cs b/core/performance/AspectCore.Benchmark/Program.cs
diff --git a/core/performance/AspectCore.IoC.Benchmarks/AspectCore.IoC.Benchmarks.csproj b/core/performance/AspectCore.IoC.Benchmarks/AspectCore.IoC.Benchmarks.csproj
diff --git a/core/performance/AspectCore.IoC.Benchmarks/Program.cs b/core/performance/AspectCore.IoC.Benchmarks/Program.cs