From 95beb1fa4ecc923e0208d8aa199a3a4393947055 Mon Sep 17 00:00:00 2001 From: NextTurn <45985406+NextTurn@users.noreply.github.com> Date: Sat, 17 Aug 2019 15:41:05 +0000 Subject: [PATCH 1/8] Replace Microsoft Internet Information Services (IIS) 5.0 tokens --- ...gure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md | 8 ++++---- .../wpf-xaml-browser-applications-overview.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md b/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md index fc301d8a3e6e1..a69c9f86c13c6 100644 --- a/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md +++ b/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md @@ -17,9 +17,9 @@ ms.assetid: c6e8c2cb-9ba2-4e75-a0d5-180ec9639433 # How to: Configure IIS 5.0 and IIS 6.0 to Deploy WPF Applications -You can deploy a [!INCLUDE[TLA#tla_winclient](../../../../includes/tlasharptla-winclient-md.md)] application from most Web servers, as long as they are configured with the appropriate Multipurpose Internet Mail Extensions (MIME) types. By default, [!INCLUDE[TLA#tla_iis70](../../../../includes/tlasharptla-iis70-md.md)] is configured with these MIME types, but [!INCLUDE[TLA#tla_iis50](../../../../includes/tlasharptla-iis50-md.md)] and [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] are not. +You can deploy a [!INCLUDE[TLA#tla_winclient](../../../../includes/tlasharptla-winclient-md.md)] application from most Web servers, as long as they are configured with the appropriate Multipurpose Internet Mail Extensions (MIME) types. By default, [!INCLUDE[TLA#tla_iis70](../../../../includes/tlasharptla-iis70-md.md)] is configured with these MIME types, but Microsoft Internet Information Services (IIS) 5.0 and [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] are not. -This topic describes how to configure [!INCLUDE[TLA#tla_iis50](../../../../includes/tlasharptla-iis50-md.md)] and [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] to deploy [!INCLUDE[TLA2#tla_winclient](../../../../includes/tla2sharptla-winclient-md.md)] applications. +This topic describes how to configure Microsoft Internet Information Services (IIS) 5.0 and [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] to deploy [!INCLUDE[TLA2#tla_winclient](../../../../includes/tla2sharptla-winclient-md.md)] applications. > [!NOTE] > You can check the *UserAgent* string in the registry to determine whether a system has .NET Framework installed. For details and a script that examines the *UserAgent* string to determine whether .NET Framework is installed on a system, see [Detect Whether the .NET Framework 3.0 Is Installed](how-to-detect-whether-the-net-framework-3-0-is-installed.md). @@ -121,9 +121,9 @@ End Sub ``` > [!NOTE] -> Running this script multiple times creates multiple MIME map entries in the [!INCLUDE[TLA#tla_iis50](../../../../includes/tlasharptla-iis50-md.md)] or [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] metabase. +> Running this script multiple times creates multiple MIME map entries in the Microsoft Internet Information Services (IIS) 5.0 or [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] metabase. -After you have run this script, you may not see additional MIME types from the [!INCLUDE[TLA#tla_iis50](../../../../includes/tlasharptla-iis50-md.md)] or [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] Microsoft Management Console (MMC). However, these MIME types have been added to the [!INCLUDE[TLA#tla_iis50](../../../../includes/tlasharptla-iis50-md.md)] or [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] metabase. The following script will display all the MIME types in the [!INCLUDE[TLA#tla_iis50](../../../../includes/tlasharptla-iis50-md.md)] or [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] metabase. +After you have run this script, you may not see additional MIME types from the Microsoft Internet Information Services (IIS) 5.0 or [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] Microsoft Management Console (MMC). However, these MIME types have been added to the Microsoft Internet Information Services (IIS) 5.0 or [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] metabase. The following script will display all the MIME types in the Microsoft Internet Information Services (IIS) 5.0 or [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] metabase. ```vb ' This script lists the MIME types for an IIS Server. diff --git a/docs/framework/wpf/app-development/wpf-xaml-browser-applications-overview.md b/docs/framework/wpf/app-development/wpf-xaml-browser-applications-overview.md index e5c795e8bdb95..4d5f0dcb7f969 100644 --- a/docs/framework/wpf/app-development/wpf-xaml-browser-applications-overview.md +++ b/docs/framework/wpf/app-development/wpf-xaml-browser-applications-overview.md @@ -46,7 +46,7 @@ ms.assetid: 3a7a86a8-75d5-4898-96b9-73da151e5e16 |Application manifest (.manifest)|This contains metadata associated with the application and has a .manifest extension.| |Deployment manifest (.xbap)|This file contains the information that ClickOnce uses to deploy the application and has the .xbap extension.| - You deploy XBAPs to a Web server, for example [!INCLUDE[TLA#tla_iis50](../../../../includes/tlasharptla-iis50-md.md)] or later versions. You do not have to install the .NET Framework on the Web server, but you do have to register the [!INCLUDE[TLA2#tla_wpf](../../../../includes/tla2sharptla-wpf-md.md)] Multipurpose Internet Mail Extensions (MIME) types and file name extensions. For more information, see [Configure IIS 5.0 and IIS 6.0 to Deploy WPF Applications](how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md). + You deploy XBAPs to a Web server, for example Microsoft Internet Information Services (IIS) 5.0 or later versions. You do not have to install the .NET Framework on the Web server, but you do have to register the [!INCLUDE[TLA2#tla_wpf](../../../../includes/tla2sharptla-wpf-md.md)] Multipurpose Internet Mail Extensions (MIME) types and file name extensions. For more information, see [Configure IIS 5.0 and IIS 6.0 to Deploy WPF Applications](how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md). To prepare your XBAP for deployment, copy the .exe and the associated manifests to the Web server. Create an HTML page that contains a hyperlink to open the deployment manifest, which is the file that has the .xbap extension. When the user clicks the link to the .xbap file, ClickOnce automatically handles the mechanics of downloading and starting the application. The following example code shows an HTML page that contains a hyperlink that points to an XBAP. From 858e201f71570818cb0c332d0065798e58ed9968 Mon Sep 17 00:00:00 2001 From: NextTurn <45985406+NextTurn@users.noreply.github.com> Date: Sat, 17 Aug 2019 15:41:05 +0000 Subject: [PATCH 2/8] Remove tlasharptla-iis50-md.md --- includes/tlasharptla-iis50-md.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 includes/tlasharptla-iis50-md.md diff --git a/includes/tlasharptla-iis50-md.md b/includes/tlasharptla-iis50-md.md deleted file mode 100644 index 8d0b8d3923f2f..0000000000000 --- a/includes/tlasharptla-iis50-md.md +++ /dev/null @@ -1 +0,0 @@ -Microsoft Internet Information Services (IIS) 5.0 From bb2bf54542c849a3d7727987c8910bfa776001fd Mon Sep 17 00:00:00 2001 From: NextTurn <45985406+NextTurn@users.noreply.github.com> Date: Sat, 17 Aug 2019 15:41:23 +0000 Subject: [PATCH 3/8] Replace Microsoft Internet Information Services (IIS) 6.0 tokens --- ...gure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md b/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md index a69c9f86c13c6..c2c49f8138634 100644 --- a/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md +++ b/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md @@ -17,9 +17,9 @@ ms.assetid: c6e8c2cb-9ba2-4e75-a0d5-180ec9639433 # How to: Configure IIS 5.0 and IIS 6.0 to Deploy WPF Applications -You can deploy a [!INCLUDE[TLA#tla_winclient](../../../../includes/tlasharptla-winclient-md.md)] application from most Web servers, as long as they are configured with the appropriate Multipurpose Internet Mail Extensions (MIME) types. By default, [!INCLUDE[TLA#tla_iis70](../../../../includes/tlasharptla-iis70-md.md)] is configured with these MIME types, but Microsoft Internet Information Services (IIS) 5.0 and [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] are not. +You can deploy a [!INCLUDE[TLA#tla_winclient](../../../../includes/tlasharptla-winclient-md.md)] application from most Web servers, as long as they are configured with the appropriate Multipurpose Internet Mail Extensions (MIME) types. By default, [!INCLUDE[TLA#tla_iis70](../../../../includes/tlasharptla-iis70-md.md)] is configured with these MIME types, but Microsoft Internet Information Services (IIS) 5.0 and Microsoft Internet Information Services (IIS) 6.0 are not. -This topic describes how to configure Microsoft Internet Information Services (IIS) 5.0 and [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] to deploy [!INCLUDE[TLA2#tla_winclient](../../../../includes/tla2sharptla-winclient-md.md)] applications. +This topic describes how to configure Microsoft Internet Information Services (IIS) 5.0 and Microsoft Internet Information Services (IIS) 6.0 to deploy [!INCLUDE[TLA2#tla_winclient](../../../../includes/tla2sharptla-winclient-md.md)] applications. > [!NOTE] > You can check the *UserAgent* string in the registry to determine whether a system has .NET Framework installed. For details and a script that examines the *UserAgent* string to determine whether .NET Framework is installed on a system, see [Detect Whether the .NET Framework 3.0 Is Installed](how-to-detect-whether-the-net-framework-3-0-is-installed.md). @@ -121,9 +121,9 @@ End Sub ``` > [!NOTE] -> Running this script multiple times creates multiple MIME map entries in the Microsoft Internet Information Services (IIS) 5.0 or [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] metabase. +> Running this script multiple times creates multiple MIME map entries in the Microsoft Internet Information Services (IIS) 5.0 or Microsoft Internet Information Services (IIS) 6.0 metabase. -After you have run this script, you may not see additional MIME types from the Microsoft Internet Information Services (IIS) 5.0 or [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] Microsoft Management Console (MMC). However, these MIME types have been added to the Microsoft Internet Information Services (IIS) 5.0 or [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] metabase. The following script will display all the MIME types in the Microsoft Internet Information Services (IIS) 5.0 or [!INCLUDE[TLA#tla_iis60](../../../../includes/tlasharptla-iis60-md.md)] metabase. +After you have run this script, you may not see additional MIME types from the Microsoft Internet Information Services (IIS) 5.0 or Microsoft Internet Information Services (IIS) 6.0 Microsoft Management Console (MMC). However, these MIME types have been added to the Microsoft Internet Information Services (IIS) 5.0 or Microsoft Internet Information Services (IIS) 6.0 metabase. The following script will display all the MIME types in the Microsoft Internet Information Services (IIS) 5.0 or Microsoft Internet Information Services (IIS) 6.0 metabase. ```vb ' This script lists the MIME types for an IIS Server. From 9d6c9aafe5383b13155ce9e896782e9d333d71d2 Mon Sep 17 00:00:00 2001 From: NextTurn <45985406+NextTurn@users.noreply.github.com> Date: Sat, 17 Aug 2019 15:41:23 +0000 Subject: [PATCH 4/8] Remove tlasharptla-iis60-md.md --- includes/tlasharptla-iis60-md.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 includes/tlasharptla-iis60-md.md diff --git a/includes/tlasharptla-iis60-md.md b/includes/tlasharptla-iis60-md.md deleted file mode 100644 index ad93b68f17d72..0000000000000 --- a/includes/tlasharptla-iis60-md.md +++ /dev/null @@ -1 +0,0 @@ -Microsoft Internet Information Services (IIS) 6.0 From ba11f21a025beeedfe5351c09fe85178a3457305 Mon Sep 17 00:00:00 2001 From: NextTurn <45985406+NextTurn@users.noreply.github.com> Date: Sat, 17 Aug 2019 15:41:30 +0000 Subject: [PATCH 5/8] Replace Microsoft Internet Information Services (IIS) 7.0 tokens --- ...-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md b/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md index c2c49f8138634..d37b8d5a91296 100644 --- a/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md +++ b/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md @@ -17,7 +17,7 @@ ms.assetid: c6e8c2cb-9ba2-4e75-a0d5-180ec9639433 # How to: Configure IIS 5.0 and IIS 6.0 to Deploy WPF Applications -You can deploy a [!INCLUDE[TLA#tla_winclient](../../../../includes/tlasharptla-winclient-md.md)] application from most Web servers, as long as they are configured with the appropriate Multipurpose Internet Mail Extensions (MIME) types. By default, [!INCLUDE[TLA#tla_iis70](../../../../includes/tlasharptla-iis70-md.md)] is configured with these MIME types, but Microsoft Internet Information Services (IIS) 5.0 and Microsoft Internet Information Services (IIS) 6.0 are not. +You can deploy a [!INCLUDE[TLA#tla_winclient](../../../../includes/tlasharptla-winclient-md.md)] application from most Web servers, as long as they are configured with the appropriate Multipurpose Internet Mail Extensions (MIME) types. By default, Microsoft Internet Information Services (IIS) 7.0 is configured with these MIME types, but Microsoft Internet Information Services (IIS) 5.0 and Microsoft Internet Information Services (IIS) 6.0 are not. This topic describes how to configure Microsoft Internet Information Services (IIS) 5.0 and Microsoft Internet Information Services (IIS) 6.0 to deploy [!INCLUDE[TLA2#tla_winclient](../../../../includes/tla2sharptla-winclient-md.md)] applications. From 069ac3b993a9cf805afc558ed0473f4b6420f71c Mon Sep 17 00:00:00 2001 From: NextTurn <45985406+NextTurn@users.noreply.github.com> Date: Sat, 17 Aug 2019 15:41:30 +0000 Subject: [PATCH 6/8] Remove tlasharptla-iis70-md.md --- includes/tlasharptla-iis70-md.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 includes/tlasharptla-iis70-md.md diff --git a/includes/tlasharptla-iis70-md.md b/includes/tlasharptla-iis70-md.md deleted file mode 100644 index 7954e6a8f29a2..0000000000000 --- a/includes/tlasharptla-iis70-md.md +++ /dev/null @@ -1 +0,0 @@ -Microsoft Internet Information Services (IIS) 7.0 From b2fc32fc000591358ee6204f5d7c25f2f5508213 Mon Sep 17 00:00:00 2001 From: NextTurn <45985406+NextTurn@users.noreply.github.com> Date: Sat, 17 Aug 2019 15:42:28 +0000 Subject: [PATCH 7/8] Replace IIS tokens --- ...figure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md | 6 +++--- includes/tla2sharptla-iis5-md.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md b/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md index d37b8d5a91296..5045362baed9d 100644 --- a/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md +++ b/docs/framework/wpf/app-development/how-to-configure-iis-5-0-and-iis-6-0-to-deploy-wpf-applications.md @@ -28,11 +28,11 @@ This topic describes how to configure Microsoft Internet Information Services (I ## Adjust the Content Expiration Setting -You should adjust the content expiration setting to 1 minute. The following procedure outlines how to do this with [!INCLUDE[TLA2#tla_iis5](../../../../includes/tla2sharptla-iis5-md.md)]. +You should adjust the content expiration setting to 1 minute. The following procedure outlines how to do this with IIS. 1. Click the **Start** menu, point to **Administrative Tools**, and click **Internet Information Services (IIS) Manager**. You can also launch this application from the command line with "%SystemRoot%\system32\inetsrv\iis.msc". -2. Expand the [!INCLUDE[TLA2#tla_iis5](../../../../includes/tla2sharptla-iis5-md.md)] tree until you find the **Default Web site** node. +2. Expand the IIS tree until you find the **Default Web site** node. 3. Right-click **Default Web site** and select **Properties** from the context menu. @@ -58,7 +58,7 @@ You must register several MIME types and file extensions so that the browser on > [!NOTE] > You do not need to register MIME types or file extensions on client systems. They are registered automatically when you install Microsoft .NET Framework. -The following Microsoft Visual Basic Scripting Edition (VBScript) sample automatically adds the necessary MIME types to [!INCLUDE[TLA2#tla_iis5](../../../../includes/tla2sharptla-iis5-md.md)]. To use the script, copy the code to a .vbs file on your server. Then, run the script by running the file from the command line or double-clicking the file in [!INCLUDE[TLA#tla_winexpl](../../../../includes/tlasharptla-winexpl-md.md)]. +The following Microsoft Visual Basic Scripting Edition (VBScript) sample automatically adds the necessary MIME types to IIS. To use the script, copy the code to a .vbs file on your server. Then, run the script by running the file from the command line or double-clicking the file in [!INCLUDE[TLA#tla_winexpl](../../../../includes/tlasharptla-winexpl-md.md)]. ```vb ' This script adds the necessary Windows Presentation Foundation MIME types diff --git a/includes/tla2sharptla-iis5-md.md b/includes/tla2sharptla-iis5-md.md index 2bcd8298f61c7..b11aea869811d 100644 --- a/includes/tla2sharptla-iis5-md.md +++ b/includes/tla2sharptla-iis5-md.md @@ -1 +1 @@ - IIS +IIS From ac0b1eccd5b1a6b1852f9c021ad0ed3453aef012 Mon Sep 17 00:00:00 2001 From: NextTurn <45985406+NextTurn@users.noreply.github.com> Date: Sat, 17 Aug 2019 15:42:28 +0000 Subject: [PATCH 8/8] Remove tla2sharptla-iis5-md.md --- includes/tla2sharptla-iis5-md.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 includes/tla2sharptla-iis5-md.md diff --git a/includes/tla2sharptla-iis5-md.md b/includes/tla2sharptla-iis5-md.md deleted file mode 100644 index b11aea869811d..0000000000000 --- a/includes/tla2sharptla-iis5-md.md +++ /dev/null @@ -1 +0,0 @@ -IIS