Skip to content

Commit 73d8fe6

Browse files
authored
Merge pull request #237 from ivaylokenov/final-touches
Final touches
2 parents 96b03a6 + 56fac77 commit 73d8fe6

File tree

132 files changed

+8347
-8122
lines changed

Some content is hidden

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

132 files changed

+8347
-8122
lines changed

LICENSE

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MyTested.AspNetCore.Mvc
2-
Code by Ivaylo Kenov. Copyright (c) 2015 Ivaylo Kenov.
2+
Code by Ivaylo Kenov. Copyright (c) 2015-2016 Ivaylo Kenov.
33
===============================================================================
44

55
This program is free software: you can redistribute it and/or modify it
@@ -12,6 +12,20 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
1212
FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
1313

1414

15+
Lite Package License Exception
16+
===============================================================================
17+
18+
This Exception applies to applications built with only MyTested.AspNetCore.Mvc.Lite
19+
and no other MyTested.AspNetCore.Mvc extensions. MyTested.AspNetCore.Mvc.Lite is intended
20+
to be used in both open-source and commercial environments. To allow its use
21+
in as many situations as possible, MyTested.AspNetCore.Mvc.Lite is dual-licensed.
22+
You may choose to use MyTested.AspNetCore.Mvc.Lite under either the Apache License, Version 2.0,
23+
or the Microsoft Public License (Ms-PL). These licenses are essentially identical,
24+
but you are encouraged to evaluate both to determine which best fits your intended use.
25+
See https://github.com/ivaylokenov/MyTested.AspNetCore.Mvc/blob/master/src/MyTested.AspNetCore.Mvc.Lite/LICENSE
26+
for more details.
27+
28+
1529
FOSS License Exception
1630
===============================================================================
1731

@@ -65,4 +79,4 @@ Zlib/libpng License -
6579

6680
Commercial License
6781
===========================================================================
68-
In addition to this license, MyTested.AspNetCore.Mvc will be offered under free or paid commercial licenses after the final release.
82+
In addition to this license, MyTested.AspNetCore.Mvc is offered under free or paid commercial licenses. See https://mytestedasp.net/Core/Mvc#pricing for more details.

README.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1><img src="https://raw.githubusercontent.com/ivaylokenov/MyTested.AspNetCore.Mvc/master/tools/logo.png" align="left" alt="MyTested.AspNetCore.Mvc" width="100">&nbsp; MyTested.AspNetCore.Mvc - Fluent testing<br />&nbsp; framework for ASP.NET Core MVC</h1>
22
====================================
33

4-
MyTested.AspNetCore.Mvc is a unit testing library (currently in preview version) providing easy fluent interface to test the [ASP.NET Core MVC](https://github.com/aspnet/Mvc) framework. It is testing framework agnostic, so you can combine it with a test runner of your choice (e.g. xUnit, NUnit, etc.).
4+
MyTested.AspNetCore.Mvc is a unit testing library providing easy fluent interface to test the [ASP.NET Core MVC](https://github.com/aspnet/Mvc) framework. It is testing framework agnostic, so you can combine it with a test runner of your choice (e.g. xUnit, NUnit, etc.).
55

66
[![Build status](https://ci.appveyor.com/api/projects/status/3xlag3a7f87bg4on?svg=true)](https://ci.appveyor.com/project/ivaylokenov/mytested-aspnetcore-mvc) [![NuGet Version](http://img.shields.io/nuget/v/MyTested.AspNetCore.Mvc.svg?style=flat)](https://www.nuget.org/packages/MyTested.AspNetCore.Mvc/)
77

@@ -11,7 +11,7 @@ It is strongly advised to start with the [tutorial](http://docs.mytestedasp.net/
1111

1212
## Installation
1313

14-
You can install this library using NuGet into your test project (or reference it directly in your `project.json` file). Currently `MyTested.AspNetCore.Mvc` works with ASP.NET Core MVC 1.0.0.
14+
You can install this library using NuGet into your test project (or reference it directly in your `project.json` file). Currently MyTested.AspNetCore.Mvc works with ASP.NET Core MVC 1.0.1.
1515

1616
Install-Package MyTested.AspNetCore.Mvc.Universe
1717

@@ -36,7 +36,6 @@ This package will include all available assertion methods in your test project,
3636
- `MyTested.AspNetCore.Mvc.Session` - Contains setup and assertion methods for `ISession`
3737
- `MyTested.AspNetCore.Mvc.Options` - Contains setup and assertion methods for `IOptions`
3838
- `MyTested.AspNetCore.Mvc.Helpers` - Contains additional helper methods for easier assertions
39-
4039
- `MyTested.AspNetCore.Mvc.Lite` - Completely **FREE** and **UNLIMITED** version of the library. It should not be used in combination with any other package. Includes `Controllers`, `ViewActionResults` and `ViewComponents`.
4140

4241
After the downloading is complete, just add `using MyTested.AspNetCore.Mvc;` to your source code and you are ready to test in the most elegant and developer friendly way.
@@ -241,15 +240,19 @@ MyMvc
241240

242241
## License
243242

244-
Code by Ivaylo Kenov. Copyright 2015 Ivaylo Kenov ([http://mytestedasp.net](http://mytestedasp.net))
243+
Code by Ivaylo Kenov. Copyright 2015-2016 Ivaylo Kenov ([http://mytestedasp.net](http://mytestedasp.net))
245244

246-
**Currently MyTested.AspNetCore.Mvc is in preview and it is not advised to use it in production environments. The testing framework is fully tested and working correctly but the fluent APIs may change in the final production-ready build.**
245+
MyTested.AspNetCore.Mvc.Lite (the **FREE** and **UNLIMITED** version of the library) is dual-licensed under either the Apache License, Version 2.0, or the Microsoft Public License (Ms-PL).
247246

248-
MyTested.AspNetCore.Mvc source code is available under GNU Affero General Public License/FOSS License Exception. The free version of the library allows up to 500 assertions (around 100 test cases) per test project. Additionally, **full-featured licenses can be requested for free by individuals, open-source projects, startups and educational institutions**. Commercial licensing with private support will also be available with the final release.
247+
MyTested.AspNetCore.Mvc source code is available under GNU Affero General Public License/FOSS License Exception.
249248

250-
See the [LICENSE](https://github.com/ivaylokenov/MyTested.AspNetCore.Mvc/blob/master/LICENSE) for detailed information.
249+
Without a license code the library allows up to 100 assertions (around 25 test cases) per test project.
250+
251+
**Full-featured licenses can be requested for free by individuals, open-source projects, startups and educational institutions** . See [https://mytestedasp.net/Core/Mvc#free-usage-modal](https://mytestedasp.net/Core/Mvc#free-usage-modal) for more information.
251252

252-
If you want an early-bird license key for free, send a contact message through [http://mytestedasp.net](http://mytestedasp.net).
253+
Commercial licensing with private support is also available at [https://mytestedasp.net/Core/Mvc#pricing](https://mytestedasp.net/Core/Mvc#pricing).
254+
255+
See the [LICENSE](https://github.com/ivaylokenov/MyTested.AspNetCore.Mvc/blob/master/LICENSE) for detailed information.
253256

254257
## Any questions, comments or additions?
255258

samples/ApplicationParts/ApplicationParts.Controllers/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"dependencies": {
3-
"NETStandard.Library": "1.6.0-*",
4-
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
5-
"Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0-*",
3+
"NETStandard.Library": "1.6.0",
4+
"Microsoft.AspNetCore.Mvc": "1.0.1",
5+
"Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0",
66
"ApplicationParts.Models": "*",
77
"ApplicationParts.Services": "*"
88
},

0 commit comments

Comments
 (0)