Skip to content

Commit 32a575b

Browse files
mairawmairaw
authored
Update live with current master (#16095)
* updating links from fwlink to real link if exists (#15945) * updating links from fwlink to real link if exists * Apply suggestions from code review Co-Authored-By: Maira Wenzel <mairaw@microsoft.com> * undoing linking change * Update docs/framework/whats-new/obsolete-types.md Co-Authored-By: Maira Wenzel <mairaw@microsoft.com> * updating aspnet links * Apply suggestions from code review Co-Authored-By: Maira Wenzel <mairaw@microsoft.com> * [DocsArchive-1.0.19259.5](2019-09-22-20-26-07)Auto archive content (#14590) * [DocsArchive-1.0.19259.5](2019-09-22-20-26-07)Auto archive content * additional changes * Updates for the new dotnet/runtime repo (#15983) * Update system-text-json-overview.md * Update system-text-json-overview.md * Update system-text-json-overview.md * Update about.md * Update instructions for RHEL (#16050) * Update instructions for RHEL * Apply suggestions from code review Co-Authored-By: Maira Wenzel <mairaw@microsoft.com> * Update date * Fixes #11069 (#16058) * Fix typo in timespan format (#16071) * Replace Windows 7/8 tokens (#16074) * Replace Windows 7 tokens * Remove win7-md.md * Replace Windows 8 tokens * Remove win8-md.md * Replace Windows 8.1 tokens * Remove win81-md.md * add later versions (#16076) * add later versions * Apply suggestions from docs review Co-Authored-By: Genevieve Warren <gewarren@microsoft.com> * remove version from link text (#16077) * Spark: spark streaming article (#15842) * spark streaming article * make spark streaming a tutorial * Update docs/spark/tutorials/streaming.md Co-Authored-By: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> * update link * Update docs/spark/tutorials/streaming.md Co-Authored-By: Bill Wagner <wiwagn@microsoft.com> * update xrefs * fix xref * Update unit-testing-with-dotnet-test.md (#15954) * Update unit-testing-with-dotnet-test.md * Update unit-testing-with-dotnet-test.md * Update unit-testing-with-dotnet-test.md * Update unit-testing-with-dotnet-test.md * Apply suggestions from code review Co-Authored-By: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> * Apply suggestions from code review Co-Authored-By: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> * Update unit-testing-with-dotnet-test.md * Update unit-testing-with-dotnet-test.md * Update docs/core/testing/unit-testing-with-dotnet-test.md Co-Authored-By: Andy De George <2672110+Thraka@users.noreply.github.com> * Run-time config knobs (#16019) * add settings to toc * add config files for various settings * add working with calendars changes * updating links from fwlink to real link if exists (#16065) * updating links from fwlink to real link if exists - contributes to #3391 * Apply suggestions from code review Co-Authored-By: Maira Wenzel <mairaw@microsoft.com> * undoing samples fwlink * Update docs/framework/windows-workflow-foundation/how-to-host-multiple-versions-of-a-workflow-side-by-side.md Co-Authored-By: Maira Wenzel <mairaw@microsoft.com> * add a later version (#16080) * add a later version * more updates * Update docs/framework/debug-trace-profile/pinvokestackimbalance-mda.md Co-Authored-By: Genevieve Warren <gewarren@microsoft.com> * fix backtick escaping (#16056) * separate OS info (#16063) * Typo, add missing "s" (#16093)
1 parent 5fb5b65 commit 32a575b

File tree

173 files changed

+1175
-3869
lines changed

Some content is hidden

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

173 files changed

+1175
-3869
lines changed

‎.github/CODEOWNERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@
8484
/docs/framework/reflection-and-codedom/** @Thraka
8585
# Resources
8686
/docs/framework/resources/** @Thraka
87-
# Security
88-
/docs/framework/security/** @mairaw
8987
# Tools
9088
/docs/framework/tools/** @tdykstra
9189
# UI Automation

‎.openpublishing.redirection.json

Lines changed: 210 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1892,10 +1892,220 @@
18921892
"source_path": "docs/framework/network-programming/httplistener.md",
18931893
"redirect_url": "/dotnet/api/system.net.httplistener"
18941894
},
1895+
{
1896+
"source_path": "docs/framework/security/building-my-first-claims-aware-aspnet-web-app.md",
1897+
"redirect_url": "/previous-versions/dotnet/framework/security/building-my-first-claims-aware-aspnet-web-app",
1898+
"redirect_document_id": true
1899+
},
1900+
{
1901+
"source_path": "docs/framework/security/building-my-first-claims-aware-wcf-service.md",
1902+
"redirect_url": "/previous-versions/dotnet/framework/security/building-my-first-claims-aware-wcf-service",
1903+
"redirect_document_id": true
1904+
},
1905+
{
1906+
"source_path": "docs/framework/security/claims-aware-aspnet-app-forms-authentication.md",
1907+
"redirect_url": "/previous-versions/dotnet/framework/security/claims-aware-aspnet-app-forms-authentication",
1908+
"redirect_document_id": true
1909+
},
1910+
{
1911+
"source_path": "docs/framework/security/claims-based-authorization-using-wif.md",
1912+
"redirect_url": "/previous-versions/dotnet/framework/security/claims-based-authorization-using-wif",
1913+
"redirect_document_id": true
1914+
},
1915+
{
1916+
"source_path": "docs/framework/security/claims-based-identity-model.md",
1917+
"redirect_url": "/previous-versions/dotnet/framework/security/claims-based-identity-model",
1918+
"redirect_document_id": true
1919+
},
1920+
{
1921+
"source_path": "docs/framework/security/custom-token-handlers.md",
1922+
"redirect_url": "/previous-versions/dotnet/framework/security/custom-token-handlers",
1923+
"redirect_document_id": true
1924+
},
1925+
{
1926+
"source_path": "docs/framework/security/downloading-the-json-web-token-handler-package.md",
1927+
"redirect_url": "/previous-versions/dotnet/framework/security/downloading-the-json-web-token-handler-package",
1928+
"redirect_document_id": true
1929+
},
1930+
{
1931+
"source_path": "docs/framework/security/downloading-the-validating-issuer-name-registry-package.md",
1932+
"redirect_url": "/previous-versions/dotnet/framework/security/downloading-the-validating-issuer-name-registry-package",
1933+
"redirect_document_id": true
1934+
},
1935+
{
1936+
"source_path": "docs/framework/security/getting-started-with-wif.md",
1937+
"redirect_url": "/previous-versions/dotnet/framework/security/getting-started-with-wif",
1938+
"redirect_document_id": true
1939+
},
1940+
{
1941+
"source_path": "docs/framework/security/guidelines-for-migrating-an-application-built-using-wif-3-5-to-wif-4-5.md",
1942+
"redirect_url": "/previous-versions/dotnet/framework/security/guidelines-for-migrating-an-application-built-using-wif-3-5-to-wif-4-5",
1943+
"redirect_document_id": true
1944+
},
1945+
{
1946+
"source_path": "docs/framework/security/how-to-build-claims-aware-aspnet-app-using-windows-authentication.md",
1947+
"redirect_url": "/previous-versions/dotnet/framework/security/how-to-build-claims-aware-aspnet-app-using-windows-authentication",
1948+
"redirect_document_id": true
1949+
},
1950+
{
1951+
"source_path": "docs/framework/security/how-to-build-claims-aware-aspnet-mvc-web-app-using-wif.md",
1952+
"redirect_url": "/previous-versions/dotnet/framework/security/how-to-build-claims-aware-aspnet-mvc-web-app-using-wif",
1953+
"redirect_document_id": true
1954+
},
1955+
{
1956+
"source_path": "docs/framework/security/how-to-build-claims-aware-aspnet-web-forms-app-using-wif.md",
1957+
"redirect_url": "/previous-versions/dotnet/framework/security/how-to-build-claims-aware-aspnet-web-forms-app-using-wif",
1958+
"redirect_document_id": true
1959+
},
1960+
{
1961+
"source_path": "docs/framework/security/how-to-debug-claims-aware-applications-and-services-using-wif-tracing.md",
1962+
"redirect_url": "/previous-versions/dotnet/framework/security/how-to-debug-claims-aware-applications-and-services-using-wif-tracing",
1963+
"redirect_document_id": true
1964+
},
1965+
{
1966+
"source_path": "docs/framework/security/how-to-display-signed-in-status-using-wif.md",
1967+
"redirect_url": "/previous-versions/dotnet/framework/security/how-to-display-signed-in-status-using-wif",
1968+
"redirect_document_id": true
1969+
},
1970+
{
1971+
"source_path": "docs/framework/security/how-to-enable-token-replay-detection.md",
1972+
"redirect_url": "/previous-versions/dotnet/framework/security/how-to-enable-token-replay-detection",
1973+
"redirect_document_id": true
1974+
},
1975+
{
1976+
"source_path": "docs/framework/security/how-to-enable-wif-for-a-wcf-web-service-application.md",
1977+
"redirect_url": "/previous-versions/dotnet/framework/security/how-to-enable-wif-for-a-wcf-web-service-application",
1978+
"redirect_document_id": true
1979+
},
1980+
{
1981+
"source_path": "docs/framework/security/how-to-enable-wif-tracing.md",
1982+
"redirect_url": "/previous-versions/dotnet/framework/security/how-to-enable-wif-tracing",
1983+
"redirect_document_id": true
1984+
},
1985+
{
1986+
"source_path": "docs/framework/security/how-to-transform-incoming-claims.md",
1987+
"redirect_url": "/previous-versions/dotnet/framework/security/how-to-transform-incoming-claims",
1988+
"redirect_document_id": true
1989+
},
1990+
{
1991+
"source_path": "docs/framework/security/identity-and-access-tool-for-vs.md",
1992+
"redirect_url": "/previous-versions/dotnet/framework/security/identity-and-access-tool-for-vs",
1993+
"redirect_document_id": true
1994+
},
1995+
{
1996+
"source_path": "docs/framework/security/index.md",
1997+
"redirect_url": "/previous-versions/dotnet/framework/security/index",
1998+
"redirect_document_id": true
1999+
},
2000+
{
2001+
"source_path": "docs/framework/security/json-web-token-handler.md",
2002+
"redirect_url": "/previous-versions/dotnet/framework/security/json-web-token-handler",
2003+
"redirect_document_id": true
2004+
},
18952005
{
18962006
"source_path": "docs/framework/security/json-web-token-handler-api-reference.md",
18972007
"redirect_url": "https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/wiki"
18982008
},
2009+
{
2010+
"source_path": "docs/framework/security/namespace-mapping-between-wif-3-5-and-wif-4-5.md",
2011+
"redirect_url": "/previous-versions/dotnet/framework/security/namespace-mapping-between-wif-3-5-and-wif-4-5",
2012+
"redirect_document_id": true
2013+
},
2014+
{
2015+
"source_path": "docs/framework/security/secure-coding-guidelines-for-unmanaged-code.md",
2016+
"redirect_url": "/previous-versions/dotnet/framework/security/secure-coding-guidelines-for-unmanaged-code",
2017+
"redirect_document_id": true
2018+
},
2019+
{
2020+
"source_path": "docs/framework/security/security-changes.md",
2021+
"redirect_url": "/previous-versions/dotnet/framework/security/security-changes",
2022+
"redirect_document_id": true
2023+
},
2024+
{
2025+
"source_path": "docs/framework/security/validating-issuer-name-registry-api-reference.md",
2026+
"redirect_url": "/previous-versions/dotnet/framework/security/validating-issuer-name-registry-api-reference",
2027+
"redirect_document_id": true
2028+
},
2029+
{
2030+
"source_path": "docs/framework/security/validating-issuer-name-registry.md",
2031+
"redirect_url": "/previous-versions/dotnet/framework/security/validating-issuer-name-registry",
2032+
"redirect_document_id": true
2033+
},
2034+
{
2035+
"source_path": "docs/framework/security/whats-new-in-wif.md",
2036+
"redirect_url": "/previous-versions/dotnet/framework/security/whats-new-in-wif",
2037+
"redirect_document_id": true
2038+
},
2039+
{
2040+
"source_path": "docs/framework/security/wif-and-web-farms.md",
2041+
"redirect_url": "/previous-versions/dotnet/framework/security/wif-and-web-farms",
2042+
"redirect_document_id": true
2043+
},
2044+
{
2045+
"source_path": "docs/framework/security/wif-api-reference.md",
2046+
"redirect_url": "/previous-versions/dotnet/framework/security/wif-api-reference",
2047+
"redirect_document_id": true
2048+
},
2049+
{
2050+
"source_path": "docs/framework/security/wif-claims-programming-model.md",
2051+
"redirect_url": "/previous-versions/dotnet/framework/security/wif-claims-programming-model",
2052+
"redirect_document_id": true
2053+
},
2054+
{
2055+
"source_path": "docs/framework/security/wif-code-sample-index.md",
2056+
"redirect_url": "/previous-versions/dotnet/framework/security/wif-code-sample-index",
2057+
"redirect_document_id": true
2058+
},
2059+
{
2060+
"source_path": "docs/framework/security/wif-configuration-reference.md",
2061+
"redirect_url": "/previous-versions/dotnet/framework/security/wif-configuration-reference",
2062+
"redirect_document_id": true
2063+
},
2064+
{
2065+
"source_path": "docs/framework/security/wif-configuration-schema-conventions.md",
2066+
"redirect_url": "/previous-versions/dotnet/framework/security/wif-configuration-schema-conventions",
2067+
"redirect_document_id": true
2068+
},
2069+
{
2070+
"source_path": "docs/framework/security/wif-extensions.md",
2071+
"redirect_url": "/previous-versions/dotnet/framework/security/wif-extensions",
2072+
"redirect_document_id": true
2073+
},
2074+
{
2075+
"source_path": "docs/framework/security/wif-features.md",
2076+
"redirect_url": "/previous-versions/dotnet/framework/security/wif-features",
2077+
"redirect_document_id": true
2078+
},
2079+
{
2080+
"source_path": "docs/framework/security/wif-guidelines.md",
2081+
"redirect_url": "/previous-versions/dotnet/framework/security/wif-guidelines",
2082+
"redirect_document_id": true
2083+
},
2084+
{
2085+
"source_path": "docs/framework/security/wif-how-tos-index.md",
2086+
"redirect_url": "/previous-versions/dotnet/framework/security/wif-how-tos-index",
2087+
"redirect_document_id": true
2088+
},
2089+
{
2090+
"source_path": "docs/framework/security/wif-overview.md",
2091+
"redirect_url": "/previous-versions/dotnet/framework/security/wif-overview",
2092+
"redirect_document_id": true
2093+
},
2094+
{
2095+
"source_path": "docs/framework/security/wif-session-management.md",
2096+
"redirect_url": "/previous-versions/dotnet/framework/security/wif-session-management",
2097+
"redirect_document_id": true
2098+
},
2099+
{
2100+
"source_path": "docs/framework/security/wsfederation-authentication-module-overview.md",
2101+
"redirect_url": "/previous-versions/dotnet/framework/security/wsfederation-authentication-module-overview",
2102+
"redirect_document_id": true
2103+
},
2104+
{
2105+
"source_path": "docs/framework/security/wstrustchannelfactory-and-wstrustchannel.md",
2106+
"redirect_url": "/previous-versions/dotnet/framework/security/wstrustchannelfactory-and-wstrustchannel",
2107+
"redirect_document_id": true
2108+
},
18992109
{
19002110
"source_path": "docs/framework/unmanaged-api/cor-prf-allowable-after-attach-bitmask.md",
19012111
"redirect_url": "/dotnet/framework/unmanaged-api/profiling/cor-prf-monitor-enumeration"

‎docfx.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@
212212
"docs/framework/performance/**/**.md": "mairaw",
213213
"docs/framework/reflection-and-codedom/**/**.md": "Thraka",
214214
"docs/framework/resources/**/**.md": "Thraka",
215-
"docs/framework/security/**/**.md": "mairaw",
216215
"docs/framework/tools/**/**.md": "tdykstra",
217216
"docs/framework/ui-automation/**/**.md": "Thraka",
218217
"docs/framework/unmanaged-api/alink/**/**.md": "jeffschwMSFT",

‎docs/breadcrumb/toc.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,6 @@
293293
- name: Resources in desktop apps
294294
tocHref: /dotnet/framework/resources/
295295
topicHref: /dotnet/framework/resources/index
296-
- name: Security in the .NET Framework
297-
tocHref: /dotnet/framework/security/
298-
topicHref: /dotnet/framework/security/index
299296
- name: .NET Framework Tools
300297
tocHref: /dotnet/framework/tools/
301298
topicHref: /dotnet/framework/tools/index

‎docs/core/about.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Multiple frameworks have been built on top of .NET Core:
5050

5151
.NET Core is composed of the following parts:
5252

53-
- The [.NET Core runtime](https://github.com/dotnet/coreclr), which provides a type system, assembly loading, a garbage collector, native interop, and other basic services. [.NET Core framework libraries](https://github.com/dotnet/corefx) provide primitive data types, app composition types, and fundamental utilities.
53+
- The [.NET Core runtime](https://github.com/dotnet/runtime/tree/master/src/coreclr), which provides a type system, assembly loading, a garbage collector, native interop, and other basic services. [.NET Core framework libraries](https://github.com/dotnet/runtime/tree/master/src/libraries) provide primitive data types, app composition types, and fundamental utilities.
5454
- The [ASP.NET runtime](https://github.com/aspnet/home), which provides a framework for building modern cloud-based internet connected applications, such as web apps, IoT apps, and mobile backends.
5555
- The [.NET Core CLI tools](https://github.com/dotnet/cli) and language compilers ([Roslyn](https://github.com/dotnet/roslyn) and [F#](https://github.com/microsoft/visualfsharp)) that enable the .NET Core developer experience.
5656
- The [dotnet tool](https://github.com/dotnet/core-setup), which is used to launch .NET Core apps and CLI tools. It selects the runtime and hosts the runtime, provides an assembly loading policy, and launches apps and tools.
@@ -73,17 +73,17 @@ The product is broken into several pieces, enabling the various parts to be adap
7373

7474
People commonly ask how .NET Core is implemented in order to support multiple operating systems. They typically ask if there are separate implementations or if [conditional compilation](https://en.wikipedia.org/wiki/Conditional_compilation) is used. It's both, with a strong bias towards conditional compilation.
7575

76-
You can see in the following chart that the vast majority of [CoreFX](https://github.com/dotnet/corefx) is platform-neutral code that is shared across all platforms. Platform-neutral code can be implemented as a single portable assembly that is used on all platforms.
76+
You can see in the following chart that the vast majority of [.NET Core libraries](https://github.com/dotnet/runtime/tree/master/src/libraries) is platform-neutral code that is shared across all platforms. Platform-neutral code can be implemented as a single portable assembly that is used on all platforms.
7777

7878
![CoreFX: Lines of Code per Platform](../images/corefx-platforms-loc.png)
7979

80-
Windows and Unix implementations are similar in size. Windows has a larger implementation since CoreFX implements some Windows-only features, such as [Microsoft.Win32.Registry](https://github.com/dotnet/corefx/tree/master/src/Microsoft.Win32.Registry) but doesn't yet implement many Unix-only concepts. You'll also see that the majority of the Linux and macOS implementations are shared across a Unix implementation, while the Linux and macOS-specific implementations are roughly similar in size.
80+
Windows and Unix implementations are similar in size. Windows has a larger implementation since .NET Core libraries implements some Windows-only features, such as [Microsoft.Win32.Registry](https://github.com/dotnet/runtime/tree/master/src/libraries/Microsoft.Win32.Registry) but doesn't yet implement many Unix-only concepts. You'll also see that the majority of the Linux and macOS implementations are shared across a Unix implementation, while the Linux and macOS-specific implementations are roughly similar in size.
8181

8282
There's a mix of platform-specific and platform-neutral libraries in .NET Core. You can see the pattern in a few examples:
8383

84-
- [CoreCLR](https://github.com/dotnet/coreclr) is platform-specific. It builds on top of OS subsystems, like the memory manager and thread scheduler.
85-
- [System.IO](https://github.com/dotnet/corefx/tree/master/src/System.IO) and [System.Security.Cryptography.Algorithms](https://github.com/dotnet/corefx/tree/master/src/System.Security.Cryptography.Algorithms) are platform-specific, given that storage and cryptography APIs are different on each OS.
86-
- [System.Collections](https://github.com/dotnet/corefx/tree/master/src/System.Collections) and [System.Linq](https://github.com/dotnet/corefx/tree/master/src/System.Linq) are platform-neutral, given that they create and operate over data structures.
84+
- [CoreCLR](https://github.com/dotnet/runtime/tree/master/src/coreclr) is platform-specific. It builds on top of OS subsystems, like the memory manager and thread scheduler.
85+
- [System.IO](https://github.com/dotnet/runtime/tree/master/src/libraries/System.IO) and [System.Security.Cryptography.Algorithms](https://github.com/dotnet/runtime/tree/master/src/libraries/System.Security.Cryptography.Algorithms) are platform-specific, given that storage and cryptography APIs are different on each OS.
86+
- [System.Collections](https://github.com/dotnet/runtime/tree/master/src/libraries/System.Collections) and [System.Linq](https://github.com/dotnet/runtime/tree/master/src/libraries/System.Linq) are platform-neutral, given that they create and operate over data structures.
8787

8888
## Comparisons to other .NET implementations
8989

‎docs/core/install/linux-package-manager-rhel7.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Install .NET Core on Linux RHEL 7 package manager - .NET Core
33
description: Use a package manager to install .NET Core SDK and runtime on RHEL 7.
44
author: thraka
55
ms.author: adegeo
6-
ms.date: 11/06/2019
6+
ms.date: 12/03/2019
77
---
88

99
# RHEL 7 Package Manager - Install .NET Core
@@ -33,7 +33,7 @@ After registering with the Subscription Manager, you're ready to install and ena
3333
<!-- TODO: is this the correct value? Taken from the webpage but it doesn't have aspnet in the name -->
3434
```bash
3535
subscription-manager repos --enable=rhel-7-server-dotnet-rpms
36-
yum install rh-dotnet30-dotnet-runtime-3.0 -y
36+
yum install rh-dotnet30-aspnetcore-runtime-3.0 -y
3737
scl enable rh-dotnet30 bash
3838
```
3939

@@ -46,3 +46,7 @@ subscription-manager repos --enable=rhel-7-server-dotnet-rpms
4646
yum install rh-dotnet30-dotnet-runtime-3.0 -y
4747
scl enable rh-dotnet30 bash
4848
```
49+
50+
## See also
51+
52+
- [Using .NET Core 3.0 on Red Hat Enterprise Linux 7](https://access.redhat.com/documentation/en-us/net_core/3.0/html/getting_started_guide/gs_install_dotnet)

0 commit comments

Comments
 (0)