Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions .openpublishing.redirection.json
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,34 @@
"redirect_url": "/dotnet/articles/csharp/whats-new/index",
"redirect_document_id": true
},
{
"source_path": "docs/framework/deployment/windows/index.md",
"redirect_url": "/dotnet/articles/framework/install/"
},
{
"source_path": "docs/framework/deployment/windows/7.md",
"redirect_url": "/dotnet/articles/framework/install/on-windows-7"
},
{
"source_path": "docs/framework/deployment/windows/8.md",
"redirect_url": "/dotnet/articles/framework/install/on-windows-8"
},
{
"source_path": "docs/framework/deployment/windows/10.md",
"redirect_url": "/dotnet/articles/framework/install/on-windows-10"
},
{
"source_path": "docs/framework/deployment/windows/vista.md",
"redirect_url": "/dotnet/articles/framework/install/on-windows-vista"
},
{
"source_path": "docs/framework/deployment/windows/xp.md",
"redirect_url": "/dotnet/articles/framework/install/on-windows-xp"
},
{
"source_path": "docs/framework/deployment/windows/installing-dotnet-35-windows-10.md",
"redirect_url": "/dotnet/articles/framework/install/dotnet-35-windows-10"
},
{
"source_path": "docs/framework/docker/aspnetmvc.md",
"redirect_url": "/aspnet/mvc/overview/deployment/docker-aspnetmvc",
Expand Down
1 change: 0 additions & 1 deletion docs/framework/TOC.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@
## [Developing for multiple platforms](../standard/cross-platform/index.md)
## [Deployment](deployment/index.md)
## [Performance](performance/index.md)

2 changes: 1 addition & 1 deletion docs/framework/deployment/client-profile.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ The .NET Client Profile is a subset of the .NET Framework, which was provided wi

However, if you are targeting the .NET Framework 4 or 3.5 and want to learn more about the Client Profile and when to use it, see [.NET Framework Client Profile](http://msdn.microsoft.com/library/cc656912\(v=vs.100\).aspx) in the .NET Framework 4 documentation.

When you install the [!INCLUDE[net_v45](../../../includes/net-v45-md.md)], the .NET Framework 4 Client Profile is updated to the full version of the .NET Framework. For information about installing the [!INCLUDE[net_v45](../../../includes/net-v45-md.md)], see [Installation Guide](../../../docs/framework/install/guide-for-developers.md).
When you install the [!INCLUDE[net_v45](../../../includes/net-v45-md.md)], the .NET Framework 4 Client Profile is updated to the full version of the .NET Framework. For information about installing the [!INCLUDE[net_v45](../../../includes/net-v45-md.md)], see [Install the .NET Framework for developers](../../../docs/framework/install/guide-for-developers.md).

## See Also
[.NET Framework Client Profile (.NET Framework 4)](http://msdn.microsoft.com/library/cc656912\(v=vs.100\).aspx)
Expand Down
4 changes: 2 additions & 2 deletions docs/framework/deployment/deployment-guide-for-developers.md
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ The following table lists .NET Framework language packs that are available for t
## See also
[Deployment Guide for Administrators](../../../docs/framework/deployment/guide-for-administrators.md)
[System Requirements](../../../docs/framework/get-started/system-requirements.md)
[Installation Guide](../../../docs/framework/install/guide-for-developers.md)
[Troubleshooting](../../../docs/framework/install/troubleshoot-blocked-installations-and-uninstallations.md)
[Install the .NET Framework for developers](../../../docs/framework/install/guide-for-developers.md)
[Troubleshoot blocked .NET Framework installations and uninstallations](../../../docs/framework/install/troubleshoot-blocked-installations-and-uninstallations.md)
[Reducing System Restarts During .NET Framework 4.5 Installations](../../../docs/framework/deployment/reducing-system-restarts.md)
[How to: Get Progress from the .NET Framework 4.5 Installer](../../../docs/framework/deployment/how-to-get-progress-from-the-dotnet-installer.md)
4 changes: 2 additions & 2 deletions docs/framework/deployment/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ This article helps you get started deploying the .NET Framework with your applic

- [Reducing system restarts during .NET Framework 4.5 installations](../../../docs/framework/deployment/reducing-system-restarts.md)

- [Troubleshooting Blocked .NET Framework Installations and Uninstallations](~/docs/framework/install/troubleshoot-blocked-installations-and-uninstallations.md)
- [Troubleshoot blocked .NET Framework installations and uninstallations](~/docs/framework/install/troubleshoot-blocked-installations-and-uninstallations.md)

- Deploying the .NET Framework with a client application (for developers):

- [Using InstallShield](../../../docs/framework/deployment/deployment-guide-for-developers.md#installshield) in a setup and deployment project
- [Using InstallShield](../../../docs/framework/deployment/deployment-guide-for-developers.md#installshield-deployment) in a setup and deployment project

- [Using a Visual Studio ClickOnce application](../../../docs/framework/deployment/deployment-guide-for-developers.md#clickonce-deployment)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Typical error message for initialization errors
|XBAP host|Launches WPF XBAP applications.|Is shown in case of a missing .NET Framework version, starting with the [!INCLUDE[net_v45](../../../includes/net-v45-md.md)]|No|

## [!INCLUDE[win8](../../../includes/win8-md.md)] Behavior and UI
The CLR activation system provides the same behavior and UI on [!INCLUDE[win8](../../../includes/win8-md.md)] as it does on other versions of the Windows operating system, except when it encounters issues loading CLR 2.0. [!INCLUDE[win8](../../../includes/win8-md.md)] includes the [!INCLUDE[net_v45](../../../includes/net-v45-md.md)], which uses CLR 4.5. However, [!INCLUDE[win8](../../../includes/win8-md.md)] does not include the .NET Framework 2.0, 3.0, or 3.5, which all use CLR 2.0. As a result, applications that depend on CLR 2.0 do not run on [!INCLUDE[win8](../../../includes/win8-md.md)] by default. Instead, they display the following dialog box to enable users to install the .NET Framework 3.5. Users can also enable the .NET Framework 3.5 in Control Panel. Both options are discussed in the article [Installing the .NET Framework 3.5 on Windows 8 and later versions](../../../docs/framework/install/net-framework-3-5-on-windows-8-plus.md).
The CLR activation system provides the same behavior and UI on [!INCLUDE[win8](../../../includes/win8-md.md)] as it does on other versions of the Windows operating system, except when it encounters issues loading CLR 2.0. [!INCLUDE[win8](../../../includes/win8-md.md)] includes the [!INCLUDE[net_v45](../../../includes/net-v45-md.md)], which uses CLR 4.5. However, [!INCLUDE[win8](../../../includes/win8-md.md)] does not include the .NET Framework 2.0, 3.0, or 3.5, which all use CLR 2.0. As a result, applications that depend on CLR 2.0 do not run on [!INCLUDE[win8](../../../includes/win8-md.md)] by default. Instead, they display the following dialog box to enable users to install the .NET Framework 3.5. Users can also enable the .NET Framework 3.5 in Control Panel. Both options are discussed in the article [Install the .NET Framework 3.5 on Windows 10, Windows 8.1, and Windows 8](../../../docs/framework/install/dotnet-35-windows-10.md).

![Dialog box for 3.5 install on Windows 8](../../../docs/framework/deployment/media/installdialog.png "installdialog")
Prompt for installing the .NET Framework 3.5 on demand
Expand All @@ -99,4 +99,4 @@ Prompt for installing the .NET Framework 3.5 on demand
[Deployment Guide for Developers](../../../docs/framework/deployment/deployment-guide-for-developers.md)
[How to: Configure an App to Support .NET Framework 4 or 4.5](../../../docs/framework/migration-guide/how-to-configure-an-app-to-support-net-framework-4-or-4-5.md)
[How to: Debug CLR Activation Issues](../../../docs/framework/deployment/how-to-debug-clr-activation-issues.md)
[Installing the .NET Framework 3.5 on Windows 8 and later versions](../../../docs/framework/install/net-framework-3-5-on-windows-8-plus.md)
[Install the .NET Framework 3.5 on Windows 10, Windows 8.1, and Windows 8](../../../docs/framework/install/dotnet-35-windows-10.md)
35 changes: 0 additions & 35 deletions docs/framework/deployment/windows/10.md

This file was deleted.

35 changes: 0 additions & 35 deletions docs/framework/deployment/windows/7.md

This file was deleted.

35 changes: 0 additions & 35 deletions docs/framework/deployment/windows/8.md

This file was deleted.

34 changes: 0 additions & 34 deletions docs/framework/deployment/windows/index.md

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
37 changes: 0 additions & 37 deletions docs/framework/deployment/windows/vista.md

This file was deleted.

44 changes: 0 additions & 44 deletions docs/framework/deployment/windows/xp.md

This file was deleted.

Loading