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:
Shannon Deminick
2013-01-08 02:00:16 +03:00
parent 3570ba4b95 3f5e20ca0e
commit 9c5def35ee
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,15 +119,15 @@
</Reference>
<Reference Include="Our.Umbraco.uGoLive, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\uGoLive.1.0.0\lib\Our.Umbraco.uGoLive.dll</HintPath>
<HintPath>..\packages\uGoLive.1.3.0\lib\Our.Umbraco.uGoLive.dll</HintPath>
</Reference>
<Reference Include="Our.Umbraco.uGoLive.47x, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\uGoLive.1.0.0\lib\Our.Umbraco.uGoLive.47x.dll</HintPath>
<HintPath>..\packages\uGoLive.1.3.0\lib\Our.Umbraco.uGoLive.47x.dll</HintPath>
</Reference>
<Reference Include="Our.Umbraco.uGoLive.Checks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\uGoLive.1.0.0\lib\Our.Umbraco.uGoLive.Checks.dll</HintPath>
<HintPath>..\packages\uGoLive.1.3.0\lib\Our.Umbraco.uGoLive.Checks.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>

2
src/Umbraco.Web.UI/packages.config
View File

@@ -10,6 +10,6 @@
<package id="Microsoft.Web.Helpers" version="1.0.0" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="SqlServerCE" version="4.0.0.0" targetFramework="net40" />
<package id="uGoLive" version="1.0.0" targetFramework="net40" />
<package id="uGoLive" version="1.3.0" targetFramework="net40" />
<package id="UrlRewritingNet.UrlRewriter" version="2.0.60829.1" targetFramework="net40" />
</packages>

1
src/Umbraco.Web.UI/web.Template.Release.config
View File

@@ -19,7 +19,6 @@
</appSettings>
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<trust xdt:Transform="Remove"/>
<trace enabled="false" xdt:Transform="SetAttributes(enabled)" />
<customErrors mode="RemoteOnly" xdt:Transform="SetAttributes(mode)">

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

@@ -126,15 +126,15 @@
</Reference>
<Reference Include="Our.Umbraco.uGoLive, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\uGoLive.1.0.0\lib\Our.Umbraco.uGoLive.dll</HintPath>
<HintPath>..\packages\uGoLive.1.3.0\lib\Our.Umbraco.uGoLive.dll</HintPath>
</Reference>
<Reference Include="Our.Umbraco.uGoLive.47x, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\uGoLive.1.0.0\lib\Our.Umbraco.uGoLive.47x.dll</HintPath>
<HintPath>..\packages\uGoLive.1.3.0\lib\Our.Umbraco.uGoLive.47x.dll</HintPath>
</Reference>
<Reference Include="Our.Umbraco.uGoLive.Checks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\uGoLive.1.0.0\lib\Our.Umbraco.uGoLive.Checks.dll</HintPath>
<HintPath>..\packages\uGoLive.1.3.0\lib\Our.Umbraco.uGoLive.Checks.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>

2
src/Umbraco.Web/packages.config
View File

@@ -11,7 +11,7 @@
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
<package id="uGoLive" version="1.0.0" targetFramework="net40" />
<package id="uGoLive" version="1.3.0" targetFramework="net40" />
<package id="UmbracoExamine" version="0.1.42.2941" targetFramework="net40" />
<package id="UrlRewritingNet.UrlRewriter" version="2.0.60829.1" targetFramework="net40" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net40" />