Merge pull request #36 from Polly-Contrib/vany0114-patch-projectname

Project name refactor
Polly-Contrib · May 15, 2019 · a1392af · a1392af
2 parents 9431a78 + 89e1a73
commit a1392af
Show file tree

Hide file tree

Showing 40 changed files with 107 additions and 135 deletions.
diff --git a/build.cake b/build.cake
@@ -23,8 +23,8 @@ var configuration = Argument<string>("configuration", "Release");
 // GLOBAL VARIABLES
 ///////////////////////////////////////////////////////////////////////////////
 
-var projectName = "Simmy";
-var keyName = "Simmy.snk";
+var projectName = "Polly.Contrib.Simmy";
+var keyName = "Polly.Contrib.Simmy.snk";
 
 var solutions = GetFiles("./**/*.sln");
 var solutionPaths = solutions.Select(solution => solution.GetDirectory());
@@ -159,7 +159,7 @@ Task("__UpdateDotNetStandardAssemblyVersionNumber")
         { "PackageVersion", nugetVersion },
     };
 
-    var csproj = File("./src/Simmy/Simmy.csproj");
+    var csproj = File("./src/Polly.Contrib.Simmy/Polly.Contrib.Simmy.csproj");
 
     foreach(var attributeMap in attributeToValueMap) {
         var attribute = attributeMap.Key;
@@ -212,7 +212,7 @@ Task("__RunTests")
 Task("__CopyOutputToNugetFolder")
     .Does(() =>
 {
-    var sourceDir = srcDir + Directory("Simmy") + Directory("bin") + Directory(configuration);
+    var sourceDir = srcDir + Directory("Polly.Contrib.Simmy") + Directory("bin") + Directory(configuration);
 
     var destDir = buildDir + Directory("lib");
 

diff --git a/...ecs/Behavior/InjectBehaviourAsyncSpecs.cs → ...ecs/Behavior/InjectBehaviourAsyncSpecs.cs b/...ecs/Behavior/InjectBehaviourAsyncSpecs.cs → ...ecs/Behavior/InjectBehaviourAsyncSpecs.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Threading.Tasks;
 using FluentAssertions;
-using Simmy.Utilities;
+using Polly.Contrib.Simmy.Utilities;
 using Xunit;
 
-namespace Simmy.Specs.Behavior
+namespace Polly.Contrib.Simmy.Specs.Behavior
 {
     [Collection(Helpers.Constants.AmbientContextDependentTestCollection)]
     public class InjectBehaviourAsyncSpecs : IDisposable

diff --git a/...my.Specs/Behavior/InjectBehaviourSpecs.cs → ...my.Specs/Behavior/InjectBehaviourSpecs.cs b/...my.Specs/Behavior/InjectBehaviourSpecs.cs → ...my.Specs/Behavior/InjectBehaviourSpecs.cs
@@ -1,9 +1,9 @@
 using System;
 using FluentAssertions;
-using Simmy.Utilities;
+using Polly.Contrib.Simmy.Utilities;
 using Xunit;
 
-namespace Simmy.Specs.Behavior
+namespace Polly.Contrib.Simmy.Specs.Behavior
 {
     [Collection(Helpers.Constants.AmbientContextDependentTestCollection)]
     public class InjectBehaviourSpecs : IDisposable

diff --git a/...avior/InjectBehaviourTResultAsyncSpecs.cs → ...avior/InjectBehaviourTResultAsyncSpecs.cs b/...avior/InjectBehaviourTResultAsyncSpecs.cs → ...avior/InjectBehaviourTResultAsyncSpecs.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Threading.Tasks;
 using FluentAssertions;
-using Simmy.Specs.Helpers;
-using Simmy.Utilities;
+using Polly.Contrib.Simmy.Specs.Helpers;
+using Polly.Contrib.Simmy.Utilities;
 using Xunit;
 
-namespace Simmy.Specs.Behavior
+namespace Polly.Contrib.Simmy.Specs.Behavior
 {
     [Collection(Constants.AmbientContextDependentTestCollection)]
     public class InjectBehaviourTResultAsyncSpecs : IDisposable

diff --git a/...s/Behavior/InjectBehaviourTResultSpecs.cs → ...s/Behavior/InjectBehaviourTResultSpecs.cs b/...s/Behavior/InjectBehaviourTResultSpecs.cs → ...s/Behavior/InjectBehaviourTResultSpecs.cs
@@ -1,10 +1,10 @@
 using System;
 using FluentAssertions;
-using Simmy.Specs.Helpers;
-using Simmy.Utilities;
+using Polly.Contrib.Simmy.Specs.Helpers;
+using Polly.Contrib.Simmy.Utilities;
 using Xunit;
 
-namespace Simmy.Specs.Behavior
+namespace Polly.Contrib.Simmy.Specs.Behavior
 {
     [Collection(Constants.AmbientContextDependentTestCollection)]
     public class InjectBehaviourTResultSpecs : IDisposable

diff --git a/...immy.Specs/Fault/InjectFaultAsyncSpecs.cs → ...immy.Specs/Fault/InjectFaultAsyncSpecs.cs b/...immy.Specs/Fault/InjectFaultAsyncSpecs.cs → ...immy.Specs/Fault/InjectFaultAsyncSpecs.cs
@@ -2,12 +2,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
-using Polly;
+using Polly.Contrib.Simmy.Utilities;
 using Polly.Utilities;
-using Simmy.Utilities;
 using Xunit;
 
-namespace Simmy.Specs.Fault
+namespace Polly.Contrib.Simmy.Specs.Fault
 {
     [Collection(Helpers.Constants.AmbientContextDependentTestCollection)]
     public class InjectFaultAsyncSpecs : IDisposable

diff --git a/src/Simmy.Specs/Fault/InjectFaultSpecs.cs → ...rib.Simmy.Specs/Fault/InjectFaultSpecs.cs b/src/Simmy.Specs/Fault/InjectFaultSpecs.cs → ...rib.Simmy.Specs/Fault/InjectFaultSpecs.cs
@@ -1,10 +1,9 @@
 using System;
 using FluentAssertions;
-using Polly;
-using Simmy.Utilities;
+using Polly.Contrib.Simmy.Utilities;
 using Xunit;
 
-namespace Simmy.Specs.Fault
+namespace Polly.Contrib.Simmy.Specs.Fault
 {
     [Collection(Helpers.Constants.AmbientContextDependentTestCollection)]
     public class InjectFaultSpecs : IDisposable

diff --git a/...ecs/Fault/InjectFaultTResultAsyncSpecs.cs → ...ecs/Fault/InjectFaultTResultAsyncSpecs.cs b/...ecs/Fault/InjectFaultTResultAsyncSpecs.cs → ...ecs/Fault/InjectFaultTResultAsyncSpecs.cs
@@ -3,11 +3,11 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Polly;
-using Simmy.Specs.Helpers;
-using Simmy.Utilities;
+using Polly.Contrib.Simmy.Specs.Helpers;
+using Polly.Contrib.Simmy.Utilities;
 using Xunit;
 
-namespace Simmy.Specs.Fault
+namespace Polly.Contrib.Simmy.Specs.Fault
 {
     [Collection(Constants.AmbientContextDependentTestCollection)]
     public class InjectFaultTResultAsyncSpecs : IDisposable

diff --git a/...my.Specs/Fault/InjectFaultTResultSpecs.cs → ...my.Specs/Fault/InjectFaultTResultSpecs.cs b/...my.Specs/Fault/InjectFaultTResultSpecs.cs → ...my.Specs/Fault/InjectFaultTResultSpecs.cs
@@ -1,11 +1,11 @@
 using System;
 using FluentAssertions;
 using Polly;
-using Simmy.Specs.Helpers;
-using Simmy.Utilities;
+using Polly.Contrib.Simmy.Specs.Helpers;
+using Polly.Contrib.Simmy.Utilities;
 using Xunit;
 
-namespace Simmy.Specs.Fault
+namespace Polly.Contrib.Simmy.Specs.Fault
 {
     [Collection(Constants.AmbientContextDependentTestCollection)]
     public class InjectFaultTResultSpecs : IDisposable

diff --git a/src/Simmy.Specs/Helpers/Constants.cs → ....Contrib.Simmy.Specs/Helpers/Constants.cs b/src/Simmy.Specs/Helpers/Constants.cs → ....Contrib.Simmy.Specs/Helpers/Constants.cs
@@ -1,4 +1,4 @@
-namespace Simmy.Specs.Helpers
+namespace Polly.Contrib.Simmy.Specs.Helpers
 {
     /// <summary>
     /// Constants supporting tests.

diff --git a/src/Simmy.Specs/Helpers/ResultPrimitive.cs → ...ib.Simmy.Specs/Helpers/ResultPrimitive.cs b/src/Simmy.Specs/Helpers/ResultPrimitive.cs → ...ib.Simmy.Specs/Helpers/ResultPrimitive.cs
@@ -1,4 +1,4 @@
-namespace Simmy.Specs.Helpers
+namespace Polly.Contrib.Simmy.Specs.Helpers
 {
     /// <summary>
     /// A helper class supporting tests on how Policy&lt;TResult&gt; policies may handle return results which are primitive types such as ints or enums.

diff --git a/....Specs/Latency/InjectLatencyAsyncSpecs.cs → ....Specs/Latency/InjectLatencyAsyncSpecs.cs b/....Specs/Latency/InjectLatencyAsyncSpecs.cs → ....Specs/Latency/InjectLatencyAsyncSpecs.cs
@@ -2,12 +2,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
-using Polly;
+using Polly.Contrib.Simmy.Utilities;
 using Polly.Utilities;
-using Simmy.Utilities;
 using Xunit;
 
-namespace Simmy.Specs.Latency
+namespace Polly.Contrib.Simmy.Specs.Latency
 {
     [Collection(Helpers.Constants.AmbientContextDependentTestCollection)]
     public class InjectLatencyAsyncSpecs : IDisposable

diff --git a/...Simmy.Specs/Latency/InjectLatencySpecs.cs → ...Simmy.Specs/Latency/InjectLatencySpecs.cs b/...Simmy.Specs/Latency/InjectLatencySpecs.cs → ...Simmy.Specs/Latency/InjectLatencySpecs.cs
@@ -1,11 +1,10 @@
 using System;
 using FluentAssertions;
-using Polly;
+using Polly.Contrib.Simmy.Utilities;
 using Polly.Utilities;
-using Simmy.Utilities;
 using Xunit;
 
-namespace Simmy.Specs.Latency
+namespace Polly.Contrib.Simmy.Specs.Latency
 {
     [Collection(Helpers.Constants.AmbientContextDependentTestCollection)]
     public class InjectLatencySpecs : IDisposable

diff --git a/...atency/InjectLatencyTResultAsyncSpecs .cs → ...atency/InjectLatencyTResultAsyncSpecs .cs b/...atency/InjectLatencyTResultAsyncSpecs .cs → ...atency/InjectLatencyTResultAsyncSpecs .cs
@@ -2,13 +2,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
-using Polly;
 using Polly.Utilities;
-using Simmy.Specs.Helpers;
-using Simmy.Utilities;
+using Polly.Contrib.Simmy.Specs.Helpers;
+using Polly.Contrib.Simmy.Utilities;
 using Xunit;
 
-namespace Simmy.Specs.Latency
+namespace Polly.Contrib.Simmy.Specs.Latency
 {
     [Collection(Constants.AmbientContextDependentTestCollection)]
     public class InjectLatencyTResultAsyncSpecs : IDisposable

diff --git a/...pecs/Latency/InjectLatencyTResultSpecs.cs → ...pecs/Latency/InjectLatencyTResultSpecs.cs b/...pecs/Latency/InjectLatencyTResultSpecs.cs → ...pecs/Latency/InjectLatencyTResultSpecs.cs
@@ -1,12 +1,11 @@
 using System;
 using FluentAssertions;
-using Polly;
 using Polly.Utilities;
-using Simmy.Specs.Helpers;
-using Simmy.Utilities;
+using Polly.Contrib.Simmy.Specs.Helpers;
+using Polly.Contrib.Simmy.Utilities;
 using Xunit;
 
-namespace Simmy.Specs.Latency
+namespace Polly.Contrib.Simmy.Specs.Latency
 {
     [Collection(Constants.AmbientContextDependentTestCollection)]
     public class InjectLatencyTResultSpecs : IDisposable

diff --git a/src/Simmy.Specs/Simmy.Specs.csproj → ...my.Specs/Polly.Contrib.Simmy.Specs.csproj b/src/Simmy.Specs/Simmy.Specs.csproj → ...my.Specs/Polly.Contrib.Simmy.Specs.csproj
@@ -4,10 +4,6 @@
     <TargetFrameworks>netcoreapp1.1;netcoreapp2.0;net462;net472</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Simmy\Simmy.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="4.19.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
@@ -20,4 +16,8 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Polly.Contrib.Simmy\Polly.Contrib.Simmy.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Simmy.nuspec → src/Polly.Contrib.Simmy.nuspec b/src/Simmy.nuspec → src/Polly.Contrib.Simmy.nuspec
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package>
-  <metadata>
-    <owners>App vNext</owners>
-    <authors>App vNext</authors>
-    <description>
-      Simmy is a chaos-engineering and fault-injection tool, integrating with the Polly resilience project for .NET
-    </description>
-    <language>en-US</language>
-    <license type="expression">BSD-3-Clause</license>
-    <iconUrl>https://raw.github.com/App-vNext/Simmy/master/Simmy.png</iconUrl>
-    <projectUrl>https://github.com/App-vNext/Simmy</projectUrl>
-    <tags>Resilience Chaos-engineering Fault-injection</tags>
-    <copyright>Copyright © 2019, App vNext</copyright>
-    <releaseNotes>
-     0.1.0
-     ---------------------
-     - Initial launch
-   </releaseNotes>
-    <dependencies>
-      <group targetFramework="netstandard1.1">
-        <dependency id="NETStandard.Library" version="1.6.1" />
-        <dependency id="Polly" version="7.1.0" />
-      </group>
-      <group targetFramework="netstandard2.0">
-        <dependency id="Polly" version="7.1.0" />
-      </group>
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="lib\**\*.*" target="lib" exclude="**\*.unsigned" />
-  </files>
-</package>
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <owners>App vNext</owners>
+    <authors>App vNext</authors>
+    <description>
+      Simmy is a chaos-engineering and fault-injection tool, integrating with the Polly resilience project for .NET
+    </description>
+    <language>en-US</language>
+    <license type="expression">BSD-3-Clause</license>
+    <iconUrl>https://raw.github.com/App-vNext/Simmy/master/Simmy.png</iconUrl>
+    <projectUrl>https://github.com/App-vNext/Simmy</projectUrl>
+    <tags>Resilience Chaos-engineering Fault-injection</tags>
+    <copyright>Copyright © 2019, App vNext</copyright>
+    <releaseNotes>
+     0.1.0
+     ---------------------
+     - Initial launch
+   </releaseNotes>
+    <dependencies>
+      <group targetFramework="netstandard1.1">
+        <dependency id="NETStandard.Library" version="1.6.1" />
+        <dependency id="Polly" version="7.1.0" />
+      </group>
+      <group targetFramework="netstandard2.0">
+        <dependency id="Polly" version="7.1.0" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="lib\**\*.*" target="lib" exclude="**\*.unsigned" />
+  </files>
+</package>
diff --git a/src/Simmy.sln → src/Polly.Contrib.Simmy.sln b/src/Simmy.sln → src/Polly.Contrib.Simmy.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.168
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Simmy", "Simmy\Simmy.csproj", "{B7730E1D-0796-4151-95C3-1C6E7DE897B9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Contrib.Simmy", "Polly.Contrib.Simmy\Polly.Contrib.Simmy.csproj", "{B7730E1D-0796-4151-95C3-1C6E7DE897B9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Simmy.Specs", "Simmy.Specs\Simmy.Specs.csproj", "{ED587F9F-BBE6-4715-9FAA-BAAEFE288A73}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Contrib.Simmy.Specs", "Polly.Contrib.Simmy.Specs\Polly.Contrib.Simmy.Specs.csproj", "{ED587F9F-BBE6-4715-9FAA-BAAEFE288A73}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/Simmy.snk → src/Polly.Contrib.Simmy.snk b/src/Simmy.snk → src/Polly.Contrib.Simmy.snk
diff --git a/src/Simmy/AsyncMonkeyEngine.cs → src/Polly.Contrib.Simmy/AsyncMonkeyEngine.cs b/src/Simmy/AsyncMonkeyEngine.cs → src/Polly.Contrib.Simmy/AsyncMonkeyEngine.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Polly;
-using Simmy.Utilities;
+using Polly.Contrib.Simmy.Utilities;
 
-namespace Simmy
+namespace Polly.Contrib.Simmy
 {
     internal static class AsyncMonkeyEngine
     {

diff --git a/src/Simmy/AsyncMonkeyPolicy.cs → src/Polly.Contrib.Simmy/AsyncMonkeyPolicy.cs b/src/Simmy/AsyncMonkeyPolicy.cs → src/Polly.Contrib.Simmy/AsyncMonkeyPolicy.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Threading.Tasks;
-using Polly;
 
-namespace Simmy
+namespace Polly.Contrib.Simmy
 {
     /// <summary>
     /// Contains common functionality for policies which intentionally disrupt async executions - which monkey around with calls.

diff --git a/...my/Behavior/AsyncInjectBehaviourPolicy.cs → ...my/Behavior/AsyncInjectBehaviourPolicy.cs b/...my/Behavior/AsyncInjectBehaviourPolicy.cs → ...my/Behavior/AsyncInjectBehaviourPolicy.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Polly;
 
-namespace Simmy.Behavior
+namespace Polly.Contrib.Simmy.Behavior
 {
     /// <summary>
     /// A policy that injects any custom behaviour before the execution of delegates.

diff --git a/...my/Behavior/AsyncInjectBehaviourSyntax.cs → ...my/Behavior/AsyncInjectBehaviourSyntax.cs b/...my/Behavior/AsyncInjectBehaviourSyntax.cs → ...my/Behavior/AsyncInjectBehaviourSyntax.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Polly;
-using Simmy.Behavior;
+using Polly.Contrib.Simmy.Behavior;
 
-namespace Simmy
+namespace Polly.Contrib.Simmy
 {
     /// <summary>
     /// Fluent API for defining Monkey <see cref="Policy"/>. 

diff --git a/...vior/AsyncInjectBehaviourTResultSyntax.cs → ...vior/AsyncInjectBehaviourTResultSyntax.cs b/...vior/AsyncInjectBehaviourTResultSyntax.cs → ...vior/AsyncInjectBehaviourTResultSyntax.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Polly;
-using Simmy.Behavior;
+using Polly.Contrib.Simmy.Behavior;
 
-namespace Simmy
+namespace Polly.Contrib.Simmy
 {
     /// <summary>
     /// Fluent API for defining Monkey <see cref="Policy"/>. 

diff --git a/src/Simmy/Behavior/InjectBehaviourPolicy.cs → ...b.Simmy/Behavior/InjectBehaviourPolicy.cs b/src/Simmy/Behavior/InjectBehaviourPolicy.cs → ...b.Simmy/Behavior/InjectBehaviourPolicy.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Threading;
-using Polly;
 
-namespace Simmy.Behavior
+namespace Polly.Contrib.Simmy.Behavior
 {
     /// <summary>
     /// A policy that injects any custom behaviour before the execution of delegates.

diff --git a/src/Simmy/Behavior/InjectBehaviourSyntax.cs → ...b.Simmy/Behavior/InjectBehaviourSyntax.cs b/src/Simmy/Behavior/InjectBehaviourSyntax.cs → ...b.Simmy/Behavior/InjectBehaviourSyntax.cs
@@ -1,8 +1,7 @@
 using System;
-using Polly;
-using Simmy.Behavior;
+using Polly.Contrib.Simmy.Behavior;
 
-namespace Simmy
+namespace Polly.Contrib.Simmy
 {
     /// <summary>
     /// Fluent API for defining Monkey <see cref="Policy"/>.