Cleaned up solution configurations. Enabled nuget package restore.

prolee · May 9, 2012 · 3f9675a · 3f9675a
1 parent b6fb1b4
commit 3f9675a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 30 deletions.
diff --git a/SeeGit.sln b/SeeGit.sln
@@ -15,33 +15,17 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Debug|x86.ActiveCfg = Debug|x86
-		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Debug|x86.Build.0 = Debug|x86
-		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Release|Any CPU.ActiveCfg = Release|x86
-		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Release|Mixed Platforms.Build.0 = Release|x86
-		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Release|x86.ActiveCfg = Release|x86
-		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Release|x86.Build.0 = Release|x86
+		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{455C90CF-CB4E-41FB-8DB8-04AD1B104F64}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AC22554C-AC27-42A3-91FA-16D49BBC0A4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC22554C-AC27-42A3-91FA-16D49BBC0A4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC22554C-AC27-42A3-91FA-16D49BBC0A4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AC22554C-AC27-42A3-91FA-16D49BBC0A4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AC22554C-AC27-42A3-91FA-16D49BBC0A4D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{AC22554C-AC27-42A3-91FA-16D49BBC0A4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC22554C-AC27-42A3-91FA-16D49BBC0A4D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC22554C-AC27-42A3-91FA-16D49BBC0A4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AC22554C-AC27-42A3-91FA-16D49BBC0A4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AC22554C-AC27-42A3-91FA-16D49BBC0A4D}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/SeeGitApp/Models/CommitVertex.cs b/SeeGitApp/Models/CommitVertex.cs
@@ -54,6 +54,11 @@ public bool HasBranches
             }
         }
 
+        public override bool Equals(object obj)
+        {
+            return this.Equals(obj as CommitVertex);
+        }
+
         public override bool Equals(CommitVertex other)
         {
             if(ReferenceEquals(null, other))

diff --git a/SeeGitApp/SeeGitApp.csproj b/SeeGitApp/SeeGitApp.csproj
@@ -17,25 +17,26 @@
     <WarningLevel>4</WarningLevel>
     <Utf8Output>true</Utf8Output>
     <ExpressionBlendVersion>4.0.30816.0</ExpressionBlendVersion>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="GraphSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -169,6 +170,7 @@ xcopy /s /y "$(SolutionDir)packages\LibGit2Sharp.0.8\NativeBinaries\x86\*.*" "$(
 if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
 xcopy /s /y "$(SolutionDir)packages\LibGit2Sharp.0.8\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
   </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- 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">

diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
@@ -12,6 +12,8 @@
     <AssemblyName>UnitTests</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,6 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <RunXUnitTests>true</RunXUnitTests>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,6 +33,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="GraphSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -85,4 +89,5 @@
   <Target Name="AfterBuild">
     <xunit Assembly="$(OutDir)$(TargetName)$(TargetExt)" Condition="$(RunXUnitTests)==true" />
   </Target>
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
 </Project>