yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes namespace issues when changing default namesapce to Umbraco.Web as the autogen

Browse Source 
classes namespaces were changed.
Removed post build and custom targets from Umbraco.Web
This commit is contained in:
shannon@ShandemVaio
2012-07-19 02:19:32 +06:00
parent 2e8ab316fe
commit 6e459a3afb
6 changed files with 7 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/Umbraco.Web/Singleton.cs
View File

@@ -1,49 +0,0 @@
using System;
/// <changelog>
/// <item who="Esben" when="17. november 2006">Created</item>
/// </changelog>
namespace umbraco
{
/// <summary>
///
/// Threadsafe Singleton best practice design pattern template
///
/// Sample:
///
/// public class Demo
/// {
/// public static Form1 instance1
/// {
/// get
/// {
/// return Singleton<Form1>.Instance;
/// }
/// }
/// }
/// </summary>
/// <typeparam name="T">Any class that implements default constructor</typeparam>
public sealed class Singleton<T> where T : new()
{
private Singleton()
{
}
public static T Instance
{
get { return Nested.instance; }
}
private class Nested
{
// Explicit static constructor to tell C# compiler
// not to mark type as beforefieldinit
static Nested()
{
}
internal static readonly T instance = new T();
}
}
}

6
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -2059,14 +2059,12 @@
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>xcopy "$(ProjectDir)"..\..\lib\SQLCE4\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /D
xcopy "$(ProjectDir)"..\..\lib\SQLCE4\x86\*.* "$(TargetDir)x86\" /Y /F /E /D</PostBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<ProjectExtensions />
<Import Project="$(MSBuildStartupDirectory)\..\src\umbraco.presentation.targets" Condition="$(BuildingInsideVisualStudio) != true" />
<Import Project="$(SolutionDir)umbraco.presentation.targets" Condition="$(BuildingInsideVisualStudio) == true" />
<PropertyGroup>
<!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
</PropertyGroup>

3
src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs
View File

@@ -13,7 +13,8 @@
//
#pragma warning disable 1591
namespace Umbraco.Web.org.umbraco.update {
namespace umbraco.presentation.org.umbraco.update
{
using System;
using System.Web.Services;
using System.Diagnostics;

2
src/Umbraco.Web/Web References/org.umbraco.update/UpgradeResult1.datasource
View File

@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="UpgradeResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>Umbraco.Web.org.umbraco.update.UpgradeResult, Web References.org.umbraco.update.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
<TypeInfo>umbraco.presentation.org.umbraco.update.UpgradeResult, Web References.org.umbraco.update.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

2
src/Umbraco.Web/umbraco/developer/Xslt/xsltVisualize.aspx.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using umbraco.presentation.umbraco.templateControls;
using System.Text;
using System.Xml;
using System.IO;

2
src/Umbraco.Web/umbraco/templateControls/ItemRenderer.cs
View File

@@ -6,10 +6,10 @@ using System.Text;
using System.Web;
using System.Web.UI;
using System.Xml;
using Umbraco.Web.umbraco.templateControls;
using umbraco.cms.businesslogic;
using umbraco.cms.businesslogic.property;
using umbraco.cms.businesslogic.web;
using umbraco.presentation.umbraco.templateControls;
using umbraco.IO;
namespace umbraco.presentation.templateControls