Skip to content

Commit b0fa0fa

Browse files
authored
Merge branch 'master' into feature/csproj_license
2 parents 19dc1ea + f1cd0ce commit b0fa0fa

File tree

10,883 files changed

+64335
-62198
lines changed

Some content is hidden

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

10,883 files changed

+64335
-62198
lines changed

.ghal.rules.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"(?i)dotnet-fsharp$": ":books: Area - F# Guide",
1111
"(?i)dotnet-ml$": ":books: Area - ML.NET Guide",
1212
"(?i)dotnet$": ":books: Area - .NET Guide",
13-
"(?i)dotnet-ml-api$": ":books: Area - API Reference,:file_folder: Repo - ml-api-docs"
13+
"(?i)dotnet-ml-api$": ":books: Area - API Reference,:file_folder: Repo - ml-api-docs",
14+
"(?i)dotnet-roslyn-api$": ":books: Area - Roslyn API Reference,:file_folder: Repo - roslyn-api-docs",
1415
},
1516
"contentsource": {
1617
"(?i).*master\/docs\/core\/tools.*": ":card_file_box: Technology - CLI",
@@ -21,6 +22,7 @@
2122
"(?i).*master\/docs\/framework\/install.*": ":card_file_box: Technology - Installers",
2223
"(?i).*master\/docs\/framework\/migration-guide.*": ":card_file_box: Technology - AppCompat",
2324
"(?i).*master\/docs\/framework\/network-programming.*": ":card_file_box: Technology - NCL",
25+
"(?i).*master\/docs\/framework\/windows-workflow-foundation.*": ":card_file_box: Technology - WF",
2426
"(?i).*master\/docs\/framework\/wpf.*": ":card_file_box: Technology - WPF",
2527
"(?i).*master\/docs\/framework\/wcf.*": ":card_file_box: Technology - WCF",
2628
"(?i).*master\/docs\/framework\/winforms.*": ":card_file_box: Technology - WinForms",

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
# What's New
5353
/docs/framework/whats-new/** @rpetrusha
5454
# ADO.NET
55-
/docs/framework/data/adonet/** @douglaslMS
55+
/docs/framework/data/adonet/** @stevestein
5656
# NCL
5757
/docs/framework/configure-apps/file-schema/network/** @karelz
5858
/docs/framework/network-programming/** @karelz

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ _dependentPackages/
2828
# Visual Studio Code
2929
.vscode
3030

31+
# Visual Studio 2019
32+
.vs
33+
3134
# Windows thumbnail cache files
3235
Thumbs.db
3336
ehthumbs.db

.openpublishing.redirection.json

Lines changed: 1073 additions & 906 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ You can also choose from existing issues for which community contributions are w
3939

4040
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.
4141

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

4444
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.
4545
GitHub creates the new branch for you when you submit the changes.
@@ -106,7 +106,7 @@ contain a short description of the sample (one or two paragraphs). Your *readme.
106106
should tell readers what they will learn by exploring this sample. The *readme.md* file should also contain
107107
a link to the live document on the [.NET documentation site](https://docs.microsoft.com/dotnet/welcome).
108108
To determine where a given file in the repository maps to that site, replace `/docs` in the repository path
109-
with `http://docs.microsoft.com/dotnet/articles`.
109+
with `https://docs.microsoft.com/dotnet`.
110110

111111
Your topic will also contain links to the sample. Link directly to the sample's folder on GitHub.
112112

@@ -152,7 +152,7 @@ The following list shows some guiding rules that you should keep in mind when yo
152152
153153
## Contributor License Agreement
154154

155-
You must sign the [.NET Foundation Contribution License Agreement (CLA)](https://cla.dotnetfoundation.org) before your PR is merged. This is a one-time requirement for projects in the .NET Foundation. You can read more about [Contribution License Agreements (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) on Wikipedia.
155+
You must sign the [.NET Foundation Contribution License Agreement (CLA)](https://cla.dotnetfoundation.org) before your PR is merged. This is a one-time requirement for projects in the .NET Foundation. You can read more about [Contribution License Agreements (CLA)](https://en.wikipedia.org/wiki/Contributor_License_Agreement) on Wikipedia.
156156

157157
The agreement: [net-foundation-contribution-license-agreement.pdf](https://github.com/dotnet/home/blob/master/guidance/net-foundation-contribution-license-agreement.pdf)
158158

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Issues and tasks for all three of those repositories are tracked here. We have a
1010

1111
We welcome contributions to help us improve and complete the .NET docs. To contribute, see the [Projects for .NET Community Contributors](https://github.com/dotnet/docs/projects/35) for ideas. The [Contributing Guide](CONTRIBUTING.md) has instructions on procedures we use. Or, check the [issues list](https://github.com/dotnet/docs/issues) for tasks that interest you.
1212

13-
We anticipate that [Xamarin](https://docs.microsoft.com/xamarin), [Mono](http://docs.go-mono.com/?link=root%3a%2fclasslib) and [Unity](http://docs.unity3d.com/Manual/index.html) will also use this documentation.
13+
We anticipate that [Xamarin](https://docs.microsoft.com/xamarin), [Mono](http://docs.go-mono.com/?link=root%3a%2fclasslib) and [Unity](https://docs.unity3d.com/Manual/index.html) will also use this documentation.
1414

1515
This project has adopted the code of conduct defined by the Contributor Covenant
1616
to clarify expected behavior in our community.

_zip/missingapi.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### YamlMime:XRefMap
1+
### YamlMime:XRefMap
22
hrefUpdated: true
33
references:
44
- uid: System.Xml.Linq.XElement.Elements*
@@ -300,7 +300,7 @@ references:
300300
name: OvalShape
301301
name.vb: OvalShape
302302
fullName: Microsoft.VisualBasic.PowerPacks.OvalShape
303-
fullName.vb: Microsoft.VisualBasic.PowerPacks.OvalShape
303+
fullName.vb: Microsoft.VisualBasic.PowerPacks.OvalShape
304304
- uid: Microsoft.VisualBasic.PowerPacks.Printing
305305
href: https://msdn.microsoft.com/library/microsoft.visualbasic.powerpacks.printing.aspx
306306
name: Microsoft.VisualBasic.PowerPacks.Printing
@@ -463,6 +463,12 @@ references:
463463
name.vb: TraceLevel
464464
fullName: PresentationTraceSources.TraceLevel
465465
fullName.vb: PresentationTraceSources.TraceLevel
466+
- uid: System.IO.WindowsRuntimeStreamExtensions
467+
href: https://msdn.microsoft.com/library/system.io.windowsruntimestreamextensions.aspx
468+
name: WindowsRuntimeStreamExtensions
469+
name.vb: WindowsRuntimeStreamExtensions
470+
fullName: System.IO.WindowsRuntimeStreamExtensions
471+
fullName.vb: System.IO.WindowsRuntimeStreamExtensions
466472
- uid: System.IO.WindowsRuntimeStreamExtensions.AsInputStream*
467473
href: https://msdn.microsoft.com/library/system.io.windowsruntimestreamextensions.asinputstream.aspx
468474
name: AsInputStream
@@ -516,7 +522,7 @@ references:
516522
name: SetIsVirtualizing
517523
name.vb: SetIsVirtualizing
518524
fullName: VirtualizingStackPanel.SetIsVirtualizing
519-
fullName.vb: VirtualizingStackPanel.SetIsVirtualizing
525+
fullName.vb: VirtualizingStackPanel.SetIsVirtualizing
520526
- uid: System.Windows.Localization.Attributes*
521527
href: https://msdn.microsoft.com/library/system.windows.localization.attributes.aspx
522528
name: Attributes
@@ -546,7 +552,7 @@ references:
546552
name: IsVisualHostMaterial
547553
name.vb: IsVisualHostMaterial
548554
fullName: Viewport2DVisual3D.IsVisualHostMaterial
549-
fullName.vb: TimeViewport2DVisual3Dline.IsVisualHostMaterial
555+
fullName.vb: TimeViewport2DVisual3Dline.IsVisualHostMaterial
550556
- uid: System.Windows.Navigation.BaseUriHelper.BaseUri*
551557
href: https://msdn.microsoft.com/library/system.windows.navigation.baseurihelper.baseuri.aspx
552558
name: BaseUri
@@ -571,6 +577,12 @@ references:
571577
name.vb: VisualStateGroups
572578
fullName: VisualStateManager.VisualStateGroups
573579
fullName.vb: VisualStateManager.VisualStateGroups
580+
- uid: System.WindowsRuntimeSystemExtensions
581+
href: https://msdn.microsoft.com/library/system.windowsruntimesystemextensions.aspx
582+
name: WindowsRuntimeSystemExtensions
583+
name.vb: WindowsRuntimeSystemExtensions
584+
fullName: System.WindowsRuntimeSystemExtensions
585+
fullName.vb: System.WindowsRuntimeSystemExtensions
574586
- uid: Microsoft.Office.Interop.Excel.Range
575587
href: https://msdn.microsoft.com/library/microsoft.office.interop.excel.range.aspx
576588
name: Range
@@ -600,4 +612,4 @@ references:
600612
name: XlRangeAutoFormat
601613
name.vb: XlRangeAutoFormat
602614
fullName: Microsoft.Office.Interop.Excel.XlRangeAutoFormat
603-
fullName.vb: Microsoft.Office.Interop.Excel.XlRangeAutoFormat
615+
fullName.vb: Microsoft.Office.Interop.Excel.XlRangeAutoFormat

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ install:
1616
build_script:
1717
# dotnet info
1818
- ps: dotnet --info
19-
# Run dotnet new
19+
# Run dotnet new
2020
- ps: mkdir "test\test-dotnet-new" -Force | Push-Location
2121
- ps: dotnet new console -lang f#
2222
- ps: dotnet restore
@@ -25,5 +25,5 @@ build_script:
2525
- ps: Pop-Location
2626

2727

28-
test: off
28+
test: off
2929
version: 0.0.1.{build}

docfx.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@
104104
},
105105
"fileMetadata": {
106106
"feedback_system": {
107-
"docs/standard/design-guidelines/**/**.md": "None"
107+
"docs/standard/design-guidelines/**/**.md": "None",
108+
"docs/framework/data/adonet/**/**.md": "None"
108109
},
109110
"feedback_product_url": {
110111
"docs/fsharp/**/**.md": "https://github.com/Microsoft/visualfsharp"
@@ -144,7 +145,7 @@
144145
"docs/csharp/**/**.yml": "billwagner",
145146
"docs/framework/configure-apps/file-schema/network/**/**.md": "karelz",
146147
"docs/framework/configure-apps/file-schema/wcf/**/**.md": "Lxiamail",
147-
"docs/framework/data/adonet/**/**.md": "douglaslMS",
148+
"docs/framework/data/adonet/**/**.md": "stevestein",
148149
"docs/framework/data/wcf/**/**.md": "Lxiamail",
149150
"docs/framework/network-programming/**/**.md": "karelz",
150151
"docs/framework/wcf/**/**.md": "Lxiamail",
@@ -161,7 +162,7 @@
161162
"docs/csharp/**/**.yml": "wiwagn",
162163
"docs/framework/configure-apps/file-schema/network/**/**.md": "ncldev",
163164
"docs/framework/configure-apps/file-schema/wcf/**/**.md": "wcfsrvt",
164-
"docs/framework/data/adonet/**/**.md": "douglasl",
165+
"docs/framework/data/adonet/**/**.md": "sstein",
165166
"docs/framework/data/wcf/**/**.md": "wcfsrvt",
166167
"docs/framework/network-programming/**/**.md": "ncldev",
167168
"docs/framework/wcf/**/**.md": "wcfsrvt",

docs/core/about.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ It is perhaps easiest to understand the size and shape of .NET Core by comparing
8989

9090
The major differences between .NET Core and the .NET Framework:
9191

92-
- **App-models** -- .NET Core does not support all the .NET Framework app-models. In particular, it doesn't support ASP.NET Web Forms and MVC. It was announced that [.NET Core 3 will support WPF and Windows Forms](https://blogs.msdn.microsoft.com/dotnet/2018/05/07/net-core-3-and-support-for-windows-desktop-applications/).
92+
- **App-models** -- .NET Core does not support all the .NET Framework app-models. In particular, it doesn't support ASP.NET Web Forms and ASP.NET MVC, but it supports ASP.NET Core MVC. It was announced that [.NET Core 3 will support WPF and Windows Forms](https://blogs.msdn.microsoft.com/dotnet/2018/05/07/net-core-3-and-support-for-windows-desktop-applications/).
9393
- **APIs** -- .NET Core contains a large subset of .NET Framework Base Class Library, with a different factoring (assembly names are different; members exposed on types differ in key cases). These differences require changes to port source to .NET Core in some cases (see [microsoft/dotnet-apiport](https://github.com/microsoft/dotnet-apiport)). .NET Core implements the [.NET Standard](../standard/net-standard.md) API specification.
9494
- **Subsystems** -- .NET Core implements a subset of the subsystems in the .NET Framework, with the goal of a simpler implementation and programming model. For example, Code Access Security (CAS) is not supported, while reflection is supported.
9595
- **Platforms** -- The .NET Framework supports Windows and Windows Server while .NET Core also supports macOS and Linux.

docs/core/additional-tools/dotnet-svcutil-guide.md

Lines changed: 71 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: WCF svcutil tool overview
33
description: An overview of the Microsoft WCF dotnet-svcutil tool that adds functionality for .NET Core and ASP.NET Core projects, similar to the WCF svcutil tool for .NET Framework projects.
44
author: mlacouture
5-
ms.date: 08/20/2018
5+
ms.date: 02/22/2019
66
ms.custom: "seodec18"
77
---
88
# WCF dotnet-svcutil tool for .NET Core
@@ -18,12 +18,19 @@ The **dotnet-svcutil** tool is an alternative option to the [**WCF Web Service R
1818
1919
## Prerequisites
2020

21-
* [.NET Core SDK](https://dotnet.microsoft.com/download) v1.0.4 or later versions
21+
# [dotnet-svcutil 2.x](#tab/dotnetsvcutil2x)
22+
* [.NET Core 2.1 SDK](https://dotnet.microsoft.com/download) or later versions
2223
* Your favorite code editor
2324

25+
# [dotnet-svcutil 1.x](#tab/dotnetsvcutil1x)
26+
* [.NET Core 1.0.4 SDK](https://dotnet.microsoft.com/download) or later versions
27+
* Your favorite code editor
28+
29+
---
30+
2431
## Getting started
2532

26-
The following example walks you through the steps required to add a web service reference to a .NET Core console project and invoke the service. You will create a .NET Core console application named _HelloSvcutil_ and will add a reference to a web service that implements the following contract:
33+
The following example walks you through the steps required to add a web service reference to a .NET Core web project and invoke the service. You'll create a .NET Core web application named _HelloSvcutil_ and add a reference to a web service that implements the following contract:
2734

2835
```csharp
2936
[ServiceContract]
@@ -34,7 +41,7 @@ public interface ISayHello
3441
}
3542
```
3643

37-
For this example, the web service will be assumed to be hosted at the following address: `http://contoso.com/SayHello.svc`
44+
For this example, let's assume the web service will be hosted at the following address: `http://contoso.com/SayHello.svc`
3845

3946
From a Windows, macOS, or Linux command window perform the following steps:
4047

@@ -45,73 +52,116 @@ mkdir HelloSvcutil
4552
cd HelloSvcutil
4653
```
4754

48-
2. Create a new C# console project in that directory using the [`dotnet new`](../tools/dotnet-new.md) command as follows:
55+
2. Create a new C# web project in that directory using the [`dotnet new`](../tools/dotnet-new.md) command as follows:
56+
57+
```console
58+
dotnet new web
59+
```
4960

61+
3. Install the [`dotnet-svcutil` NuGet package](https://nuget.org/packages/dotnet-svcutil) as a CLI tool:
62+
# [dotnet-svcutil 2.x](#tab/dotnetsvcutil2x)
5063
```console
51-
dotnet new console
64+
dotnet tool install --global dotnet-svcutil
5265
```
5366

54-
3. Open the `HelloSvcutil.csproj` project file in your editor, edit the `Project` element, and add the [`dotnet-svcutil` NuGet package](https://nuget.org/packages/dotnet-svcutil) as a CLI tool reference, using the following code:
67+
# [dotnet-svcutil 1.x](#tab/dotnetsvcutil1x)
68+
Open the `HelloSvcutil.csproj` project file in your editor, edit the `Project` element, and add the [`dotnet-svcutil` NuGet package](https://nuget.org/packages/dotnet-svcutil) as a CLI tool reference, using the following code:
5569

5670
```xml
5771
<ItemGroup>
5872
<DotNetCliToolReference Include="dotnet-svcutil" Version="1.0.*" />
5973
</ItemGroup>
6074
```
6175

62-
4. Restore the _dotnet-svcutil_ package using the [`dotnet restore`](../tools/dotnet-restore.md) command as follows:
76+
Then restore the _dotnet-svcutil_ package using the [`dotnet restore`](../tools/dotnet-restore.md) command as follows:
6377

6478
```console
6579
dotnet restore
6680
```
6781

68-
5. Run _dotnet_ with the _svcutil_ command to generate the web service reference file as follows:
82+
---
83+
84+
4. Run the _dotnet-svcutil_ command to generate the web service reference file as follows:
85+
# [dotnet-svcutil 2.x](#tab/dotnetsvcutil2x)
86+
```console
87+
dotnet-svcutil http://contoso.com/SayHello.svc
88+
```
6989

90+
# [dotnet-svcutil 1.x](#tab/dotnetsvcutil1x)
7091
```console
7192
dotnet svcutil http://contoso.com/SayHello.svc
7293
```
73-
The generated file is saved as _HelloSvcutil/ServiceReference1/Reference.cs_. The _dotnet_svcutil_ tool also adds to the project the appropriate WCF packages required by the proxy code as package references.
94+
---
95+
96+
The generated file is saved as _HelloSvcutil/ServiceReference/Reference.cs_. The _dotnet-svcutil_ tool also adds to the project the appropriate WCF packages required by the proxy code as package references.
7497

75-
6. Restore the WCF packages using the [`dotnet restore`](../tools/dotnet-restore.md) command as follows:
98+
## Using the Service Reference
99+
100+
1. Restore the WCF packages using the [`dotnet restore`](../tools/dotnet-restore.md) command as follows:
76101

77102
```console
78103
dotnet restore
79104
```
80105

81-
7. Open the `Program.cs` file in your editor, edit the `Main()` method, and replace the auto-generated code with the following code to invoke the web service:
106+
2. Find the name of the client class and operation you want to use. `Reference.cs` will contain a class that inherits from `System.ServiceModel.ClientBase`, with methods that can be used to call operations on the service. In this example, you want to call the _SayHello_ service's _Hello_ operation. `ServiceReference.SayHelloClient` is the name of the client class, and has a method called `HelloAsync` that can be used to call the operation.
107+
108+
3. Open the `Startup.cs` file in your editor, and add a using statement for the service reference namespace at the top:
82109

83110
```csharp
84-
static void Main(string[] args)
111+
using ServiceReference;
112+
```
113+
114+
4. Edit the `Configure` method to invoke the web service. You do this by creating an instance of the class that inherits from `ClientBase` and calling the method on the client object:
115+
116+
```csharp
117+
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
85118
{
86-
var client = new SayHelloClient();
87-
Console.WriteLine(client.HelloAsync("dotnet-svcutil").Result);
119+
if (env.IsDevelopment())
120+
{
121+
app.UseDeveloperExceptionPage();
122+
}
123+
124+
app.Run(async (context) =>
125+
{
126+
var client = new SayHelloClient();
127+
var response = await client.HelloAsync();
128+
await context.Response.WriteAsync(response);
129+
});
88130
}
131+
89132
```
90133

91-
8. Run the application using the [`dotnet run`](../tools/dotnet-run.md) command as follows:
134+
5. Run the application using the [`dotnet run`](../tools/dotnet-run.md) command as follows:
92135

93136
```console
94137
dotnet run
95138
```
139+
140+
6. Navigate to the URL listed in the console (for example, `http://localhost:5000`) in your web browser.
141+
96142
You should see the following output:
97143
"Hello dotnet-svcutil!"
98144

99145
For a detailed description of the `dotnet-svcutil` tool parameters, invoke the tool passing the help parameter as follows:
146+
# [dotnet-svcutil 2.x](#tab/dotnetsvcutil2x)
147+
```console
148+
dotnet-svcutil --help
149+
```
100150

151+
# [dotnet-svcutil 1.x](#tab/dotnetsvcutil1x)
101152
```console
102153
dotnet svcutil --help
103154
```
155+
---
104156

105-
## Next steps
106-
107-
### Feedback & questions
157+
## Feedback & questions
108158

109159
If you have any questions or feedback, [open an issue on GitHub](https://github.com/dotnet/wcf/issues/new). You can also review any existing questions or issues [at the WCF repo on GitHub](https://github.com/dotnet/wcf/issues?utf8=%E2%9C%93&q=is:issue%20label:tooling).
110160

111-
### Release notes
161+
## Release notes
112162

113163
* Refer to the [Release notes](https://github.com/dotnet/wcf/blob/master/release-notes/dotnet-svcutil-notes.md) for updated release information, including known issues.
114164

115-
### Information
165+
## Information
116166

117167
* [dotnet-svcutil NuGet Package](https://nuget.org/packages/dotnet-svcutil)

docs/core/build/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,6 @@ Use the `dotnet` executable from *artifacts/{os}-{arch}/stage2* to try out the n
9696

9797
## See also
9898

99-
* [.NET Core Common Language Runtime (CoreCLR)](https://github.com/dotnet/coreclr/blob/master/README.md)
100-
* [.NET Core CLI Developer Guide](https://github.com/dotnet/cli/blob/master/Documentation/project-docs/developer-guide.md)
101-
* [.NET Core distribution packaging](./distribution-packaging.md)
99+
- [.NET Core Common Language Runtime (CoreCLR)](https://github.com/dotnet/coreclr/blob/master/README.md)
100+
- [.NET Core CLI Developer Guide](https://github.com/dotnet/cli/blob/master/Documentation/project-docs/developer-guide.md)
101+
- [.NET Core distribution packaging](./distribution-packaging.md)

0 commit comments

Comments
 (0)