Skip to content

Commit 5bf27de

Browse files
ericnewton76ericnewton76
committed
Merge remote-tracking branch 'upstream/master' into promise_base
2 parents 6ae9256 + baa92ba commit 5bf27de

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3035
-1251
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
3+
.vs
34

45
# User-specific files
56
*.suo

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ install:
66
- nuget install xunit.runners -Version 1.9.2 -OutputDirectory testrunner
77

88
script:
9-
- xbuild /p:Configuration=Debug C-Sharp-Promise.sln
10-
- mono ./testrunner/xunit.runners.1.9.2/tools/xunit.console.exe ./bin/Debug/RSG.Promise.Tests.dll
9+
- msbuild /p:Configuration=Debug C-Sharp-Promise.sln
10+
- mono ./testrunner/xunit.runners.1.9.2/tools/xunit.console.exe ./bin/Debug/RSG.Promise.Tests.dll

‎C-Sharp-Promise.csproj‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎C-Sharp-Promise.nuspec‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎C-Sharp-Promise.sln‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.31101.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27703.2042
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C-Sharp-Promise", "C-Sharp-Promise.csproj", "{7E1C6A8A-84E7-43C3-AE73-C6E8A9F11AF3}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RSG.Promise", "src\RSG.Promise.csproj", "{7E1C6A8A-84E7-43C3-AE73-C6E8A9F11AF3}"
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Promise.Tests", "Tests\Promise.Tests.csproj", "{4B4EE1A6-25A3-43D0-BAE9-5E45E31F2816}"
99
EndProject
@@ -64,4 +64,7 @@ Global
6464
{BDB0135C-B075-47BE-A971-1927BEA6F622} = {79A9B3AC-1942-4441-872C-41CF7BB240A4}
6565
{1060401E-1C17-4741-BF1E-9F05B5427775} = {79A9B3AC-1942-4441-872C-41CF7BB240A4}
6666
EndGlobalSection
67+
GlobalSection(ExtensibilityGlobals) = postSolution
68+
SolutionGuid = {7D2FBA48-64F2-4236-BA93-0AF605D743D8}
69+
EndGlobalSection
6770
EndGlobal

‎CONTRIBUTING.md‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# How to contribute to C-Sharp-Promise
2+
3+
👍🎉 First off, thanks for taking the time to contribute! 🎉👍
4+
5+
6+
## Reporting bugs
7+
8+
Any bug reports are useful, although there are a few things you can do that will
9+
make it easier for maintainers and other users to understand your report,
10+
reproduce the behaviour, and find related reports.
11+
12+
- **Use a clear and descriptive title** for the issue to identify the problem.
13+
- **Describe the exact steps which reproduce the problem** in as many details
14+
as possible. Code examples or links to repos to reproduce the issue are
15+
always helpful.
16+
- **Describe the behaviour you observed after following the steps** and point
17+
out what exactly the problem is with that behaviour.
18+
- **Explain which behaviour you expected to see instead and why.** Since
19+
C-Sharp-Promise is designed to replicate [JavaScript promises](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises),
20+
code that works with JavaScript promises but gives a different result or
21+
breaks with C-Sharp-Promise would be a a good example.
22+
- **Check the existing open issues on GitHub** to see if someone else has had
23+
the same problem as you.
24+
25+
Make sure to file bugs as [GitHub issues](https://github.com/Real-Serious-Games/C-Sharp-Promise/issues),
26+
since that way everyone working on the library can see it and potentially help.
27+
28+
29+
## Pull requests
30+
31+
Before we merge pull requests there are a few things we look for to make sure
32+
the code is maintainable and up the same standard as the rest of the library.
33+
34+
- Make sure you've written comprehensive unit tests for the feature, or
35+
modify existing tests if the feature changes functionality.
36+
- Check that your code conforms to the same style as existing code. Ensure that
37+
your editor is set up to read the [.editorconfig](http://editorconfig.org/)
38+
file for consistent spacing and line endings. We also try to keep our code
39+
style consistent with the [Microsoft C# Coding Conventions](https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/inside-a-program/coding-conventions)
40+
and [Framework Design Guidelines](https://docs.microsoft.com/en-us/dotnet/standard/design-guidelines/index).
41+
- Make sure that the [Travis CI build](https://travis-ci.org/Real-Serious-Games/C-Sharp-Promise)
42+
succeeds. This should run automatically when you create a pull request, but
43+
should have the same result as building the solution and running all the
44+
tests locally. We will not accept any pull requests that fail to build or
45+
contain failing tests.
46+
- If you have added a new feature, add a section to README.md describing the
47+
feature and how to use it.
48+
49+
In addition, if your pull request breaks any existing functionality it's
50+
unlikely we will merge it unless there is a very good reason.

‎Examples/Example1/Example1.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="RSG.Toolkit">
39-
<HintPath>..\..\packages\RSG.Toolkit.1.0.0.0\lib\net35\RSG.Toolkit.dll</HintPath>
40-
</Reference>
4138
<Reference Include="System" />
4239
<Reference Include="System.Core" />
4340
<Reference Include="System.Xml.Linq" />
@@ -51,12 +48,11 @@
5148
</ItemGroup>
5249
<ItemGroup>
5350
<None Include="App.config" />
54-
<None Include="packages.config" />
5551
</ItemGroup>
5652
<ItemGroup>
57-
<ProjectReference Include="..\..\C-Sharp-Promise.csproj">
53+
<ProjectReference Include="..\..\src\RSG.Promise.csproj">
5854
<Project>{7e1c6a8a-84e7-43c3-ae73-c6e8a9f11af3}</Project>
59-
<Name>C-Sharp-Promise</Name>
55+
<Name>RSG.Promise</Name>
6056
</ProjectReference>
6157
</ItemGroup>
6258
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Examples/Example1/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Examples/Example2/Example2.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="RSG.Toolkit">
39-
<HintPath>..\..\packages\RSG.Toolkit.1.0.0.0\lib\net35\RSG.Toolkit.dll</HintPath>
40-
</Reference>
4138
<Reference Include="System" />
4239
<Reference Include="System.Core" />
4340
<Reference Include="System.Xml.Linq" />
@@ -51,12 +48,11 @@
5148
</ItemGroup>
5249
<ItemGroup>
5350
<None Include="App.config" />
54-
<None Include="packages.config" />
5551
</ItemGroup>
5652
<ItemGroup>
57-
<ProjectReference Include="..\..\C-Sharp-Promise.csproj">
53+
<ProjectReference Include="..\..\src\RSG.Promise.csproj">
5854
<Project>{7e1c6a8a-84e7-43c3-ae73-c6e8a9f11af3}</Project>
59-
<Name>C-Sharp-Promise</Name>
55+
<Name>RSG.Promise</Name>
6056
</ProjectReference>
6157
</ItemGroup>
6258
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Examples/Example2/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)