huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into patch-1

This commit is contained in:
Eilon Lipton 2017-09-03 19:21:26 -07:00 committed by GitHub
parent cf6b6da234 8550a4d93c
commit d80d138302
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -28,7 +28,7 @@ Security issues and bugs should be reported privately, via email, to the Microso
Our team members also monitor several other discussion forums: Our team members also monitor several other discussion forums:
* [ASP.NET Core forum](https://forums.asp.net/1255.aspx/1?ASP+NET+5) * [ASP.NET Core forum](https://forums.asp.net/1255.aspx/1?ASP+NET+5)
* [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. * [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.
## Filing issues ## Filing issues

10
LICENSE.txt
View File

@ -1,12 +1,14 @@
Copyright (c) .NET Foundation. All rights reserved. Copyright (c) .NET Foundation and Contributors
All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may not use Licensed under the Apache License, Version 2.0 (the "License"); you may not use
these files except in compliance with the License. You may obtain a copy of the this file except in compliance with the License. You may obtain a copy of the
License at License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed Unless required by applicable law or agreed to in writing, software distributed
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied. See the License for the CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License. specific language governing permissions and limitations under the License.

14
README.md
View File

@ -8,7 +8,7 @@ ASP.NET Core is a new open-source and cross-platform framework for building mode
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. 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.
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. 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.
## Get Started ## Get Started
@ -18,6 +18,8 @@ Also checkout the [.NET Homepage](https://www.microsoft.com/net) for released ve
## Builds ## Builds
[![MyGet tenant](https://img.shields.io/dotnet.myget/aspnetcore-dev/v/Microsoft.AspNetCore.All.svg)]()
If you want to use the latest dev build then you need to: If you want to use the latest dev build then you need to:
- Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/cli#installers-and-binaries) - 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:
Prerelease tooling builds for Visual Studio are available from the [Tooling](https://github.com/aspnet/tooling/#pre-release-builds) repo. Prerelease tooling builds for Visual Studio are available from the [Tooling](https://github.com/aspnet/tooling/#pre-release-builds) repo.
## Community and roadmap ## Community and roadmap
To follow along with the development of ASP.NET Core: To follow along with the development of ASP.NET Core:
@ -53,7 +57,7 @@ These are some of the most common repos:
* [DependencyInjection](https://github.com/aspnet/DependencyInjection) - basic dependency injection infrastructure and default implementation * [DependencyInjection](https://github.com/aspnet/DependencyInjection) - basic dependency injection infrastructure and default implementation
* [Docs](https://github.com/aspnet/Docs) - documentation sources for https://docs.microsoft.com/en-us/aspnet/core/ * [Docs](https://github.com/aspnet/Docs) - documentation sources for https://docs.microsoft.com/en-us/aspnet/core/
* [EntityFramework](https://github.com/aspnet/EntityFramework) - data access technology * [EntityFrameworkCore](https://github.com/aspnet/EntityFrameworkCore) - data access technology
* [Identity](https://github.com/aspnet/Identity) - users and membership system * [Identity](https://github.com/aspnet/Identity) - users and membership system
* [MVC](https://github.com/aspnet/Mvc) - MVC framework for web apps and services * [MVC](https://github.com/aspnet/Mvc) - MVC framework for web apps and services
* [Razor](https://github.com/aspnet/Razor) - template language and syntax for CSHTML files * [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:
See the [NuGet feeds](https://github.com/aspnet/Home/wiki/NuGet-feeds) wiki page. See the [NuGet feeds](https://github.com/aspnet/Home/wiki/NuGet-feeds) wiki page.
## Build tools
This project produces builds using JetBrains TeamCity.
<a href="https://www.jetbrains.com/teamcity/"><img src="https://github.com/aspnet/Home/wiki/images/logo_TeamCity.png"></a>
# Feedback # Feedback
Check out the [contributing](CONTRIBUTING.md) page to see the best places to log issues and start discussions. Check out the [contributing](CONTRIBUTING.md) page to see the best places to log issues and start discussions.