Skip to content

Commit 0864c20

Browse files
cxwtoolcxwtool
committed
Merge branch 'master' into publish-2290
2 parents 46b6829 + e7251d9 commit 0864c20

File tree

37,879 files changed

+2989861
-74
lines changed

Some content is hidden

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

37,879 files changed

+2989861
-74
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ samples/WebApplication1/src/WebApplication1/wwwroot/lib/
211211

212212
_site/
213213
api_src/
214-
api/
214+
/api/
215215
_themes/
216216
_themes.pdf/
217217
_csharplang/

‎.openpublishing.publish.config.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,6 @@
6161
"url": "https://github.com/Microsoft/templates.docs.msft",
6262
"branch": "master",
6363
"branch_mapping": {}
64-
},
65-
{
66-
"path_to_root": "samples",
67-
"url": "https://github.com/dotnet/samples",
68-
"branch": "master",
69-
"branch_mapping": {
70-
"live": "live"
71-
}
7264
}
7365
],
7466
"branch_target_mapping": {

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
This repo contains documentation for the .NET API Reference.
44

55
The main repository for .NET documentation is the [.NET Docs repository](https://github.com/dotnet/docs). See the [Contributing Guide](https://github.com/dotnet/docs/blob/master/CONTRIBUTING.md) for information on updating .NET API reference documentation.
6-
We are tracking all work for this repository using [GitHub issues](https://github.com/dotnet/dotnet-api-docs/issues). The documentation for APIs is built from the text in this repo, and the samples in the [dotnet/samples](https://github.com/dotnet/samples) repository. You can select the [Repo - samples](https://github.com/dotnet/docs/issues?q=is%3Aopen+is%3Aissue+label%3A%22%3Afile_folder%3A+Repo+-+samples%22) label to see issues that concern sample code.
6+
We're tracking all work for this repository using [GitHub issues](https://github.com/dotnet/dotnet-api-docs/issues). The documentation for APIs is built from the text in this repo, and the samples in the [dotnet/samples](https://github.com/dotnet/samples) repository. You can select the [Repo - samples](https://github.com/dotnet/docs/issues?q=is%3Aopen+is%3Aissue+label%3A%22%3Afile_folder%3A+Repo+-+samples%22) label to see issues that concern sample code.
77

88
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/snippets/common/VS_Snippets_Atlas/System.Web.UI.ScriptManager.RegisterClientScriptBlock/Common/App_Data/Contacts.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<!-- <Snippet2>-->
3+
<Contacts>
4+
<Contact id="1"
5+
Name="Aaber, Jesper"
6+
Company="A. Data Corporation"
7+
URL="http://www.adatum.com/"/>
8+
<Contact id="2"
9+
Name="Canel, Fabrice"
10+
Company="Coho Winery"
11+
URL="http://www.cohowinery.com/"/>
12+
<Contact id="3"
13+
Name="Heloo, Waleed"
14+
Company="Contoso, Ltd"
15+
URL="http://www.contoso.com/"/>
16+
<Contact id="4"
17+
Name="Rovik, Dag"
18+
Company="Wingtip Toys"
19+
URL="http://www.wingtiptoys.com/"/>
20+
</Contacts>
21+
<!-- </Snippet2>-->

‎samples/snippets/common/VS_Snippets_CFX/custompolicysample/common/tempuri.org.wsdl

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- <snippet16>-->
3+
<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
4+
5+
namespaces removed here for clarity...
6+
7+
>
8+
<wsp:Policy wsu:Id="CustomBinding_IStatefulService_policy">
9+
<wsp:ExactlyOne>
10+
<wsp:All>
11+
<acme
12+
b:MyCustomAttribute="ExampleValue"
13+
xmlns="http://Microsoft/WCF/Documentation/CustomPolicyAssertions" xmlns:b="http://Microsoft/WCF/Documentation/CustomPolicyAssertions">
14+
My custom text.
15+
<MyCustomSubElement>Custom Subelement Text.</MyCustomSubElement>
16+
</acme>
17+
<wsrm:RMAssertion xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy">
18+
<wsrm:InactivityTimeout Milliseconds="600000" />
19+
<wsrm:AcknowledgementInterval Milliseconds="200" />
20+
</wsrm:RMAssertion>
21+
<wsaw:UsingAddressing />
22+
</wsp:All>
23+
</wsp:ExactlyOne>
24+
</wsp:Policy>
25+
<wsdl:import namespace="http://microsoft.wcf.documentation" location="" />
26+
<!-- </snippet16>-->
27+
<wsdl:types />
28+
<wsdl:binding name="CustomBinding_IStatefulService" type="i0:IStatefulService">
29+
<wsp:PolicyReference URI="#CustomBinding_IStatefulService_policy" />
30+
<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
31+
<wsdl:operation name="GetSessionID">
32+
<soap12:operation soapAction="http://microsoft.wcf.documentation/IStatefulService/GetSessionID" style="document" />
33+
<wsdl:input>
34+
<soap12:body use="literal" />
35+
</wsdl:input>
36+
<wsdl:output>
37+
<soap12:body use="literal" />
38+
</wsdl:output>
39+
</wsdl:operation>
40+
</wsdl:binding>
41+
<wsdl:service name="StatefulService">
42+
<wsdl:port name="CustomBinding_IStatefulService" binding="tns:CustomBinding_IStatefulService">
43+
<soap12:address location="http://localhost:8080/StatefulService" />
44+
<wsa10:EndpointReference>
45+
<wsa10:Address>http://localhost:8080/StatefulService</wsa10:Address>
46+
</wsa10:EndpointReference>
47+
</wsdl:port>
48+
</wsdl:service>
49+
</wsdl:definitions>

‎samples/snippets/common/VS_Snippets_CFX/syndicationcontent/common/atom.xml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<feed xml:lang="en-us" CustomAttribute="Value" xmlns="http://www.w3.org/2005/Atom">
3+
<title type="text">Feed Title</title>
4+
<subtitle type="text">This is a sample feed</subtitle>
5+
<id>FeedID</id>
6+
<rights type="text">Copyright 2007</rights>
7+
<updated>2007-04-13T17:29:38Z</updated>
8+
<category term="FeedCategory" label="CategoryLabel" scheme="CategoryScheme" />
9+
<logo>http://server/image.jpg</logo>
10+
<author>
11+
<name>Jesper Aaberg</name>
12+
<uri>http://Jesper/Aaberg</uri>
13+
<email>[email protected]</email>
14+
</author>
15+
<contributor>
16+
<name>Lene Aalling</name>
17+
<uri>http://Lene/Aaling</uri>
18+
<email>[email protected]</email>
19+
</contributor>
20+
<author customAttribute="value">
21+
<name>Syed Abas</name>
22+
<uri>http://Syed/Abas</uri>
23+
<email>[email protected]</email>
24+
</author>
25+
<author>
26+
<name>Kim Abercrombie</name>
27+
<uri>http://Kim/Abercrombie</uri>
28+
<email>[email protected]</email>
29+
<customPersonElement xmlns="">person element text</customPersonElement>
30+
</author>
31+
<generator>Sample Code</generator>
32+
<link rel="alternate" type="text/html" title="Link Title" length="1000" href="http://server/link" />
33+
<link customAttribute="value" rel="alternate" type="text/html" title="Link Title" length="1000" href="http://server/link" />
34+
<CustomElement xmlns="">Some text</CustomElement>
35+
<entry>
36+
<id>ItemID</id>
37+
<title type="text">Item Title</title>
38+
<updated>2007-04-13T17:29:38Z</updated>
39+
<link rel="alternate" href="http://server/items" />
40+
<content type="text">Some text content</content>
41+
</entry>
42+
</feed>
43+

‎samples/snippets/common/VS_Snippets_CFX/syndicationcontent/common/rss.xml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<rss xmlns:a10="http://www.w3.org/2005/Atom" version="2.0">
3+
<channel CustomAttribute="Value">
4+
<title>Feed Title</title>
5+
<link>http://feed/Alternate/Link</link>
6+
<description>This is a sample feed</description>
7+
<language>en-us</language>
8+
<copyright>Copyright 2007</copyright>
9+
<managingEditor>[email protected]</managingEditor>
10+
<lastBuildDate>Fri, 13 Apr 2007 17:29:38 Z</lastBuildDate>
11+
<category domain="CategoryScheme">FeedCategory</category>
12+
<a10:link rel="alternate" type="text/html" title="Link Title" length="1000" href="http://server/link" />
13+
<generator>Sample Code</generator>
14+
<!-- <Snippet1>-->
15+
<a10:author>
16+
<a10:name>Lene Aalling</a10:name>
17+
<a10:uri>http://Lene/Aalling</a10:uri>
18+
<a10:email>[email protected]</a10:email>
19+
</a10:author>
20+
<a10:contributor>
21+
<a10:name>Jesper Aaberg</a10:name>
22+
<a10:uri>http://Jesper/Aaberg</a10:uri>
23+
<a10:email>[email protected]</a10:email>
24+
</a10:contributor>
25+
<!-- </Snippet1> -->
26+
27+
<!-- <Snippet5> -->
28+
<a10:author customAttribute="value">
29+
<a10:name>Syed Abas</a10:name>
30+
<a10:uri>http://Syed/Abas</a10:uri>
31+
<a10:email>[email protected]</a10:email>
32+
</a10:author>
33+
<!-- </Snippet5> -->
34+
35+
<!-- <Snippet7> -->
36+
<a10:author>
37+
<a10:name>Kim Abercrombie</a10:name>
38+
<a10:uri>http://Kim/Abercrombie</a10:uri>
39+
<a10:email>[email protected]</a10:email>
40+
<customPersonElement>person element text</customPersonElement>
41+
</a10:author>
42+
<!-- </Snippet7> -->
43+
44+
<image>
45+
<url>http://server/image.jpg</url>
46+
<title>Feed Title</title>
47+
<link>http://feed/Alternate/Link</link>
48+
</image>
49+
<a10:id>FeedID</a10:id>
50+
<a10:link customAttribute="value" rel="alternate" type="text/html" title="Link Title" length="1000" href="http://server/link" />
51+
<CustomElement>Some text</CustomElement>
52+
<item>
53+
<guid isPermaLink="false">ItemID</guid>
54+
<link>http://server/items</link>
55+
<title>Item Title</title>
56+
<description>Some text content</description>
57+
<a10:updated>2007-04-13T17:29:38Z</a10:updated>
58+
</item>
59+
</channel>
60+
</rss>
61+

‎samples/snippets/common/VS_Snippets_CFX/syndicationfeed/common/atom.xml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- <Snippet1>-->
3+
<!-- <Snippet14>-->
4+
<feed xml:lang="en-us" CustomAttribute="Value" xmlns="http://www.w3.org/2005/Atom">
5+
<!-- </Snippet14>-->
6+
<!-- <Snippet39> -->
7+
<title type="text">Feed Title</title>
8+
<!-- </Snippet39> -->
9+
<!-- <Snippet24> -->
10+
<subtitle type="text">This is a sample feed</subtitle>
11+
<!-- </Snippet24> -->
12+
<!-- <Snippet27> -->
13+
<id>FeedID</id>
14+
<!-- </Snippet27> -->
15+
16+
<!-- <Snippet22> -->
17+
<rights type="text">Copyright 2007</rights>
18+
<!-- </Snippet22> -->
19+
<!-- <Snippet34> -->
20+
<updated>2007-04-13T17:29:38Z</updated>
21+
<!-- </Snippet34> -->
22+
<!-- <Snippet18>-->
23+
<category term="FeedCategory" label="CategoryLabel" scheme="CategoryScheme" />
24+
<!-- </Snippet18>-->
25+
<!-- <Snippet29>-->
26+
<logo>http://contoso/image.jpg</logo>
27+
<!-- </Snippet29>-->
28+
<!-- <Snippet16>-->
29+
<author>
30+
<name>Jesper Aaberg</name>
31+
<uri>http://contoso/Aaberg</uri>
32+
<email>[email protected]</email>
33+
</author>
34+
<!-- </Snippet16>-->
35+
<!-- <Snippet20>-->
36+
<contributor>
37+
<name>Lene Aalling</name>
38+
<uri>http://contoso/Aalling</uri>
39+
<email>[email protected]</email>
40+
</contributor>
41+
<!-- </Snippet20>-->
42+
<!-- <Snippet26> -->
43+
<generator>Sample Code</generator>
44+
<!-- </Snippet26> -->
45+
<!-- <Snippet36> -->
46+
<link rel="alternate" type="text/html" title="Link Title" length="1000" href="http://contoso/link" />
47+
<!-- </Snippet36> -->
48+
49+
<link customAttribute="value" rel="alternate" type="text/html" title="Link Title" length="1000" href="http://contoso/link" />
50+
<CustomElement xmlns="">Some text</CustomElement>
51+
<!-- <Snippet31> -->
52+
<entry>
53+
<id>ItemID</id>
54+
<title type="text">Item Title</title>
55+
<updated>2007-04-13T17:29:38Z</updated>
56+
<link rel="alternate" href="http://contoso/items" />
57+
<content type="text">Some text content</content>
58+
</entry>
59+
<!-- </Snippet31> -->
60+
61+
</feed>
62+
<!-- </Snippet1>-->
63+

‎samples/snippets/common/VS_Snippets_CFX/syndicationfeed/common/rss.xml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- <Snippet2> -->
3+
<rss xmlns:a10="http://www.w3.org/2005/Atom" version="2.0">
4+
<!-- <Snippet15>-->
5+
<channel CustomAttribute="Value">
6+
<!-- </Snippet15>-->
7+
<!-- <Snippet38> -->
8+
<title>Feed Title</title>
9+
<!-- </Snippet38> -->
10+
<link>http://feed/Alternate/Link</link>
11+
<!-- <Snippet25> -->
12+
<description>This is a sample feed</description>
13+
<!-- </Snippet25> -->
14+
<!-- <Snippet33> -->
15+
<language>en-us</language>
16+
<!-- </Snippet33> -->
17+
18+
<!-- <Snippet23> -->
19+
<copyright>Copyright 2007</copyright>
20+
<!-- </Snippet23> -->
21+
22+
<managingEditor>[email protected]</managingEditor>
23+
<lastBuildDate>Fri, 13 Apr 2007 17:29:38 Z</lastBuildDate>
24+
<!--<Snippet19>-->
25+
<category domain="CategoryScheme">FeedCategory</category>
26+
<!--</Snippet19>-->
27+
<!-- <Snippet37> -->
28+
<a10:link rel="alternate" type="text/html" title="Link Title" length="1000" href="http://contoso/link" />
29+
<!-- </Snippet37> -->
30+
<generator>Sample Code</generator>
31+
32+
<!-- <Snippet21> -->
33+
<a10:contributor>
34+
<a10:name>Lene Aalling</a10:name>
35+
<a10:uri>http://contoso/Aalling</a10:uri>
36+
<a10:email>[email protected]</a10:email>
37+
</a10:contributor>
38+
<!-- </Snippet21> -->
39+
40+
<!-- <Snippet17>-->
41+
<a10:author>
42+
<a10:name>Lene Aalling</a10:name>
43+
<a10:uri>http://contoso/Aalling</a10:uri>
44+
<a10:email>[email protected]</a10:email>
45+
</a10:author>
46+
<!-- </Snippet17>-->
47+
<!-- <Snippet30> -->
48+
<image>
49+
<url>http://contoso/image.jpg</url>
50+
<title>Feed Title</title>
51+
<link>http://feed/Alternate/Link</link>
52+
</image>
53+
<!-- </Snippet30> -->
54+
<!-- <Snippet28>-->
55+
<a10:id>FeedID</a10:id>
56+
<!-- </Snippet28>-->
57+
<a10:link customAttribute="value" rel="alternate" type="text/html" title="Link Title" length="1000" href="http://contoso/link" />
58+
59+
<CustomElement>Some text</CustomElement>
60+
<!-- <Snippet32> -->
61+
<!-- <Snippet35> -->
62+
<item>
63+
<guid isPermaLink="false">ItemID</guid>
64+
<link>http://contoso/items</link>
65+
<title>Item Title</title>
66+
<description>Some text content</description>
67+
<a10:updated>2007-04-13T17:29:38Z</a10:updated>
68+
</item>
69+
<!-- </Snippet35> -->
70+
<!-- </Snippet32> -->
71+
</channel>
72+
</rss>
73+
<!-- </Snippet2> -->
74+

0 commit comments

Comments
 (0)