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

Merge

Browse Source
This commit is contained in:
sebastiaan
2012-09-19 06:20:09 -02:00
parent 71b2137513 0dbd214b00
commit 278c1fefaa
2 changed files with 0 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
src/umbraco.MacroEngines/umbraco.MacroEngines.csproj.orig
View File

@@ -1,179 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{89C09045-1064-466B-B94A-DB3AFE2A5853}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>umbraco.MacroEngines</RootNamespace>
<AssemblyName>umbraco.MacroEngines</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
<SccLocalPath>
</SccLocalPath>
<SccAuxPath>
</SccAuxPath>
<SccProvider>
</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<<<<<<< local
<Reference Include="Examine">
=======
<Reference Include="Examine, Version=0.1.41.2941, Culture=neutral, processorArchitecture=MSIL">
>>>>>>> other
<HintPath>..\foreign dlls\Examine.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.3.0.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<HintPath>..\foreign dlls\HtmlAgilityPack.dll</HintPath>
</Reference>
<Reference Include="Lucene.Net">
<HintPath>..\foreign dlls\Lucene.Net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\foreign dlls\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>..\foreign dlls\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>..\foreign dlls\WebPages\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
<<<<<<< local
<Reference Include="UmbracoExamine">
=======
<Reference Include="UmbracoExamine, Version=0.1.41.2941, Culture=neutral, processorArchitecture=MSIL">
>>>>>>> other
<HintPath>..\foreign dlls\UmbracoExamine.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="RazorCore\BaseContext.cs" />
<Compile Include="RazorDataTypeModels\HtmlStringDataTypeModel.cs" />
<Compile Include="RazorDataTypeModels\IntegerDataTypeModel.cs" />
<Compile Include="RazorDynamicNode\DynamicBackingItem.cs" />
<Compile Include="RazorDynamicNode\DynamicBackingItemType.cs" />
<Compile Include="RazorDynamicNode\DynamicGrouping.cs" />
<Compile Include="RazorDynamicNode\DynamicMedia.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RazorDynamicNode\DynamicMediaList.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RazorDynamicNode\DynamicNodeIdEqualityComparer.cs" />
<Compile Include="RazorDynamicNode\DynamicNodeList.cs" />
<Compile Include="RazorDynamicNode\ExamineBackedMedia.cs" />
<Compile Include="RazorDynamicNode\Grouping.cs" />
<Compile Include="RazorDynamicNode\HtmlTagWrapper.cs" />
<Compile Include="RazorDynamicNode\HtmlTagWrapperBase.cs" />
<Compile Include="RazorDynamicNode\HtmlTagWrapperTextNode.cs" />
<Compile Include="RazorDynamicNode\IRazorDataTypeModel.cs" />
<Compile Include="RazorDynamicNode\PropertyResult.cs" />
<Compile Include="RazorDynamicNode\RazorDataTypeModel.cs" />
<Compile Include="RazorDynamicNode\RazorLibraryCore.cs" />
<Compile Include="RazorDynamicNode\DynamicNodeWalker.cs" />
<Compile Include="RazorDynamicNode\DynamicNull.cs" />
<Compile Include="RazorDynamicNode\DynamicQueryable.cs" />
<Compile Include="RazorDynamicNode\DynamicXml.cs" />
<Compile Include="RazorDynamicNode\ExtensionMethodFinder.cs" />
<Compile Include="RazorDynamicNode\ExtensionMethods.cs" />
<Compile Include="RazorCore\RazorUmbracoFactory.cs" />
<Compile Include="RazorCore\RazorUmbracoHost.cs" />
<Compile Include="RazorCore\UmbracoCultureDictionary.cs" />
<Compile Include="RazorDynamicNode\DynamicDictionary.cs" />
<Compile Include="RazorDynamicNode\DynamicNodeListOrdering.cs" />
<Compile Include="RazorDynamicNode\DynamicQueryableBinders.cs" />
<Compile Include="RazorDynamicNode\DynamicNode.cs" />
<Compile Include="RazorDynamicNode\DynamicNodeContext.cs" />
<Compile Include="RazorCore\ICultureDictionary.cs" />
<Compile Include="RazorCore\IMacroContext.cs" />
<Compile Include="RazorCore\IParameterDictionary.cs" />
<Compile Include="RazorCore\UmbracoParameterDictionary.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RazorCore\RazorBuildProvider.cs" />
<Compile Include="RazorCore\RazorMacroEngine.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\components\editorControls\umbraco.editorControls.csproj">
<Project>{255F5DF1-4E43-4758-AC05-7A0B68EB021B}</Project>
<Name>umbraco.editorControls</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco\businesslogic\umbraco.businesslogic.csproj">
<Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
<Name>umbraco.businesslogic</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco\cms\umbraco.cms.csproj">
<Project>{CCD75EC3-63DB-4184-B49D-51C1DD337230}</Project>
<Name>umbraco.cms</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco\datalayer\umbraco.datalayer.csproj">
<Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
<Name>umbraco.datalayer</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco\interfaces\umbraco.interfaces.csproj">
<Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
<Name>umbraco.interfaces</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco\presentation\umbraco.presentation.csproj">
<Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
<Name>umbraco.presentation</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="App.Config">
<SubType>Designer</SubType>
</None>
</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>
</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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

43
src/umbraco.presentation/web.Template.PeterGregory-PC.Debug.config
View File

@@ -1,43 +0,0 @@
<?xml version="1.0"?>
<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
finds an atrribute "name" that has a value of "MyDB".
<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<appSettings>
<add xdt:Transform="Replace" xdt:Locator="Match(key)" key="umbracoDbDSN"
value="server=localhost;database=4.8.dev;user id=sa;password=password!"/>
<add xdt:Transform="Replace" xdt:Locator="Match(key)" key="umbracoConfigurationStatus"
value="4.8.1"/>
<add xdt:Transform="Replace" xdt:Locator="Match(key)" key="umbracoContentXML"
value="~/App_Data/umbraco.config"/>
<add xdt:Transform="Replace" xdt:Locator="Match(key)" key="umbracoStorageDirectory"
value="~/App_Data"/>
</appSettings>
<system.web>
<compilation debug="true" xdt:Transform="SetAttributes(debug)" />
<!--
In the example below, the "Replace" transform will replace the entire
<customErrors> section of your web.config file.
Note that because there is only one customErrors section under the
<system.web> node, there is no need to use the "xdt:Locator" attribute.
<customErrors defaultRedirect="GenericError.htm"
mode="RemoteOnly" xdt:Transform="Replace">
<error statusCode="500" redirect="InternalError.htm"/>
</customErrors>
-->
</system.web>
</configuration>