From 43cbd62784abf5739df7bbed8cde2691b062de2d Mon Sep 17 00:00:00 2001 From: Bill Wagner Date: Fri, 24 Feb 2017 11:34:41 -0500 Subject: [PATCH] update namespaces The default for this app is 'Microsoft.eShopOnContainers.Catalog.WebForms' --- .../Catalog.WebForms/About.aspx | 2 +- .../Catalog.WebForms/About.aspx.cs | 2 +- .../Catalog.WebForms/About.aspx.designer.cs | 12 +++++------ .../App_Start/BundleConfig.cs | 4 ++-- .../Catalog.WebForms/App_Start/RouteConfig.cs | 2 +- .../Catalog.WebForms/Catalog.WebForms.csproj | 2 +- .../Catalog.WebForms/Contact.aspx | 2 +- .../Catalog.WebForms/Contact.aspx.cs | 2 +- .../Catalog.WebForms/Contact.aspx.designer.cs | 12 +++++------ .../Catalog.WebForms/Default.aspx | 2 +- .../Catalog.WebForms/Default.aspx.cs | 2 +- .../Catalog.WebForms/Default.aspx.designer.cs | 12 +++++------ .../Catalog.WebForms/Global.asax | 2 +- .../Catalog.WebForms/Global.asax.cs | 2 +- .../Catalog.WebForms/Site.Master | 2 +- .../Catalog.WebForms/Site.Master.cs | 2 +- .../Catalog.WebForms/Site.Master.designer.cs | 21 +++++-------------- .../Catalog.WebForms/Site.Mobile.Master | 2 +- .../Catalog.WebForms/Site.Mobile.Master.cs | 2 +- .../Site.Mobile.Master.designer.cs | 2 +- .../Catalog.WebForms/ViewSwitcher.ascx | 2 +- .../Catalog.WebForms/ViewSwitcher.ascx.cs | 2 +- .../ViewSwitcher.ascx.designer.cs | 2 +- 23 files changed, 40 insertions(+), 57 deletions(-) diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/About.aspx b/src/Web/Catalog.WebForms/Catalog.WebForms/About.aspx index ab8db24c9..9b70f79bd 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/About.aspx +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/About.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="About" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="Catalog.WebForms.About" %> +<%@ Page Title="About" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="Microsoft.eShopOnContainers.Catalog.WebForms.About" %>

<%: Title %>.

diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/About.aspx.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/About.aspx.cs index 28432b855..cb479eb14 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/About.aspx.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/About.aspx.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -namespace Catalog.WebForms +namespace Microsoft.eShopOnContainers.Catalog.WebForms { public partial class About : Page { diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/About.aspx.designer.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/About.aspx.designer.cs index 0c4750823..df85a4b19 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/About.aspx.designer.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/About.aspx.designer.cs @@ -3,15 +3,13 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace Catalog.WebForms -{ - - - public partial class About - { +namespace Microsoft.eShopOnContainers.Catalog.WebForms { + + + public partial class About { } } diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/App_Start/BundleConfig.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/App_Start/BundleConfig.cs index 5378154ab..5545407fa 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/App_Start/BundleConfig.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/App_Start/BundleConfig.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.Optimization; using System.Web.UI; -namespace Catalog.WebForms +namespace Microsoft.eShopOnContainers.Catalog.WebForms { public class BundleConfig { @@ -34,7 +34,7 @@ namespace Catalog.WebForms bundles.Add(new ScriptBundle("~/bundles/modernizr").Include( "~/Scripts/modernizr-*")); - ScriptManager.ScriptResourceMapping.AddDefinition( + System.Web.UI.ScriptManager.ScriptResourceMapping.AddDefinition( "respond", new ScriptResourceDefinition { diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/App_Start/RouteConfig.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/App_Start/RouteConfig.cs index 806e22cde..723f636c7 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/App_Start/RouteConfig.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/App_Start/RouteConfig.cs @@ -4,7 +4,7 @@ using System.Web; using System.Web.Routing; using Microsoft.AspNet.FriendlyUrls; -namespace Catalog.WebForms +namespace Microsoft.eShopOnContainers.Catalog.WebForms { public static class RouteConfig { diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Catalog.WebForms.csproj b/src/Web/Catalog.WebForms/Catalog.WebForms/Catalog.WebForms.csproj index 3ded0ffb1..977a7ad8a 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Catalog.WebForms.csproj +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Catalog.WebForms.csproj @@ -13,7 +13,7 @@ {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library Properties - Catalog.WebForms + Microsoft.eShopOnContainers.Catalog.WebForms Catalog.WebForms v4.5.2 true diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Contact.aspx b/src/Web/Catalog.WebForms/Catalog.WebForms/Contact.aspx index a90a26f29..3f7dc898e 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Contact.aspx +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Contact.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="Contact" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Contact.aspx.cs" Inherits="Catalog.WebForms.Contact" %> +<%@ Page Title="Contact" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Contact.aspx.cs" Inherits="Microsoft.eShopOnContainers.Catalog.WebForms.Contact" %>

<%: Title %>.

diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Contact.aspx.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/Contact.aspx.cs index 007fff180..9dea43042 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Contact.aspx.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Contact.aspx.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -namespace Catalog.WebForms +namespace Microsoft.eShopOnContainers.Catalog.WebForms { public partial class Contact : Page { diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Contact.aspx.designer.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/Contact.aspx.designer.cs index f81fd4d8d..183419d9d 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Contact.aspx.designer.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Contact.aspx.designer.cs @@ -3,15 +3,13 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace Catalog.WebForms -{ - - - public partial class Contact - { +namespace Microsoft.eShopOnContainers.Catalog.WebForms { + + + public partial class Contact { } } diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Default.aspx b/src/Web/Catalog.WebForms/Catalog.WebForms/Default.aspx index 16c484c98..0c772c2c8 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Default.aspx +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Default.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="Home Page" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="Catalog.WebForms._Default" %> +<%@ Page Title="Home Page" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="Microsoft.eShopOnContainers.Catalog.WebForms._Default" %> diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Default.aspx.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/Default.aspx.cs index 39b240c8c..2a1aef02e 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Default.aspx.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Default.aspx.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -namespace Catalog.WebForms +namespace Microsoft.eShopOnContainers.Catalog.WebForms { public partial class _Default : Page { diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Default.aspx.designer.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/Default.aspx.designer.cs index 07b08bfa8..c11b147f0 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Default.aspx.designer.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Default.aspx.designer.cs @@ -3,15 +3,13 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace Catalog.WebForms -{ - - - public partial class _Default - { +namespace Microsoft.eShopOnContainers.Catalog.WebForms { + + + public partial class _Default { } } diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Global.asax b/src/Web/Catalog.WebForms/Catalog.WebForms/Global.asax index 5760d2235..b3682de02 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Global.asax +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Global.asax @@ -1 +1 @@ -<%@ Application Codebehind="Global.asax.cs" Inherits="Catalog.WebForms.Global" Language="C#" %> +<%@ Application Codebehind="Global.asax.cs" Inherits="Microsoft.eShopOnContainers.Catalog.WebForms.Global" Language="C#" %> diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Global.asax.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/Global.asax.cs index ac79df738..123157fda 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Global.asax.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Global.asax.cs @@ -7,7 +7,7 @@ using System.Web.Routing; using System.Web.Security; using System.Web.SessionState; -namespace Catalog.WebForms +namespace Microsoft.eShopOnContainers.Catalog.WebForms { public class Global : HttpApplication { diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Master b/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Master index 434a3efda..d2886842a 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Master +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Master @@ -1,4 +1,4 @@ -<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="Catalog.WebForms.SiteMaster" %> +<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="Microsoft.eShopOnContainers.Catalog.WebForms.SiteMaster" %> diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Master.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Master.cs index 8d926a0df..c839fea66 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Master.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Master.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -namespace Catalog.WebForms +namespace Microsoft.eShopOnContainers.Catalog.WebForms { public partial class SiteMaster : MasterPage { diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Master.designer.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Master.designer.cs index 93ac1afcc..05b24a5a7 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Master.designer.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Master.designer.cs @@ -7,22 +7,11 @@ // //------------------------------------------------------------------------------ -namespace Catalog.WebForms -{ - - - public partial class SiteMaster - { - - /// - /// HeadContent control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent; - +namespace Microsoft.eShopOnContainers.Catalog.WebForms { + + + public partial class SiteMaster { + /// /// MainContent control. /// diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Mobile.Master b/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Mobile.Master index c13ec39f1..e150e06ac 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Mobile.Master +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Mobile.Master @@ -1,4 +1,4 @@ -<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.Mobile.master.cs" Inherits="Catalog.WebForms.Site_Mobile" %> +<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.Mobile.master.cs" Inherits="Microsoft.eShopOnContainers.Catalog.WebForms.Site_Mobile" %> <%@ Register Src="~/ViewSwitcher.ascx" TagPrefix="friendlyUrls" TagName="ViewSwitcher" %> diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Mobile.Master.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Mobile.Master.cs index 4a258ed34..646cc9443 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Mobile.Master.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Mobile.Master.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -namespace Catalog.WebForms +namespace Microsoft.eShopOnContainers.Catalog.WebForms { public partial class Site_Mobile : System.Web.UI.MasterPage { diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Mobile.Master.designer.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Mobile.Master.designer.cs index b872ad70a..e48aed426 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Mobile.Master.designer.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Site.Mobile.Master.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Catalog.WebForms { +namespace Microsoft.eShopOnContainers.Catalog.WebForms { public partial class Site_Mobile { diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/ViewSwitcher.ascx b/src/Web/Catalog.WebForms/Catalog.WebForms/ViewSwitcher.ascx index b5a130e6c..72717bf6e 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/ViewSwitcher.ascx +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/ViewSwitcher.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ViewSwitcher.ascx.cs" Inherits="Catalog.WebForms.ViewSwitcher" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ViewSwitcher.ascx.cs" Inherits="Microsoft.eShopOnContainers.Catalog.WebForms.ViewSwitcher" %>
<%: CurrentView %> view | Switch to <%: AlternateView %>
\ No newline at end of file diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/ViewSwitcher.ascx.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/ViewSwitcher.ascx.cs index e153e198d..d6212623b 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/ViewSwitcher.ascx.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/ViewSwitcher.ascx.cs @@ -7,7 +7,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using Microsoft.AspNet.FriendlyUrls.Resolvers; -namespace Catalog.WebForms +namespace Microsoft.eShopOnContainers.Catalog.WebForms { public partial class ViewSwitcher : System.Web.UI.UserControl { diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/ViewSwitcher.ascx.designer.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/ViewSwitcher.ascx.designer.cs index e8e74556c..7cf9ae76d 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/ViewSwitcher.ascx.designer.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/ViewSwitcher.ascx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Catalog.WebForms { +namespace Microsoft.eShopOnContainers.Catalog.WebForms { public partial class ViewSwitcher {