Skip to content

Commit 9057188

Browse files
committed
Changed license - can be used in commercial (closes #165)
1 parent ca12203 commit 9057188

File tree

302 files changed

+496
-4535
lines changed

Some content is hidden

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

302 files changed

+496
-4535
lines changed

LICENSE

Lines changed: 174 additions & 674 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,13 @@ MyWebApi
134134
## License
135135

136136
Code by Ivaylo Kenov. Copyright 2015 Ivaylo Kenov.
137-
This library is licensed under [GNU General Public License v3](https://tldrlegal.com/license/gnu-general-public-license-v3-(gpl-3)) (full terms and conditions [here](https://www.gnu.org/licenses/gpl.html)). Basically:
137+
This library is intended to be used in both open-source and commercial environments. To allow its use in as many
138+
situations as possible, MyWebApi is dual-licensed. You may choose to use MyWebApi under either the Apache License,
139+
Version 2.0, or the Microsoft Public License (Ms-PL). These licenses are essentially identical, but you are
140+
encouraged to evaluate both to determine which best fits your intended use.
138141

139-
- If you create software that uses GPL, you must license that software under GPL v3 (see [GPL FAQ](http://www.gnu.org/licenses/gpl-faq.html#IfLibraryIsGPL))
140-
- If you create software that uses GPL, you must release your source code (see [GPL FAQ](http://www.gnu.org/licenses/gpl-faq.html#IfLibraryIsGPL))
141-
- If you start with a GPL license, you cannot convert to another license
142-
- **You cannot include MyWebApi in a closed source distribution under this license**
143-
144-
If you have a really-coolish-and-nice open source or just closed source commercial project and you want to include MyWebApi in it, leave a question on the [issues page](https://github.com/ivaylokenov/MyWebApi/issues) and another license with the latest version of the library will be provided **free of charge** to you.
142+
Refer to [LICENSE](https://github.com/ivaylokenov/MyWebApi/blob/master/LICENSE) for detailed information.
145143

146144
## Any questions, comments or additions?
147145

148-
Leave an issue on the [issues page](https://github.com/ivaylokenov/MyWebApi/issues) or send a [pull request](https://github.com/ivaylokenov/MyWebApi/pulls).
146+
If you have a feature request or bug report, leave an issue on the [issues page](https://github.com/ivaylokenov/MyWebApi/issues) or send a [pull request](https://github.com/ivaylokenov/MyWebApi/pulls). For general questions and comments, use the [StackOverflow](http://stackoverflow.com/) forum.

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 0.9.{build}
1+
version: 1.0.{build}
22
before_build:
33
- cmd: nuget restore src\MyWebApi.sln
44
build:

src/MyWebApi.Tests/BuildersTests/ActionsTests/ShouldHave/ShouldHaveActionAttributesTests.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
// MyWebApi - ASP.NET Web API Fluent Testing Framework
22
// Copyright (C) 2015 Ivaylo Kenov.
33
//
4-
// This program is free software: you can redistribute it and/or modify
5-
// it under the terms of the GNU General Public License as published by
6-
// the Free Software Foundation, either version 3 of the License, or
7-
// (at your option) any later version.
8-
//
9-
// This program is distributed in the hope that it will be useful,
10-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
// GNU General Public License for more details.
13-
//
14-
// You should have received a copy of the GNU General Public License
15-
// along with this program. If not, see http://www.gnu.org/licenses/.
16-
4+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
175
namespace MyWebApi.Tests.BuildersTests.ActionsTests.ShouldHave
186
{
197
using Exceptions;

src/MyWebApi.Tests/BuildersTests/ActionsTests/ShouldHave/ShouldHaveModelStateTests.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
// MyWebApi - ASP.NET Web API Fluent Testing Framework
22
// Copyright (C) 2015 Ivaylo Kenov.
33
//
4-
// This program is free software: you can redistribute it and/or modify
5-
// it under the terms of the GNU General Public License as published by
6-
// the Free Software Foundation, either version 3 of the License, or
7-
// (at your option) any later version.
8-
//
9-
// This program is distributed in the hope that it will be useful,
10-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
// GNU General Public License for more details.
13-
//
14-
// You should have received a copy of the GNU General Public License
15-
// along with this program. If not, see http://www.gnu.org/licenses/.
16-
4+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
175
namespace MyWebApi.Tests.BuildersTests.ActionsTests.ShouldHave
186
{
197
using System;

src/MyWebApi.Tests/BuildersTests/ActionsTests/ShouldReturn/ShouldReturnBadRequestTests.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
// MyWebApi - ASP.NET Web API Fluent Testing Framework
22
// Copyright (C) 2015 Ivaylo Kenov.
33
//
4-
// This program is free software: you can redistribute it and/or modify
5-
// it under the terms of the GNU General Public License as published by
6-
// the Free Software Foundation, either version 3 of the License, or
7-
// (at your option) any later version.
8-
//
9-
// This program is distributed in the hope that it will be useful,
10-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
// GNU General Public License for more details.
13-
//
14-
// You should have received a copy of the GNU General Public License
15-
// along with this program. If not, see http://www.gnu.org/licenses/.
16-
4+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
175
namespace MyWebApi.Tests.BuildersTests.ActionsTests.ShouldReturn
186
{
197
using Exceptions;

src/MyWebApi.Tests/BuildersTests/ActionsTests/ShouldReturn/ShouldReturnConflictTests.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
// MyWebApi - ASP.NET Web API Fluent Testing Framework
22
// Copyright (C) 2015 Ivaylo Kenov.
33
//
4-
// This program is free software: you can redistribute it and/or modify
5-
// it under the terms of the GNU General Public License as published by
6-
// the Free Software Foundation, either version 3 of the License, or
7-
// (at your option) any later version.
8-
//
9-
// This program is distributed in the hope that it will be useful,
10-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
// GNU General Public License for more details.
13-
//
14-
// You should have received a copy of the GNU General Public License
15-
// along with this program. If not, see http://www.gnu.org/licenses/.
16-
4+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
175
namespace MyWebApi.Tests.BuildersTests.ActionsTests.ShouldReturn
186
{
197
using Exceptions;

src/MyWebApi.Tests/BuildersTests/ActionsTests/ShouldReturn/ShouldReturnContentTests.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
// MyWebApi - ASP.NET Web API Fluent Testing Framework
22
// Copyright (C) 2015 Ivaylo Kenov.
33
//
4-
// This program is free software: you can redistribute it and/or modify
5-
// it under the terms of the GNU General Public License as published by
6-
// the Free Software Foundation, either version 3 of the License, or
7-
// (at your option) any later version.
8-
//
9-
// This program is distributed in the hope that it will be useful,
10-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
// GNU General Public License for more details.
13-
//
14-
// You should have received a copy of the GNU General Public License
15-
// along with this program. If not, see http://www.gnu.org/licenses/.
16-
4+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
175
namespace MyWebApi.Tests.BuildersTests.ActionsTests.ShouldReturn
186
{
197
using Exceptions;

src/MyWebApi.Tests/BuildersTests/ActionsTests/ShouldReturn/ShouldReturnCreatedTests.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
// MyWebApi - ASP.NET Web API Fluent Testing Framework
22
// Copyright (C) 2015 Ivaylo Kenov.
33
//
4-
// This program is free software: you can redistribute it and/or modify
5-
// it under the terms of the GNU General Public License as published by
6-
// the Free Software Foundation, either version 3 of the License, or
7-
// (at your option) any later version.
8-
//
9-
// This program is distributed in the hope that it will be useful,
10-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
// GNU General Public License for more details.
13-
//
14-
// You should have received a copy of the GNU General Public License
15-
// along with this program. If not, see http://www.gnu.org/licenses/.
16-
4+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
175
namespace MyWebApi.Tests.BuildersTests.ActionsTests.ShouldReturn
186
{
197
using Exceptions;

src/MyWebApi.Tests/BuildersTests/ActionsTests/ShouldReturn/ShouldReturnHttpResponseModelTests.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
// MyWebApi - ASP.NET Web API Fluent Testing Framework
22
// Copyright (C) 2015 Ivaylo Kenov.
33
//
4-
// This program is free software: you can redistribute it and/or modify
5-
// it under the terms of the GNU General Public License as published by
6-
// the Free Software Foundation, either version 3 of the License, or
7-
// (at your option) any later version.
8-
//
9-
// This program is distributed in the hope that it will be useful,
10-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
// GNU General Public License for more details.
13-
//
14-
// You should have received a copy of the GNU General Public License
15-
// along with this program. If not, see http://www.gnu.org/licenses/.
16-
4+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
175
namespace MyWebApi.Tests.BuildersTests.ActionsTests.ShouldReturn
186
{
197
using Exceptions;

0 commit comments

Comments
 (0)