Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Worked out some coflicts with merge

  • Loading branch information...
commit 9e1e2bbf31a3b181937d74f9da165c93dff2e90a 1 parent 505218e
@gravypower gravypower authored
View
11 Sites/Sitecore/Glass.Mapper.Sites.Sc.Tds/Glass.Mapper.Sites.Sc.Tds.scproj
@@ -35,7 +35,16 @@
<OutputPath>.\Release\</OutputPath>
<RecursiveDeployAction>Ignore</RecursiveDeployAction>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Debug - Aaron' ">
+ <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>.\Debug\</OutputPath>
+ <RecursiveDeployAction>Ignore</RecursiveDeployAction>
+ <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>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)' == 'Debug - Aaron' ">
<DebugSymbols>true</DebugSymbols>
<RecursiveDeployAction>Ignore</RecursiveDeployAction>
<SitecoreDeployFolder>C:\Git\Glass.Mapper\Sites\Sitecore\Glass.Mapper.Sites.Sc</SitecoreDeployFolder>
View
11 Tests/Integration Tests/Sitecore/Glass.Mapper.Sc.Integration.Tds/Glass.Mapper.Sc.Integration.Tds.scproj
@@ -37,7 +37,16 @@
<OutputPath>.\Release\</OutputPath>
<RecursiveDeployAction>Ignore</RecursiveDeployAction>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Debug - Aaron' ">
+ <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>.\Debug\</OutputPath>
+ <RecursiveDeployAction>Ignore</RecursiveDeployAction>
+ <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>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)' == 'Debug - Aaron' ">
<DebugSymbols>true</DebugSymbols>
<RecursiveDeployAction>Ignore</RecursiveDeployAction>
<SitecoreDeployFolder>C:\Git\Glass.Mapper\Tests\Integration Tests\Sitecore\Glass.Mapper.Sc.Integration</SitecoreDeployFolder>
View
9 Tests/Integration Tests/Sitecore/Glass.Mapper.Sc.Integration/Glass.Mapper.Sc.Integration.csproj
@@ -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="Castle.Core, Version=3.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
View
2  Tests/Integration Tests/Sitecore/Glass.Mapper.Sc.Integration/SetupSitecoreForTesting.cs
@@ -1,4 +1,4 @@
-#if NCRUNCH
+#if NCRUNCH
#else
using NUnit.Framework;
View
9 Tests/Unit Tests/Glass.Mapper.Sc.Tests/Glass.Mapper.Sc.Tests.csproj
@@ -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>
View
9 Tests/Unit Tests/Glass.Mapper.Umb.Tests/Glass.Mapper.Umb.Tests.csproj
@@ -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="FluentAssertions">
<HintPath>..\..\..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
Please sign in to comment.
Something went wrong with that request. Please try again.