Merge branch 'release/v0.4'

MrCMS · Jun 15, 2015 · e7a6f85 · e7a6f85
2 parents 622d930 + e7c28aa
commit e7a6f85
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/MrCMS Ecommerce.sln b/MrCMS Ecommerce.sln
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MrCMS.Web", "MrCMS.Web\MrCMS.Web.csproj", "{E64F6811-8373-4310-9CCE-3FBCA0D87826}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{0F690EEC-BB1B-4916-BA16-682D9D7A7A19}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MrCMS.Tests", "MrCMS.Tests\MrCMS.Tests.csproj", "{A0C47EBA-BAF0-43B8-A40A-D8D406E44525}"
@@ -15,8 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sites", "Sites", "{EB0C74A8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{B7896D36-E008-46A6-877E-939F00D09DD1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MrCMS.Web", "MrCMS.Web\MrCMS.Web.csproj", "{E64F6811-8373-4310-9CCE-3FBCA0D87826}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MrCMS.AmazonApp.Tests", "MrCMS.AmazonApp.Tests\MrCMS.AmazonApp.Tests.csproj", "{119C4D4B-B7D3-4E7F-AACF-E1AAF2EB39F0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MrCMS.EcommerceApp.Tests", "MrCMS.EcommerceApp.Tests\MrCMS.EcommerceApp.Tests.csproj", "{A8A0A220-6389-4A38-9D8D-189D52A9C347}"

diff --git a/MrCMS.Web/MrCMS.Web.csproj b/MrCMS.Web/MrCMS.Web.csproj
@@ -4409,8 +4409,6 @@
     <Content Include="Areas\Admin\Views\Widget\Delete.cshtml" />
     <Content Include="Areas\Admin\Views\Widget\Edit.cshtml" />
     <Content Include="Areas\Admin\Views\_ViewStart.cshtml" />
-    <None Include="Properties\PublishProfiles\Default Settings.pubxml" />
-    <None Include="Properties\PublishProfiles\ecommerce-test.pubxml" />
     <None Include="Properties\PublishProfiles\new.pubxml" />
     <Content Include="Themes\Ecommerce\Apps\Core\Views\Shared\_TwoColumn.cshtml" />
     <Content Include="Themes\Ecommerce\Apps\Core\Views\Web.config" />

diff --git a/MrCMS.Web/Properties/PublishProfiles/new.pubxml b/MrCMS.Web/Properties/PublishProfiles/new.pubxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>C:\temp\mrcms</publishUrl>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+  </PropertyGroup>
+</Project>