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

Fixed DLL references, fixed build location on editorControls. NOTE: need to get the build.bat working with the circular dependency projects to get their DLLs and assets into the output build.

Browse Source
This commit is contained in:
shannon@ShandemVaio.home
2012-06-27 09:07:24 +04:00
parent b058855fe5
commit 5ae9a60954
8 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SHANDEMVAIO.testrunconfig
View File

@@ -4,7 +4,7 @@
<Execution>
<Hosts type="ASP.NET" skipUnhostableTests="false">
<AspNet name="ASP.NET" executionType="WebDev" urlToTest="http://localhost:59454/">
<DevelopmentServer pathToWebSite="C:\Users\Shannon\Documents\Visual Studio 2008\Projects\Umbraco\Branch-4.1\umbraco\presentation" webApplicationRoot="/" />
<DevelopmentServer pathToWebSite="C:\Users\shannon\Documents\~Jobs\Umbraco4\src\umbraco.presentation" webApplicationRoot="/" />
</AspNet>
</Hosts>
<TestTypeSpecific>

10
src/SHOCKING.testrunconfig
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TestRunConfiguration name="SHOCKING" id="0317effe-25fb-4c40-99c3-8529bdb6b284" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
<Description>This is a default test run configuration for a local test run.</Description>
<Hosts type="ASP.NET" skipUnhostableTests="false">
<AspNet name="ASP.NET" executionType="WebDev" urlToTest="http://localhost:59454/">
<DevelopmentServer pathToWebSite="D:\~CODEPLEXPROJECTS\Umbraco\branches\4.1\umbraco\presentation" webApplicationRoot="/" />
</AspNet>
</Hosts>
<TestTypeSpecific />
</TestRunConfiguration>

17
src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
View File

@@ -43,7 +43,7 @@
<HintPath>..\..\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.3.0.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<HintPath>..\lib\HtmlAgilityPack.dll</HintPath>
<HintPath>..\..\lib\HtmlAgilityPack.dll</HintPath>
</Reference>
<Reference Include="Lucene.Net">
<HintPath>..\..\lib\Lucene.Net.dll</HintPath>
@@ -55,15 +55,15 @@
<Reference Include="System.Web" />
<Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\WebPages\System.Web.Razor.dll</HintPath>
<HintPath>..\..\lib\WebPages\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\WebPages\System.Web.WebPages.dll</HintPath>
<HintPath>..\..\lib\WebPages\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\WebPages\System.Web.WebPages.Razor.dll</HintPath>
<HintPath>..\..\lib\WebPages\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="Microsoft.CSharp" />
@@ -154,13 +154,8 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>if $(ConfigurationName) == Debug goto :debug
goto :exit
:debug
xcopy "$(ProjectDir)bin\debug\umbraco.MacroEngines.*" "$(ProjectDir)..\umbraco.presentation\bin\" /Y/F
:exit</PostBuildEvent>
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\umbraco.presentation\bin\" /Y /F
</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

21
src/umbraco.editorControls/umbraco.editorControls.csproj
View File

@@ -55,7 +55,7 @@
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\umbraco\presentation\bin\</OutputPath>
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -79,7 +79,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>..\..\umbraco\presentation\bin\</OutputPath>
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -134,14 +134,16 @@
<Name>System.Windows.Forms</Name>
</Reference>
<ProjectReference Include="..\umbraco.businesslogic\umbraco.businesslogic.csproj">
<Name>umbraco.businesslogic</Name>
<Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Name>umbraco.businesslogic</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco.cms\umbraco.cms.csproj">
<Name>umbraco.cms</Name>
<Project>{CCD75EC3-63DB-4184-B49D-51C1DD337230}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Name>umbraco.cms</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
<Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
<Name>umbraco.controls</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
<Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
@@ -160,10 +162,6 @@
<Project>{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}</Project>
<Name>umbraco.macroRenderings</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
<Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
<Name>umbraco.controls</Name>
</ProjectReference>
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
@@ -485,7 +483,6 @@
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\umbraco.presentation\bin\" /Y /F</PostBuildEvent>
</PropertyGroup>
</Project>

4
src/umbraco.presentation/web.config
View File

@@ -91,7 +91,7 @@
<system.web>
<httpRuntime requestValidationMode="2.0" />
<customErrors mode="Off" />
<trace enabled="false" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
<trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
<sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
<globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
<xhtmlConformance mode="Strict" />
@@ -129,7 +129,7 @@
<add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
</httpHandlers>
<compilation defaultLanguage="c#" batch="false">
<compilation defaultLanguage="c#" debug="true" batch="false">
<assemblies>
<!-- ASPNETAJAX -->
<add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />

1
src/umbraco.sln
View File

@@ -4,7 +4,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
INDIGO64.testrunconfig = INDIGO64.testrunconfig
SHANDEMVAIO.testrunconfig = SHANDEMVAIO.testrunconfig
SHOCKING.testrunconfig = SHOCKING.testrunconfig
umbraco2.vsmdi = umbraco2.vsmdi
UMBRACOELISE.testrunconfig = UMBRACOELISE.testrunconfig
UMBRACOHUMMER.testrunconfig = UMBRACOHUMMER.testrunconfig

3
src/umbraco.webservices/umbraco.webservices.csproj
View File

@@ -160,6 +160,7 @@
</Target>
-->
<PropertyGroup>
<PostBuildEvent>xcopy "$(ProjectDir)*.asmx" "$(ProjectDir)..\umbraco.presentation\umbraco\webservices\api\" /Y</PostBuildEvent>
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\umbraco.presentation\bin\" /Y /F
xcopy "$(ProjectDir)*.asmx" "$(SolutionDir)\umbraco.presentation\umbraco\webservices\api\" /Y /F</PostBuildEvent>
</PropertyGroup>
</Project>