Browse Source

Removing unnecessary references

Former-commit-id: 95844a4fa76b2edb1d2fc15bc483ca9efaa6c1fd
af/merge-core
James South 12 years ago
parent
commit
0183ccb9c5
  1. 36
      src/TestWebsites/WebForms/App_Start/BundleConfig.cs
  2. 20
      src/TestWebsites/WebForms/Bundle.config
  3. 1
      src/TestWebsites/WebForms/Global.asax.cs
  4. 41
      src/TestWebsites/WebForms/Site.Master
  5. 2
      src/TestWebsites/WebForms/Test_Website_Webforms.csproj
  6. 15
      src/TestWebsites/WebForms/Web.config
  7. 45
      src/TestWebsites/WebForms/config/imageprocessor/processing.config
  8. 20
      src/TestWebsites/WebForms/config/imageprocessor/security.config
  9. 3
      src/TestWebsites/WebForms/packages.config

36
src/TestWebsites/WebForms/App_Start/BundleConfig.cs

@ -1,36 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Optimization;
namespace Test_Website_Webforms_NET45
{
public class BundleConfig
{
// For more information on Bundling, visit http://go.microsoft.com/fwlink/?LinkId=254726
public static void RegisterBundles(BundleCollection bundles)
{
bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include(
"~/Scripts/WebForms/WebForms.js",
"~/Scripts/WebForms/WebUIValidation.js",
"~/Scripts/WebForms/MenuStandards.js",
"~/Scripts/WebForms/Focus.js",
"~/Scripts/WebForms/GridView.js",
"~/Scripts/WebForms/DetailsView.js",
"~/Scripts/WebForms/TreeView.js",
"~/Scripts/WebForms/WebParts.js"));
bundles.Add(new ScriptBundle("~/bundles/MsAjaxJs").Include(
"~/Scripts/WebForms/MsAjax/MicrosoftAjax.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxApplicationServices.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxTimer.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxWebForms.js"));
// Use the Development version of Modernizr to develop with and learn from. Then, when you’re
// ready for production, use the build tool at http://modernizr.com to pick only the tests you need
bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
"~/Scripts/modernizr-*"));
}
}
}

20
src/TestWebsites/WebForms/Bundle.config

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<bundles version="1.0">
<styleBundle path="~/Content/css">
<include path="~/Content/Site.css" />
</styleBundle>
<styleBundle path="~/Content/themes/base/css">
<include path="~/Content/themes/base/jquery.ui.core.css" />
<include path="~/Content/themes/base/jquery.ui.resizable.css" />
<include path="~/Content/themes/base/jquery.ui.selectable.css" />
<include path="~/Content/themes/base/jquery.ui.accordion.css" />
<include path="~/Content/themes/base/jquery.ui.autocomplete.css" />
<include path="~/Content/themes/base/jquery.ui.button.css" />
<include path="~/Content/themes/base/jquery.ui.dialog.css" />
<include path="~/Content/themes/base/jquery.ui.slider.css" />
<include path="~/Content/themes/base/jquery.ui.tabs.css" />
<include path="~/Content/themes/base/jquery.ui.datepicker.css" />
<include path="~/Content/themes/base/jquery.ui.progressbar.css" />
<include path="~/Content/themes/base/jquery.ui.theme.css" />
</styleBundle>
</bundles>

1
src/TestWebsites/WebForms/Global.asax.cs

@ -14,7 +14,6 @@ namespace Test_Website_Webforms_NET45
void Application_Start(object sender, EventArgs e) void Application_Start(object sender, EventArgs e)
{ {
// Code that runs on application startup // Code that runs on application startup
BundleConfig.RegisterBundles(BundleTable.Bundles);
RouteConfig.RegisterRoutes(RouteTable.Routes); RouteConfig.RegisterRoutes(RouteTable.Routes);
} }

41
src/TestWebsites/WebForms/Site.Master

@ -5,35 +5,11 @@
<head runat="server"> <head runat="server">
<meta charset="utf-8" /> <meta charset="utf-8" />
<title><%: Page.Title %> - My ASP.NET Application</title> <title><%: Page.Title %> - My ASP.NET Application</title>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<webopt:BundleReference runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<meta name="viewport" content="width=device-width" /> <meta name="viewport" content="width=device-width" />
<asp:ContentPlaceHolder runat="server" ID="HeadContent" /> <asp:ContentPlaceHolder runat="server" ID="HeadContent" />
</head> </head>
<body> <body>
<form runat="server"> <form runat="server">
<asp:ScriptManager runat="server">
<Scripts>
<%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=272931&clcid=0x409 --%>
<%--Framework Scripts--%>
<asp:ScriptReference Name="MsAjaxBundle" />
<asp:ScriptReference Name="WebForms.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebForms.js" />
<asp:ScriptReference Name="WebUIValidation.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebUIValidation.js" />
<asp:ScriptReference Name="MenuStandards.js" Assembly="System.Web" Path="~/Scripts/WebForms/MenuStandards.js" />
<asp:ScriptReference Name="GridView.js" Assembly="System.Web" Path="~/Scripts/WebForms/GridView.js" />
<asp:ScriptReference Name="DetailsView.js" Assembly="System.Web" Path="~/Scripts/WebForms/DetailsView.js" />
<asp:ScriptReference Name="TreeView.js" Assembly="System.Web" Path="~/Scripts/WebForms/TreeView.js" />
<asp:ScriptReference Name="WebParts.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebParts.js" />
<asp:ScriptReference Name="Focus.js" Assembly="System.Web" Path="~/Scripts/WebForms/Focus.js" />
<asp:ScriptReference Name="WebFormsBundle" />
<%--Site Scripts--%>
</Scripts>
</asp:ScriptManager>
<header> <header>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="float-left"> <div class="float-left">
@ -42,23 +18,6 @@
</p> </p>
</div> </div>
<div class="float-right"> <div class="float-right">
<section id="login">
<asp:LoginView runat="server" ViewStateMode="Disabled">
<AnonymousTemplate>
<ul>
<li><a id="registerLink" runat="server" href="~/Account/Register">Register</a></li>
<li><a id="loginLink" runat="server" href="~/Account/Login">Log in</a></li>
</ul>
</AnonymousTemplate>
<LoggedInTemplate>
<p>
Hello, <a runat="server" class="username" href="~/Account/Manage" title="Manage your account">
<asp:LoginName runat="server" CssClass="username" /></a>!
<asp:LoginStatus runat="server" LogoutAction="Redirect" LogoutText="Log off" LogoutPageUrl="~/" />
</p>
</LoggedInTemplate>
</asp:LoginView>
</section>
<nav> <nav>
<ul id="menu"> <ul id="menu">
<li><a runat="server" href="~/">Home</a></li> <li><a runat="server" href="~/">Home</a></li>

2
src/TestWebsites/WebForms/Test_Website_Webforms.csproj

@ -126,7 +126,6 @@
<Content Include="Web.config"> <Content Include="Web.config">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Content> </Content>
<Content Include="Bundle.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Scripts\_references.js" /> <None Include="Scripts\_references.js" />
@ -139,7 +138,6 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="About.aspx.cs"> <Compile Include="About.aspx.cs">
<DependentUpon>About.aspx</DependentUpon> <DependentUpon>About.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>ASPXCodeBehind</SubType>

15
src/TestWebsites/WebForms/Web.config

@ -8,9 +8,9 @@
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --> <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<sectionGroup name="imageProcessor"> <sectionGroup name="imageProcessor">
<section name="security" requirePermission="false" type="ImageProcessor.Web.Config.ImageSecuritySection, ImageProcessor.Web" /> <section name="security" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageSecuritySection, ImageProcessor.Web, Version=4.0.0.0, Culture=neutral" />
<section name="processing" requirePermission="false" type="ImageProcessor.Web.Config.ImageProcessingSection, ImageProcessor.Web" /> <section name="processing" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageProcessingSection, ImageProcessor.Web, Version=4.0.0.0, Culture=neutral" />
<section name="cache" requirePermission="false" type="ImageProcessor.Web.Config.ImageCacheSection, ImageProcessor.Web" /> <section name="cache" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageCacheSection, ImageProcessor.Web, Version=4.0.0.0, Culture=neutral" />
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<imageProcessor> <imageProcessor>
@ -25,16 +25,7 @@
<system.web> <system.web>
<compilation debug="true" targetFramework="4.5" /> <compilation debug="true" targetFramework="4.5" />
<httpRuntime targetFramework="4.5" /> <httpRuntime targetFramework="4.5" />
<pages>
<namespaces>
<add namespace="System.Web.Optimization" />
</namespaces>
<controls>
<add assembly="Microsoft.AspNet.Web.Optimization.WebForms" namespace="Microsoft.AspNet.Web.Optimization.WebForms" tagPrefix="webopt" />
</controls>
</pages>
<authentication mode="Forms"> <authentication mode="Forms">
<forms loginUrl="~/Account/Login" timeout="2880" defaultUrl="~/" />
</authentication> </authentication>
<profile defaultProvider="DefaultProfileProvider"> <profile defaultProvider="DefaultProfileProvider">
<providers> <providers>

45
src/TestWebsites/WebForms/config/imageprocessor/processing.config

@ -1,43 +1,42 @@
<?xml version="1.0" encoding="utf-8" ?> <processing preserveExifMetaData="false">
<processing>
<presets> <presets>
<!--<preset name="demo" value="width=300&#038;height=150&#038;bgcolor=transparent"/>-->
</presets> </presets>
<plugins autoLoadPlugins="true"> <plugins autoLoadPlugins="true">
<plugin name="Alpha" type="ImageProcessor.Processors.Alpha, ImageProcessor"/> <plugin name="Alpha" type="ImageProcessor.Web.Processors.Alpha, ImageProcessor.Web"/>
<plugin name="Brightness" type="ImageProcessor.Processors.Brightness, ImageProcessor"/> <plugin name="AutoRotate" type="ImageProcessor.Web.Processors.AutoRotate, ImageProcessor.Web"/>
<plugin name="Contrast" type="ImageProcessor.Processors.Contrast, ImageProcessor"/> <plugin name="BackgroundColor" type="ImageProcessor.Web.Processors.BackgroundColor, ImageProcessor.Web"/>
<plugin name="Crop" type="ImageProcessor.Processors.Crop, ImageProcessor"/> <plugin name="Brightness" type="ImageProcessor.Web.Processors.Brightness, ImageProcessor.Web"/>
<plugin name="Filter" type="ImageProcessor.Processors.Filter, ImageProcessor"/> <plugin name="Contrast" type="ImageProcessor.Web.Processors.Contrast, ImageProcessor.Web"/>
<plugin name="Flip" type="ImageProcessor.Processors.Flip, ImageProcessor"/> <plugin name="Crop" type="ImageProcessor.Web.Processors.Crop, ImageProcessor.Web"/>
<plugin name="Format" type="ImageProcessor.Processors.Format, ImageProcessor"/> <plugin name="Filter" type="ImageProcessor.Web.Processors.Filter, ImageProcessor.Web"/>
<plugin name="GaussianBlur" type="ImageProcessor.Processors.GaussianBlur, ImageProcessor"> <plugin name="Flip" type="ImageProcessor.Web.Processors.Flip, ImageProcessor.Web"/>
<plugin name="Format" type="ImageProcessor.Web.Processors.Format, ImageProcessor.Web"/>
<plugin name="GaussianBlur" type="ImageProcessor.Web.Processors.GaussianBlur, ImageProcessor.Web">
<settings> <settings>
<setting key="MaxSize" value="22"/> <setting key="MaxSize" value="22"/>
<setting key="MaxSigma" value="5.1"/> <setting key="MaxSigma" value="5.1"/>
<setting key="MaxThreshold" value="100"/> <setting key="MaxThreshold" value="100"/>
</settings> </settings>
</plugin> </plugin>
<plugin name="GaussianSharpen" type="ImageProcessor.Processors.GaussianSharpen, ImageProcessor"> <plugin name="GaussianSharpen" type="ImageProcessor.Web.Processors.GaussianSharpen, ImageProcessor.Web">
<settings> <settings>
<setting key="MaxSize" value="22"/> <setting key="MaxSize" value="22"/>
<setting key="MaxSigma" value="5.1"/> <setting key="MaxSigma" value="5.1"/>
<setting key="MaxThreshold" value="100"/> <setting key="MaxThreshold" value="100"/>
</settings> </settings>
</plugin> </plugin>
<plugin name="Quality" type="ImageProcessor.Processors.Quality, ImageProcessor"/> <plugin name="Quality" type="ImageProcessor.Web.Processors.Quality, ImageProcessor.Web"/>
<plugin name="Resize" type="ImageProcessor.Processors.Resize, ImageProcessor"> <plugin name="Resize" type="ImageProcessor.Web.Processors.Resize, ImageProcessor.Web">
<settings> <settings>
<setting key="MaxWidth" value="3000"/> <setting key="MaxWidth" value="5000"/>
<setting key="MaxHeight" value="3000"/> <setting key="MaxHeight" value="5000"/>
<!--<setting key="RestrictTo" value="width=300height=300,width=300height=300"/>-->
</settings> </settings>
</plugin> </plugin>
<plugin name="Rotate" type="ImageProcessor.Processors.Rotate, ImageProcessor"/> <plugin name="Rotate" type="ImageProcessor.Web.Processors.Rotate, ImageProcessor.Web"/>
<plugin name="RoundedCorners" type="ImageProcessor.Processors.RoundedCorners, ImageProcessor"/> <plugin name="RoundedCorners" type="ImageProcessor.Web.Processors.RoundedCorners, ImageProcessor.Web"/>
<plugin name="Saturation" type="ImageProcessor.Processors.Saturation, ImageProcessor"/> <plugin name="Saturation" type="ImageProcessor.Web.Processors.Saturation, ImageProcessor.Web"/>
<plugin name="Vignette" type="ImageProcessor.Processors.Vignette, ImageProcessor"/> <plugin name="Tint" type="ImageProcessor.Web.Processors.Tint, ImageProcessor.Web"/>
<plugin name="Watermark" type="ImageProcessor.Processors.Watermark, ImageProcessor"/> <plugin name="Vignette" type="ImageProcessor.Web.Processors.Vignette, ImageProcessor.Web"/>
<plugin name="Watermark" type="ImageProcessor.Web.Processors.Watermark, ImageProcessor.Web"/>
</plugins> </plugins>
</processing> </processing>

20
src/TestWebsites/WebForms/config/imageprocessor/security.config

@ -1,7 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<security allowRemoteDownloads="true" timeout="300000" maxBytes="524288" remotePrefix="/remote.axd"> <security allowRemoteDownloads="true" timeout="300000" maxBytes="524288" remotePrefix="/remote.axd">
<whiteList> <whiteList>
<add url="http://images.mymovies.net"/> <add url="images.mymovies.net"/>
<add url="http://maps.googleapis.com" extensionLess="true" imageFormat=".png"/> <add url="http://maps.googleapis.com" extensionLess="true" imageFormat=".png"/>
</whiteList> <add url="fbcdn"/>
</security> <add url="http://fbcdn-profile-"/>
<add url="https://profile."/>
<add url="http://profile."/>
<add url="https://pbs.twimg.com"/>
<add url="http://pbs.twimg.com"/>
<add url="http://placekitten.com"/>
<add url="http://hanselminutes.com/"/>
</whiteList>
</security>

3
src/TestWebsites/WebForms/packages.config

@ -6,9 +6,6 @@
<package id="Microsoft.AspNet.Providers.LocalDB" version="1.1" targetFramework="net45" /> <package id="Microsoft.AspNet.Providers.LocalDB" version="1.1" targetFramework="net45" />
<package id="Microsoft.AspNet.ScriptManager.MSAjax" version="4.5.6" targetFramework="net45" /> <package id="Microsoft.AspNet.ScriptManager.MSAjax" version="4.5.6" targetFramework="net45" />
<package id="Microsoft.AspNet.ScriptManager.WebForms" version="4.5.6" targetFramework="net45" /> <package id="Microsoft.AspNet.ScriptManager.WebForms" version="4.5.6" targetFramework="net45" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Web.Optimization.WebForms" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" /> <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Modernizr" version="2.6.2" targetFramework="net45" /> <package id="Modernizr" version="2.6.2" targetFramework="net45" />
<package id="WebGrease" version="1.1.0" targetFramework="net45" />
</packages> </packages>
Loading…
Cancel
Save