Merge remote-tracking branch 'upstream/master' into promise_base

Real-Serious-Games · Oct 18, 2018 · 5bf27de · 5bf27de
2 parents 6ae9256 + baa92ba
commit 5bf27de
Show file tree

Hide file tree

Showing 44 changed files with 3,035 additions and 1,251 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
+.vs
 
 # User-specific files
 *.suo

diff --git a/.travis.yml b/.travis.yml
@@ -6,5 +6,5 @@ install:
   - nuget install xunit.runners -Version 1.9.2 -OutputDirectory testrunner
 
 script:
-  - xbuild /p:Configuration=Debug C-Sharp-Promise.sln
-  - mono ./testrunner/xunit.runners.1.9.2/tools/xunit.console.exe ./bin/Debug/RSG.Promise.Tests.dll
+  - msbuild /p:Configuration=Debug C-Sharp-Promise.sln
+  - mono ./testrunner/xunit.runners.1.9.2/tools/xunit.console.exe ./bin/Debug/RSG.Promise.Tests.dll
diff --git a/C-Sharp-Promise.csproj b/C-Sharp-Promise.csproj
diff --git a/C-Sharp-Promise.nuspec b/C-Sharp-Promise.nuspec
diff --git a/C-Sharp-Promise.sln b/C-Sharp-Promise.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2042
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C-Sharp-Promise", "C-Sharp-Promise.csproj", "{7E1C6A8A-84E7-43C3-AE73-C6E8A9F11AF3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RSG.Promise", "src\RSG.Promise.csproj", "{7E1C6A8A-84E7-43C3-AE73-C6E8A9F11AF3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Promise.Tests", "Tests\Promise.Tests.csproj", "{4B4EE1A6-25A3-43D0-BAE9-5E45E31F2816}"
 EndProject
@@ -64,4 +64,7 @@ Global
 		{BDB0135C-B075-47BE-A971-1927BEA6F622} = {79A9B3AC-1942-4441-872C-41CF7BB240A4}
 		{1060401E-1C17-4741-BF1E-9F05B5427775} = {79A9B3AC-1942-4441-872C-41CF7BB240A4}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7D2FBA48-64F2-4236-BA93-0AF605D743D8}
+	EndGlobalSection
 EndGlobal
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,50 @@
+# How to contribute to C-Sharp-Promise
+
+👍🎉 First off, thanks for taking the time to contribute! 🎉👍
+
+
+## Reporting bugs
+
+Any bug reports are useful, although there are a few things you can do that will
+make it easier for maintainers and other users to understand your report,
+reproduce the behaviour, and find related reports.
+
+  - **Use a clear and descriptive title** for the issue to identify the problem.
+  - **Describe the exact steps which reproduce the problem** in as many details
+    as possible. Code examples or links to repos to reproduce the issue are
+    always helpful.
+  - **Describe the behaviour you observed after following the steps** and point
+    out what exactly the problem is with that behaviour.
+  - **Explain which behaviour you expected to see instead and why.** Since
+    C-Sharp-Promise is designed to replicate [JavaScript promises](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises),
+    code that works with JavaScript promises but gives a different result or
+    breaks with C-Sharp-Promise would be a a good example.
+  - **Check the existing open issues on GitHub** to see if someone else has had
+    the same problem as you.
+
+Make sure to file bugs as [GitHub issues](https://github.com/Real-Serious-Games/C-Sharp-Promise/issues),
+since that way everyone working on the library can see it and potentially help.
+
+
+## Pull requests
+
+Before we merge pull requests there are a few things we look for to make sure
+the code is maintainable and up the same standard as the rest of the library.
+
+  - Make sure you've written comprehensive unit tests for the feature, or
+    modify existing tests if the feature changes functionality.
+  - Check that your code conforms to the same style as existing code. Ensure that
+    your editor is set up to read the [.editorconfig](http://editorconfig.org/)
+    file for consistent spacing and line endings. We also try to keep our code
+    style consistent with the [Microsoft C# Coding Conventions](https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/inside-a-program/coding-conventions)
+    and [Framework Design Guidelines](https://docs.microsoft.com/en-us/dotnet/standard/design-guidelines/index).
+  - Make sure that the [Travis CI build](https://travis-ci.org/Real-Serious-Games/C-Sharp-Promise)
+    succeeds. This should run automatically when you create a pull request, but
+    should have the same result as building the solution and running all the
+    tests locally. We will not accept any pull requests that fail to build or
+    contain failing tests.
+  - If you have added a new feature, add a section to README.md describing the
+    feature and how to use it.
+
+In addition, if your pull request breaks any existing functionality it's
+unlikely we will merge it unless there is a very good reason.
diff --git a/Examples/Example1/Example1.csproj b/Examples/Example1/Example1.csproj
@@ -35,9 +35,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RSG.Toolkit">
-      <HintPath>..\..\packages\RSG.Toolkit.1.0.0.0\lib\net35\RSG.Toolkit.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -51,12 +48,11 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\C-Sharp-Promise.csproj">
+    <ProjectReference Include="..\..\src\RSG.Promise.csproj">
       <Project>{7e1c6a8a-84e7-43c3-ae73-c6e8a9f11af3}</Project>
-      <Name>C-Sharp-Promise</Name>
+      <Name>RSG.Promise</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Examples/Example1/packages.config b/Examples/Example1/packages.config
diff --git a/Examples/Example2/Example2.csproj b/Examples/Example2/Example2.csproj
@@ -35,9 +35,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RSG.Toolkit">
-      <HintPath>..\..\packages\RSG.Toolkit.1.0.0.0\lib\net35\RSG.Toolkit.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -51,12 +48,11 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\C-Sharp-Promise.csproj">
+    <ProjectReference Include="..\..\src\RSG.Promise.csproj">
       <Project>{7e1c6a8a-84e7-43c3-ae73-c6e8a9f11af3}</Project>
-      <Name>C-Sharp-Promise</Name>
+      <Name>RSG.Promise</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Examples/Example2/packages.config b/Examples/Example2/packages.config
diff --git a/Examples/Example3/Example3.csproj b/Examples/Example3/Example3.csproj
@@ -35,9 +35,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RSG.Toolkit">
-      <HintPath>..\..\packages\RSG.Toolkit.1.0.0.0\lib\net35\RSG.Toolkit.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -51,12 +48,11 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\C-Sharp-Promise.csproj">
+    <ProjectReference Include="..\..\src\RSG.Promise.csproj">
       <Project>{7e1c6a8a-84e7-43c3-ae73-c6e8a9f11af3}</Project>
-      <Name>C-Sharp-Promise</Name>
+      <Name>RSG.Promise</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Examples/Example3/Program.cs b/Examples/Example3/Program.cs
@@ -31,12 +31,6 @@ static void Main(string[] args)
                         .Find(html)
                         .Select(link => link.Href)
                         .ToArray();
-                })            
-                .Catch(exception =>     // Catch any errors that happen during download or transform.
-                {
-                    Console.WriteLine("Async operation errorred.");
-                    Console.WriteLine(exception);
-                    running = false;
                 })
                 .Then(links =>          // Display the links that were extracted.
                 {
@@ -46,6 +40,12 @@ static void Main(string[] args)
                         Console.WriteLine(link);
                     }
                     running = false;
+                })            
+                .Catch(exception =>     // Catch any errors that happen during download or transform.
+                {
+                    Console.WriteLine("Async operation errorred.");
+                    Console.WriteLine(exception);
+                    running = false;
                 })
                 .Done();
 

diff --git a/Examples/Example3/packages.config b/Examples/Example3/packages.config
diff --git a/Examples/Example4/Example4.csproj b/Examples/Example4/Example4.csproj
@@ -35,9 +35,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RSG.Toolkit">
-      <HintPath>..\..\packages\RSG.Toolkit.1.0.0.0\lib\net35\RSG.Toolkit.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -51,12 +48,11 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\C-Sharp-Promise.csproj">
+    <ProjectReference Include="..\..\src\RSG.Promise.csproj">
       <Project>{7e1c6a8a-84e7-43c3-ae73-c6e8a9f11af3}</Project>
-      <Name>C-Sharp-Promise</Name>
+      <Name>RSG.Promise</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Examples/Example4/Program.cs b/Examples/Example4/Program.cs
@@ -34,18 +34,18 @@ static void Main(string[] args)
                         .First();              // Grab the 6th link.
                 })
                 .Then(firstLink => Download(firstLink)) // Follow the first link and download it.
-                .Catch(exception =>                     // Catch any errors that happen during download or transform.
-                {
-                    Console.WriteLine("Async operation errorred.");
-                    Console.WriteLine(exception);
-                    running = false;
-                })
                 .Then(html =>          // Display html from the link that was followed.
                 {
                     Console.WriteLine("Async operation completed.");
                     Console.WriteLine(html.Substring(0, 250) + "...");
                     running = false;
                 })
+                .Catch(exception =>                     // Catch any errors that happen during download or transform.
+                {
+                    Console.WriteLine("Async operation errorred.");
+                    Console.WriteLine(exception);
+                    running = false;
+                })
                 .Done();
 
             Console.WriteLine("Waiting");

diff --git a/Examples/Example4/packages.config b/Examples/Example4/packages.config
diff --git a/Examples/Example5/Example5.csproj b/Examples/Example5/Example5.csproj
@@ -35,9 +35,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RSG.Toolkit">
-      <HintPath>..\..\packages\RSG.Toolkit.1.0.0.0\lib\net35\RSG.Toolkit.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -51,12 +48,11 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\C-Sharp-Promise.csproj">
+    <ProjectReference Include="..\..\src\RSG.Promise.csproj">
       <Project>{7e1c6a8a-84e7-43c3-ae73-c6e8a9f11af3}</Project>
-      <Name>C-Sharp-Promise</Name>
+      <Name>RSG.Promise</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />