From ba83526230786d2dd0fbe6ad33d411ffaa548dd6 Mon Sep 17 00:00:00 2001 From: Eilon Lipton Date: Thu, 29 May 2014 10:36:36 -0700 Subject: [PATCH 1/6] Improved "where to discuss stuff" content --- CONTRIBUTING.md | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8db7fbf9b3..ec0341bf92 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,8 +1,32 @@ -## Filing issues +## How to contribute -The GitHub issue list is for bugs, not discussions. If you have a question or want to start a discussion you have several options: -- Post a question on [StackOverflow](http://stackoverflow.com/questions/tagged/asp.net-vnext) -- Start a discussion in our [ASP.NET vNext forum](http://forums.asp.net/1255.aspx/1?ASP+NET+vNext) or [JabbR chat room](https://jabbr.net/#/rooms/aspnetvnext) +One of the easiest ways to contribute is to participate in discussions and discuss issues. + +## General feedback and discussions? + +Please start a discussion on the [Home repo issue tracker](https://github.com/aspnet/Home/issues). + +## Bugs and feature requests? +Please log a new issue in the appropriate GitHub repo. Here are some of the most common repos: + +* [DependencyInjection](https://github.com/aspnet/DependencyInjection) +* [EntityFramework](https://github.com/aspnet/EntityFramework) +* [Identity](https://github.com/aspnet/Identity) +* [KRuntime](https://github.com/aspnet/KRuntime) +* [MVC](https://github.com/aspnet/Mvc) +* [SignalR-Server](https://github.com/aspnet/SignalR-Server) + +The full repo list is [here](https://github.com/aspnet). + +## Other discussions +Our team members also monitor several other discussion forums: + +* [ASP.NET vNext forum](http://forums.asp.net/1255.aspx/1?ASP+NET+vNext) +* [StackOverflow](http://stackoverflow.com/questions/tagged/asp.net-vnext) with the `asp.net-vnext` tag +* [JabbR chat room](https://jabbr.net/#/rooms/aspnetvnext) for real-time discussions with the community and the people who work on the project + + +## Filing issues When filing issues, please use our [bug filing templates](https://github.com/aspnet/Home/wiki/Functional-bug-template). The best way to get your bug fixed is to be as detailed as you can be about the problem. From f730aa415280c25ec8124d2595d4a8f0c6f448db Mon Sep 17 00:00:00 2001 From: Eilon Lipton Date: Thu, 29 May 2014 10:40:24 -0700 Subject: [PATCH 2/6] Added link to contributing doc. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c58af470bd..8b4d273240 100644 --- a/README.md +++ b/README.md @@ -103,4 +103,4 @@ Currently the BCL is split into some fairly fine grained packages, which was one #Feedback -You can log issues in this repo in order to start discussions, ask questions, make suggestions, etc. +Check out the [contributing](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) page to see the best places to log issues and start discussions. From 1a64c1c1e82d1862d479c70c8920cd8f64149fab Mon Sep 17 00:00:00 2001 From: kamehrot Date: Thu, 29 May 2014 14:27:49 -0700 Subject: [PATCH 3/6] burning samples and readme to alpha build-189 --- README.md | 6 +++--- samples/HelloMvc/project.json | 8 ++++---- samples/HelloWeb/project.json | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8b4d273240..6ebc1cfc91 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The first thing we need to do is setup the tools required to build and run an ap * Clone the repository * On the command line execute ```kvmsetup.cmd``` * This command will setup your environment, getting it ready to install a version of the runtime. It adds kvm to your path and puts it in your user profile. -* Execute ```kvm install 0.1-alpha-build-0421```. This command will download the named version of the KRE and put it on your user profile ready to use. You can get the latest version by running ```kvm upgrade``` but 0421 was the last version explicitly tested. see the [KVM page](https://github.com/aspnet/Home/wiki/version-manager) for more information on KVM. +* Execute ```kvm install 0.1-alpha-build-0446```. This command will download the named version of the KRE and put it on your user profile ready to use. You can get the latest version by running ```kvm upgrade``` but 0446 was the last version explicitly tested. see the [KVM page](https://github.com/aspnet/Home/wiki/version-manager) for more information on KVM. * Navigate to samples\ConsoleApp * Run ```kpm restore```. This downloads the System.Console package so the app can do Console.WriteLine * Run ```K run``` @@ -37,7 +37,7 @@ The first thing we need to do is setup the tools required to build and run an ap git clone https://github.com/aspnet/Home.git cd Home kvmsetup -kvm install 0.1-alpha-build-0421 -p +kvm install 0.1-alpha-build-0446 -p cd samples\ConsoleApp kpm restore @@ -86,7 +86,7 @@ If you can do all of the above then everything should be working. You can try ou By default when running the applications you are running against Desktop CLR (4.5), you can change that using the KVM command. -1. Run ```kvm install 0.1-alpha-build-0421 -svrc50``` This command gets the latest Core CLR version of the k runtime and sets it as your default. The -svrc50 switch tells it to use Core CLR, you can use -svr50 to target desktop again. +1. Run ```kvm install 0.1-alpha-build-0446 -svrc50``` This command gets the latest Core CLR version of the k runtime and sets it as your default. The -svrc50 switch tells it to use Core CLR, you can use -svr50 to target desktop again. 2. Run ```K web``` 3. The first line of your output should say "Loaded Module: klr.core45.dll" instead of "Loaded Module: klr.net45.dll" 4. The HelloWeb app should work the same as when running on Desktop CLR. diff --git a/samples/HelloMvc/project.json b/samples/HelloMvc/project.json index aaf266486c..ead5eca623 100644 --- a/samples/HelloMvc/project.json +++ b/samples/HelloMvc/project.json @@ -1,10 +1,10 @@ { "version": "0.1-alpha-*", "dependencies": { - "Microsoft.AspNet.Diagnostics": "0.1-alpha-build-0623", - "Microsoft.AspNet.Hosting": "0.1-alpha-build-0519", - "Microsoft.AspNet.Mvc": "0.1-alpha-build-1140", - "Microsoft.AspNet.Server.WebListener": "0.1-alpha-build-0469" + "Microsoft.AspNet.Diagnostics": "0.1-alpha-build-0682", + "Microsoft.AspNet.Hosting": "0.1-alpha-build-0572", + "Microsoft.AspNet.Mvc": "0.1-alpha-build-1268", + "Microsoft.AspNet.Server.WebListener": "0.1-alpha-build-0520" }, "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" diff --git a/samples/HelloWeb/project.json b/samples/HelloWeb/project.json index 234813372c..5d8ac5fd93 100644 --- a/samples/HelloWeb/project.json +++ b/samples/HelloWeb/project.json @@ -1,10 +1,10 @@ { "version": "0.1-alpha-*", "dependencies": { - "Microsoft.AspNet.Diagnostics": "0.1-alpha-build-0623", - "Microsoft.AspNet.Hosting": "0.1-alpha-build-0519", - "Microsoft.AspNet.Server.WebListener": "0.1-alpha-build-0469", - "Microsoft.AspNet.StaticFiles": "0.1-alpha-build-0402" + "Microsoft.AspNet.Diagnostics": "0.1-alpha-build-0682", + "Microsoft.AspNet.Hosting": "0.1-alpha-build-0572", + "Microsoft.AspNet.Server.WebListener": "0.1-alpha-build-0520", + "Microsoft.AspNet.StaticFiles": "0.1-alpha-build-0443" }, "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" From acd8aecf13e4ad1337c5bf8a124102663e5c0734 Mon Sep 17 00:00:00 2001 From: Eilon Lipton Date: Mon, 2 Jun 2014 12:25:22 -0700 Subject: [PATCH 4/6] Fixed formatting --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 6ebc1cfc91..c3a83191c7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -#ASP.NET vNext Home +# ASP.NET vNext Home In the next version of ASP.NET we are working with multiple teams around Microsoft to create a lean, composable .NET stack that provides a familiar and modern framework for web and cloud scenarios. @@ -7,7 +7,7 @@ The Home repository is the starting point for people to learn about ASP.NET vNex The samples provided are designed to show some of the features of the new framework as well as setting up a sandbox for you to try out some of the new features. The NuGet.config file in the repo points to a MyGet feed (https://www.myget.org/F/aspnetvnext/) that has all the packages being developed. The feed is updated every time a full build succeeds. -#Minimum Requirements +# Minimum Requirements These are the current minimum requirements, they do not necesarilly represent our RTM minimum. @@ -16,7 +16,7 @@ These are the current minimum requirements, they do not necesarilly represent ou * Powershell 4. KVM is a Powershell script that makes use of types that older verisons of Powershell cannot load -#Getting Started +# Getting Started The first thing we need to do is setup the tools required to build and run an application. We will start out by getting the [K Version Manager (KVM)](https://github.com/aspnet/Home/wiki/version-manager) @@ -47,9 +47,9 @@ SET KRE_TRACE=1 k run ``` -#Samples +# Samples -##Sandbox Samples +## Sandbox Samples These samples, in this repo, are just basic starting points for you to experiment with features. Since there is no File->New Project we thought some simple samples to take the place of scaffolding would be convenient. @@ -59,15 +59,15 @@ These samples, in this repo, are just basic starting points for you to experimen **NOTE: The samples are pinned to a specific version of the packages. If you want to try the latest builds then update the project.json and replace the last part of the version with a '\*', so '0.1-alpha-build-267' becomes '0.1-alpha-\*', and then run ```kpm restore``` to pull down the latest packages** -##Feature Samples +## Feature Samples The [Entropy repo](https://github.com/aspnet/Entropy) contains samples of specific features in isolation. Each directory contains just enough code to show an aspect of a feature. -##Application Samples +## Application Samples [MVC Music Store](https://github.com/aspnet/MusicStore) and [BugTracker](https://github.com/aspnet/BugTracker) application are both being ported. Each of these have their own repository that you can look at. -#Running the samples +# Running the samples -##Running HelloWeb +## Running HelloWeb 1. Clone the repository 2. Change directory to Samples\HelloWeb @@ -82,7 +82,7 @@ The [Entropy repo](https://github.com/aspnet/Entropy) contains samples of specif If you can do all of the above then everything should be working. You can try out the WebFx sample now to see some more of the new stack. You should run ```kpm restore``` before using any sample for the first time. -#Switching to Core CLR +# Switching to Core CLR By default when running the applications you are running against Desktop CLR (4.5), you can change that using the KVM command. @@ -93,14 +93,14 @@ By default when running the applications you are running against Desktop CLR (4. **NOTE: There are going to be parts of the stack that work on Desktop but do not work on Core CLR. This set should get smaller and smaller as time goes on, but it is entirely likely as you use Core CLR you will hit errors that can't be worked around as the Core CLR surface area just does not exist yet.** -#Core CLR Packages +# Core CLR Packages Currently the BCL is split into some fairly fine grained packages, which was one of the goals of this effort. However, the packages that exist today do not necessarily represent the list of packages that we will end up with. We are still experimenting with what makes sense to be a package and what the experience should be. -#Known Issues +# Known Issues -* Core CLR doesn't currently work on pre Windows 8 +* Core CLR doesn't currently work on Windows OSes earlier than Windows 8 -#Feedback +# Feedback Check out the [contributing](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) page to see the best places to log issues and start discussions. From 37b551591ec57e326c9ba1a9ae4fcf04d5034af0 Mon Sep 17 00:00:00 2001 From: Eilon Lipton Date: Mon, 2 Jun 2014 12:27:12 -0700 Subject: [PATCH 5/6] Changes for community PRs --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c3a83191c7..ed6a848e93 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ In the next version of ASP.NET we are working with multiple teams around Microso The Home repository is the starting point for people to learn about ASP.NET vNext, it contains samples and [documentation](https://github.com/aspnet/Home/wiki) to help folks get started and learn more about what we are doing. +These products are actively developed by the ASP.NET team assigned to the Microsoft Open Tech Hub and in collaboration with a community of open source developers. Together we are dedicated to creating the best possible platform for web development. + The samples provided are designed to show some of the features of the new framework as well as setting up a sandbox for you to try out some of the new features. The NuGet.config file in the repo points to a MyGet feed (https://www.myget.org/F/aspnetvnext/) that has all the packages being developed. The feed is updated every time a full build succeeds. From 5ddccdca08eee30de8bbd8541ee76ac79e771e7a Mon Sep 17 00:00:00 2001 From: Eilon Lipton Date: Mon, 2 Jun 2014 12:37:49 -0700 Subject: [PATCH 6/6] Changes for community PRs --- CONTRIBUTING.md | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ec0341bf92..dd5a406e1b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,11 +1,12 @@ -## How to contribute +# How to contribute + +One of the easiest ways to contribute is to participate in discussions and discuss issues. You can also contribute by submitting pull requests with code changes. -One of the easiest ways to contribute is to participate in discussions and discuss issues. ## General feedback and discussions? - Please start a discussion on the [Home repo issue tracker](https://github.com/aspnet/Home/issues). + ## Bugs and feature requests? Please log a new issue in the appropriate GitHub repo. Here are some of the most common repos: @@ -18,6 +19,7 @@ Please log a new issue in the appropriate GitHub repo. Here are some of the most The full repo list is [here](https://github.com/aspnet). + ## Other discussions Our team members also monitor several other discussion forums: @@ -27,7 +29,6 @@ Our team members also monitor several other discussion forums: ## Filing issues - When filing issues, please use our [bug filing templates](https://github.com/aspnet/Home/wiki/Functional-bug-template). The best way to get your bug fixed is to be as detailed as you can be about the problem. Providing a minimal project with steps to reproduce the problem is ideal. @@ -42,6 +43,29 @@ Here are questions you can answer before you file a bug to make sure you're not GitHub supports [markdown](http://github.github.com/github-flavored-markdown/), so when filing bugs make sure you check the formatting before clicking submit. -## Contributing code and content -We are actively working to allow community code and content contributions. We can't accept code and content contributions yet, but check back soon for updates. +## Contributing code and content +You will need to sign a [Contributor License Agreement](https://cla.msopentech.com) before submitting your pull request. To complete the Contributor License Agreement (CLA), you will need to submit a request via the form and then electronically sign the Contributor License Agreement when you receive the email containing the link to the document. This needs to only be done once for any Microsoft Open Technologies OSS project. + +Make sure you can build the code. Familiarize yourself with the project workflow and our coding conventions. If you don't know what a pull request is read this article: https://help.github.com/articles/using-pull-requests. + +Before submitting a feature or substantial code contribution please discuss it with the team and ensure it follows the product roadmap. You might also read these two blogs posts on contributing code: [Open Source Contribution Etiquette](http://tirania.org/blog/archive/2010/Dec-31.html) by Miguel de Icaza and [Don't "Push" Your Pull Requests](http://www.igvita.com/2011/12/19/dont-push-your-pull-requests/) by Ilya Grigorik. Note that all code submissions will be rigorously reviewed and tested by the ASP.NET and Entity Framework teams, and only those that meet an extremely high bar for both quality and design/roadmap appropriateness will be merged into the source. + +Here's a few things you should always do when making changes to the code base: + +**Commit/Pull Request Format** + +``` +Summary of the changes (Less than 80 chars) + - Detail 1 + - Detail 2 + +#bugnumber (in this specific format) +``` + +**Tests** + +- Tests need to be provided for every bug/feature that is completed. +- Tests only need to be present for issues that need to be verified by QA (e.g. not tasks) +- If there is a scenario that is far too hard to test there does not need to be a test for it. + - "Too hard" is determined by the team as a whole.