Skip to content

Update live with current master #4868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 4, 2018
Merged

Update live with current master #4868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d08324
Fixed typo in description "then" to "the" (#4858)
abegomez Apr 3, 2018
825ebf8
Correct description of /langversion:default (#4829)
svick Apr 3, 2018
ac51376
Update readme for split (#4847)
BillWagner Apr 3, 2018
5153e31
typo (#4862)
user135711 Apr 3, 2018
8fcdc7a
fix build warnings (#4859)
mairaw Apr 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,3 @@
# .NET base types - Formatting
/docs/standard/base-types/formatting-types/** @rpetrusha

########### SAMPLES ################
# C# samples:
/samples/csharp/** @BillWagner

#### Snippets (under samples)
# C++ snippets
/samples/snippets/cpp/** @rpetrusha
# C# Snippets:
/samples/snippets/csharp/** @BillWagner
# Visual Basic snippets:
/samples/snippets/visualbasic/** @rpetrusha
202 changes: 0 additions & 202 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,214 +3,12 @@ docs/_build/
*.swp
rebuild.cmd

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
build/
!/docs/core/build/
bld/
[Bb]in/
[Oo]bj/

# Visual Studo 2015 cache/options directory
.vs/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding addin-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
_NCrunch_*
.*crunch*.local.xml

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config

# Windows Azure Build Output
csx/
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
*.[Cc]ache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
bower_components/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

samples/MigratingFromMvc5/NewMvc6Project/src/NewMvc6Project/wwwroot/lib/
samples/AngularSample/src/AngularSample/wwwroot/lib
project.lock.json
samples/WebApplication1/src/WebApplication1/wwwroot/lib/

/samples/core/linq/csharp/aggregate/*.xproj
/samples/core/linq/csharp/aggregate/*.sln

_site/
api_src/
api/
_themes/
_themes.pdf/
Expand Down
19 changes: 10 additions & 9 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ The document covers the process for contributing to the articles and code sample
* [Building the docs](#building-the-docs)
* [Contributor License Agreement](#contributor-license-agreement)

This repository contains the conceptual documentation for .NET. The .NET documentation site is built from multiple repositories in addition to this one:

- [Code samples and snippets](https://github.com/dotnet/samples)
- [API reference](https://github.com/dotnet/dotnet-api-docs)
- [.NET Compiler Platform SDK reference](https://github.com/dotnet/roslyn-api-docs)

Issues and tasks for all these repositories are tracked here.

## Process for contributing

You need a basic understanding of [Git and GitHub.com](https://guides.github.com/activities/hello-world/).
Expand All @@ -28,7 +36,7 @@ You can also choose from existing issues for which community contributions are w

You can also look at our [open issues](https://github.com/dotnet/docs/issues) list and volunteer to work on the ones you're interested in. We use the [up-for-grabs](https://github.com/dotnet/docs/labels/up-for-grabs) label to tag issues open for contribution.

**Step 2:** Fork the `/dotnet/docs` repo and create a branch for your changes.
**Step 2:** Fork the `/dotnet/docs`, `dotnet/samples` or `dotnet/dotnet-api-docs` repos as needed and create a branch for your changes.

For small changes, you can use GitHub's web interface. Simply click the **Edit the file in your fork of this project** on the file you'd like to change.
GitHub creates the new branch for you when you submit the changes.
Expand All @@ -45,8 +53,6 @@ Include larger samples in the *samples* folder under the root of the repo.

Be sure to follow the proper Markdown syntax. For more information, see the [style guide](./styleguide/template.md).

Remove the "wrench" icon (🔧) from the TOC and the file heading, if applicable.

### Example structure

docs
Expand All @@ -57,11 +63,6 @@ Remove the "wrench" icon (🔧) from the TOC and the file heading, if applicable
/media
/porting-overview
portability_report.png
...
samples
/core
/porting
porting_sample.cs

**Step 4:** Submit a Pull Request (PR) from your branch to `dotnet/docs/master`.

Expand All @@ -85,7 +86,7 @@ We make the following distinction for code that exists in our repository:

- snippets: illustrate a smaller concept or task. They compile but they are not intended to be complete applications.

Code all lives in the *samples* directories and is organized as follows:
Code all lives in the [dotnet/samples](https://github.com/dotnet/samples) repository and is organized as follows:

- *core* contains .NET Core samples.

Expand Down
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ This repo contains work-in-progress documentation for .NET. To contribute, see t

We welcome contributions to help us improve and complete the .NET docs. We anticipate that [Xamarin](http://developer.xamarin.com/api/root/classlib/), [Mono](http://docs.go-mono.com/?link=root%3a%2fclasslib) and [Unity](http://docs.unity3d.com/Manual/index.html) will also use this documentation.

This repository contains the conceptual documentation for .NET. The .NET documentation site is built from multiple repositories in addition to this one:

- [Code samples and snippets](https://github.com/dotnet/samples)
- [API reference](https://github.com/dotnet/dotnet-api-docs)
- [.NET Compiler Platform SDK reference](https://github.com/dotnet/roslyn-api-docs)

Issues and tasks for all three of those repositories are tracked here.

This project has adopted the code of conduct defined by the Contributor Covenant
to clarify expected behavior in our community.
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

Samples Build Status
===

| Samples | Ubuntu 16.04<br/>_.NET Core 1.1.0_ | Ubuntu 16.04<br/>_.NET Core 2.0.0_ |
| ------------- |------------| -----|
| `/samples/core` | ![](https://constructors.visualstudio.com/_apis/public/build/definitions/3186585f-1677-4c9e-a8b2-baac48a4032a/56/badge)| ![](https://constructors.visualstudio.com/_apis/public/build/definitions/3186585f-1677-4c9e-a8b2-baac48a4032a/57/badge) |
|`/samples/csharp`| ![](https://constructors.visualstudio.com/_apis/public/build/definitions/3186585f-1677-4c9e-a8b2-baac48a4032a/54/badge)| ![](https://constructors.visualstudio.com/_apis/public/build/definitions/3186585f-1677-4c9e-a8b2-baac48a4032a/55/badge) |
Loading