Permalink
Browse files

Working out conflicts

  • Loading branch information...
1 parent c057f29 commit d38a9262675fdb19ed28107e3199d9521ec02951 @gravypower gravypower committed Jan 11, 2013
View
@@ -104,6 +104,8 @@ Global
{728CF1A7-0F06-4464-B434-33A982D97C82}.Release|Any CPU.Build.0 = Release|Any CPU
{38DB0F01-9232-45BE-BC14-8DEDB738D538}.Debug - Aaron|Any CPU.ActiveCfg = Debug|Any CPU
{38DB0F01-9232-45BE-BC14-8DEDB738D538}.Debug - Aaron|Any CPU.Build.0 = Debug|Any CPU
+ {38DB0F01-9232-45BE-BC14-8DEDB738D538}.Debug - Aaron|Any CPU.ActiveCfg = Debug - Aaron|Any CPU
+ {38DB0F01-9232-45BE-BC14-8DEDB738D538}.Debug - Aaron|Any CPU.Build.0 = Debug - Aaron|Any CPU
{38DB0F01-9232-45BE-BC14-8DEDB738D538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{38DB0F01-9232-45BE-BC14-8DEDB738D538}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38DB0F01-9232-45BE-BC14-8DEDB738D538}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -44,6 +44,12 @@
<InstallSitecoreConnector>True</InstallSitecoreConnector>
<OutputPath>.\Debug - Aaron\</OutputPath>
</PropertyGroup>
+ <SitecoreDeployFolder>F:\Glass\Glass.Mapper\Sites\Sitecore\Glass.Mapper.Sites.Sc</SitecoreDeployFolder>
+ <SitecoreWebUrl>http://sitecore.glass.com</SitecoreWebUrl>
+ <SitecoreAccessGuid>fd21ce01-25b5-4388-a335-6211a7a211b9</SitecoreAccessGuid>
+ <InstallSitecoreConnector>True</InstallSitecoreConnector>
+ <OutputPath>bin\Debug - Aaron\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<AssemblyAttributes Include="AssemblyFileVersion">
<Value>$(AssemblyFileVersion)</Value>
@@ -98,4 +104,4 @@
</SitecoreItem>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\HedgehogDevelopment\SitecoreProject\v9.0\HedgehogDevelopment.SitecoreProject.targets" />
-</Project>
+</Project>
@@ -46,6 +46,12 @@
<InstallSitecoreConnector>True</InstallSitecoreConnector>
<OutputPath>.\Debug - Aaron\</OutputPath>
</PropertyGroup>
+ <SitecoreDeployFolder>F:\Glass\Glass.Mapper\Sites\Sitecore\Glass.Mapper.Sites.Sc</SitecoreDeployFolder>
+ <SitecoreWebUrl>http://sitecore.glass.com</SitecoreWebUrl>
+ <SitecoreAccessGuid>fd21ce01-25b5-4388-a335-6211a7a211b9</SitecoreAccessGuid>
+ <InstallSitecoreConnector>True</InstallSitecoreConnector>
+ <OutputPath>bin\Debug - Aaron\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<AssemblyAttributes Include="AssemblyFileVersion">
<Value>$(AssemblyFileVersion)</Value>
@@ -13,6 +13,7 @@ namespace Glass.Mapper.Sc.Integration
public class SetupSitecoreForTesting
{
//[SetUp]
+
public void DeployTestItems()
{
//We need to locate the TDS project that contains our test configuration. We are assuming its folder is a sibling of the project folder and we are in the /bin/[config] folder
@@ -32,6 +32,15 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug - Aaron|AnyCPU'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\Debug - Aaron\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="NSubstitute, Version=1.4.3.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

0 comments on commit d38a926

Please sign in to comment.