Skip to content

Commit d80d138

Browse files
authored
Merge branch 'dev' into patch-1
2 parents cf6b6da + 8550a4d commit d80d138

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Security issues and bugs should be reported privately, via email, to the Microso
2828
Our team members also monitor several other discussion forums:
2929

3030
* [ASP.NET Core forum](https://forums.asp.net/1255.aspx/1?ASP+NET+5)
31-
* [StackOverflow](https://stackoverflow.com/) with the [`asp.net-core`](https://stackoverflow.com/questions/tagged/asp.net-core), [`asp.net-core-mvc`](https://stackoverflow.com/questions/tagged/asp.net-core-mvc), or [`entity-framework-core`](https://stackoverflow.com/questions/tagged/entity-framework-core) tags.
31+
* [Stack Overflow](https://stackoverflow.com/) with the [`asp.net-core`](https://stackoverflow.com/questions/tagged/asp.net-core), [`asp.net-core-mvc`](https://stackoverflow.com/questions/tagged/asp.net-core-mvc), or [`entity-framework-core`](https://stackoverflow.com/questions/tagged/entity-framework-core) tags.
3232

3333

3434
## Filing issues

LICENSE.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
Copyright (c) .NET Foundation. All rights reserved.
1+
Copyright (c) .NET Foundation and Contributors
2+
3+
All rights reserved.
24

35
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
4-
these files except in compliance with the License. You may obtain a copy of the
6+
this file except in compliance with the License. You may obtain a copy of the
57
License at
68

7-
http://www.apache.org/licenses/LICENSE-2.0
9+
http://www.apache.org/licenses/LICENSE-2.0
810

911
Unless required by applicable law or agreed to in writing, software distributed
1012
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
1113
CONDITIONS OF ANY KIND, either express or implied. See the License for the
12-
specific language governing permissions and limitations under the License.
14+
specific language governing permissions and limitations under the License.

README.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ASP.NET Core is a new open-source and cross-platform framework for building mode
88

99
ASP.NET Core 1.1 is now available! See the [release notes](https://github.com/aspnet/Home/releases/tag/1.1.0) for further details and check our [releases](https://github.com/aspnet/home/releases) for the latest patch release.
1010

11-
ASP.NET Core 2.0 Preview 1 is now available! See the [release notes](https://github.com/aspnet/Home/releases/tag/2.0.0-preview1) for further details.
11+
ASP.NET Core 2.0 Preview 2 is now available! See the [release notes](https://github.com/aspnet/Home/releases/tag/2.0.0-preview2) for further details.
1212

1313
## Get Started
1414

@@ -18,6 +18,8 @@ Also checkout the [.NET Homepage](https://www.microsoft.com/net) for released ve
1818

1919
## Builds
2020

21+
[![MyGet tenant](https://img.shields.io/dotnet.myget/aspnetcore-dev/v/Microsoft.AspNetCore.All.svg)]()
22+
2123
If you want to use the latest dev build then you need to:
2224

2325
- Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/cli#installers-and-binaries)
@@ -40,6 +42,8 @@ If you want to use the latest dev build then you need to:
4042

4143
Prerelease tooling builds for Visual Studio are available from the [Tooling](https://github.com/aspnet/tooling/#pre-release-builds) repo.
4244

45+
46+
4347
## Community and roadmap
4448

4549
To follow along with the development of ASP.NET Core:
@@ -53,7 +57,7 @@ These are some of the most common repos:
5357

5458
* [DependencyInjection](https://github.com/aspnet/DependencyInjection) - basic dependency injection infrastructure and default implementation
5559
* [Docs](https://github.com/aspnet/Docs) - documentation sources for https://docs.microsoft.com/en-us/aspnet/core/
56-
* [EntityFramework](https://github.com/aspnet/EntityFramework) - data access technology
60+
* [EntityFrameworkCore](https://github.com/aspnet/EntityFrameworkCore) - data access technology
5761
* [Identity](https://github.com/aspnet/Identity) - users and membership system
5862
* [MVC](https://github.com/aspnet/Mvc) - MVC framework for web apps and services
5963
* [Razor](https://github.com/aspnet/Razor) - template language and syntax for CSHTML files
@@ -65,12 +69,6 @@ These are some of the most common repos:
6569

6670
See the [NuGet feeds](https://github.com/aspnet/Home/wiki/NuGet-feeds) wiki page.
6771

68-
## Build tools
69-
70-
This project produces builds using JetBrains TeamCity.
71-
72-
<a href="https://www.jetbrains.com/teamcity/"><img src="https://github.com/aspnet/Home/wiki/images/logo_TeamCity.png"></a>
73-
7472
# Feedback
7573

7674
Check out the [contributing](CONTRIBUTING.md) page to see the best places to log issues and start discussions.

0 commit comments

Comments
 (0)