Merge pull request #14 from camalot/feature/tests-revamp

feature/tests-revamp -> develop
camalot · Apr 16, 2016 · d1791a5 · d1791a5
2 parents 552531c + bbb039b
commit d1791a5
Show file tree

Hide file tree

Showing 105 changed files with 2,931 additions and 2,485 deletions.
diff --git a/.appveyor/DeployCodePlex.msbuild b/.appveyor/DeployCodePlex.msbuild
@@ -23,7 +23,7 @@
 		<ReleaseTimeout>120</ReleaseTimeout>
 		<UploadTimeout>1200</UploadTimeout>
 
-		<ChangeLogFile>$(MSBuildProjectDirectory)\..\.build\publish-changelog.txt</ChangeLogFile>
+		<ChangeLogFile>$(MSBuildProjectDirectory)\..\.build\publishChangelog.txt</ChangeLogFile>
 		<ReleaseInfoFile>$(MSBuildProjectDirectory)\codeplex-release.txt</ReleaseInfoFile>
 	</PropertyGroup>
 
@@ -105,6 +105,7 @@
 		<Exec Command="appveyor SetVariable -Name CP_RELEASE_ID -Value &quot;$(ReleaseId)&quot;" Condition=" '$(APPVEYOR)' == 'True' AND '$(Platform)' == 'x86' AND '$(ReleaseId)' != '' " />
 		<Exec Command="appveyor SetVariable -Name CP_RELEASE_URL -Value &quot;$(ReleaseUrl)&quot;" Condition=" '$(APPVEYOR)' == 'True' AND '$(Platform)' == 'x86' AND '$(ReleaseUrl)' != '' " />
 		<Exec Command="appveyor SetVariable -Name CP_RELEASE_PROJECT -Value &quot;$(CodePlexProject)&quot;" Condition=" '$(APPVEYOR)' == 'True' AND '$(Platform)' == 'x86' AND '$(CodePlexProject)' != '' " />
+		<Exec Command="appveyor SetVariable -Name CI_RELEASE_DESCRIPTION -Value &quot;$(CI_RELEASE_DESCRIPTION)&quot;" Condition=" '$(APPVEYOR)' == 'True' AND '$(Platform)' == 'x86' AND '$(CI_RELEASE_DESCRIPTION)' != '' " />
 	</Target>
 
 	<Target Name="Upload" DependsOnTargets="CreateRelease">

diff --git a/.appveyor/appveyor.after-build.ps1 b/.appveyor/appveyor.after-build.ps1
@@ -1,10 +1,15 @@
 
-## THIS IS HERE BECAUSE THE 'BEFORE-DEPLOYMENT' DOESNT WANT TO RUN 
+## THIS IS HERE BECAUSE THE 'BEFORE-DEPLOYMENT' DOESNT WANT TO RUN UNLESS ONE OF THE DEPLOYMENTS EVALUATES TO TRUE
 ## AND IT IS PISSING ME OFF
 
 $commitMessageRegex = "^\[deploy\:(pre-release|draft|release)\]$";
 
 
+# read the publishChangelog file
+if(-not $env:CI_RELEASE_DESCRIPTION) {
+	$env:CI_RELEASE_DESCRIPTION = (Get-Content -Path ".\.build\publishChangelog.txt" -Raw);
+}
+
 # Must come from master branch.
 # Must not have a PULL Request Number
 # Must match regex
@@ -17,10 +22,9 @@ if ( $env:APPVEYOR_REPO_BRANCH -eq "master" ) {
 	$env:CI_DEPLOY_WebDeploy = $true;
 	$env:CI_DEPLOY_CodePlex = $false;
 	$env:CI_DEPLOY_WEBAPI_RELEASE = $false;
-	$env:CI_DEPLOY_PUSHBULLET = $true;
+	$env:CI_DEPLOY_PUSHBULLET = $false;
 	$env:CI_DEPLOY = $true;
-} else {
-	# Do not assign a release number or deploy
+} elseif ( $env:APPVEYOR_REPO_BRANCH -eq "develop" ) {
 	$env:CI_DEPLOY_NUGET = $true;
 	$env:CI_DEPLOY_GITHUB_PRE = $true;
 	$env:CI_DEPLOY_GITHUB = $false;
@@ -31,4 +35,15 @@ if ( $env:APPVEYOR_REPO_BRANCH -eq "master" ) {
 	$env:CI_DEPLOY_WEBAPI_RELEASE = $false;
 	$env:CI_DEPLOY_PUSHBULLET = $false;
 	$env:CI_DEPLOY = $false;
+} else {
+	$env:CI_DEPLOY_NUGET = $false;
+	$env:CI_DEPLOY_GITHUB_PRE = $false;
+	$env:CI_DEPLOY_GITHUB = $false;
+	$env:CI_DEPLOY_FTP = $false;
+	$env:CI_DEPLOY_WebHook = $false;
+	$env:CI_DEPLOY_WebDeploy = $false;
+	$env:CI_DEPLOY_CodePlex = $false;
+	$env:CI_DEPLOY_WEBAPI_RELEASE = $false;
+	$env:CI_DEPLOY_PUSHBULLET = $false;
+	$env:CI_DEPLOY = $false;
 }
diff --git a/.appveyor/appveyor.after-test.ps1 b/.appveyor/appveyor.after-test.ps1
diff --git a/.appveyor/appveyor.before-deployment.ps1 b/.appveyor/appveyor.before-deployment.ps1
@@ -1,34 +0,0 @@
-<#
- #
- #
- #>
-
-#$commitMessageRegex = "^\[deploy\:(pre-release|draft|release)\]$";
-
-
-## Must come from master branch.
-## Must not have a PULL Request Number
-## Must match regex
-#if ( ($env:APPVEYOR_REPO_BRANCH -eq "master") -and ($env:APPVEYOR_REPO_COMMIT_MESSAGE -match $commitMessageRegex) ) {
-#	$env:CI_DEPLOY_NUGET = $true;
-#	$env:CI_DEPLOY_GITHUB = $true;
-#  $env:CI_DEPLOY_FTP = $false;
-#	$env:CI_DEPLOY_WebHook = $true;
-#	$env:CI_DEPLOY_WebDeploy = $true;
-#	$env:CI_DEPLOY_CodePlex = $false;
-#	$env:CI_DEPLOY_WEBAPI_RELEASE = $false;
-#	$env:CI_DEPLOY_PUSHBULLET = $true;
-#	$env:CI_DEPLOY = $true;
-#} else {
-#	# Do not assign a release number or deploy
-#  $env:CI_DEPLOY_NUGET = $true;
-#	$env:CI_DEPLOY_GITHUB_PRE = $true;
-#  $env:CI_DEPLOY_GITHUB = $false;
-#  $env:CI_DEPLOY_FTP = $false;
-#	$env:CI_DEPLOY_WebHook = $false;
-#	$env:CI_DEPLOY_WebDeploy = $false;
-#	$env:CI_DEPLOY_CodePlex = $false;
-#	$env:CI_DEPLOY_WEBAPI_RELEASE = $false;
-#	$env:CI_DEPLOY_PUSHBULLET = $false;
-#	$env:CI_DEPLOY = $false;
-#}

diff --git a/.appveyor/appveyor.before-test.ps1 b/.appveyor/appveyor.before-test.ps1
diff --git a/.appveyor/appveyor.install.ps1 b/.appveyor/appveyor.install.ps1
@@ -1,3 +1,7 @@
-choco install -y nuget.commandline --version 3.3.0;
+& choco install -y nuget.commandline -version 3.3.0;
 
-$env:PATH = "C:\ProgramData\chocolatey\lib\NuGet.CommandLine\tools;$env:PATH";
+$env:PATH = "C:\ProgramData\chocolatey\lib\NuGet.CommandLine\tools\;C:\Python34;C:\Python34\Scripts\;$env:PATH";
+
+& python -m pip install --upgrade pip;
+
+pip install codecov;
diff --git a/.appveyor/appveyor.test.ps1 b/.appveyor/appveyor.test.ps1
@@ -0,0 +1,5 @@
+# /noshadow /nologo /notrait category=IntegrationTest
+
+& "${ENV:APPVEYOR_BUILD_FOLDER}\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe" -log:All -register:user -target:`"${ENV:APPVEYOR_BUILD_FOLDER}\packages\xunit.runner.console.2.1.0\tools\xunit.console.x86.exe`" -filter:`"+[Managed.Adb]* -[Managed.Adb]Managed.Adb.Properties.*`" -excludebyattribute:*.ExcludeFromCodeCoverage* -hideskipped:All -output:`"${ENV:APPVEYOR_BUILD_FOLDER}\managed.adb.coverage.xml`" -targetargs:`"`\`"${ENV:APPVEYOR_BUILD_FOLDER}\Managed.Adb.Tests\bin\x86\Debug\Managed.Adb.Tests.dll`\`" -verbose -noshadow `";
+
+codecov -f `"${ENV:APPVEYOR_BUILD_FOLDER}\managed.adb.coverage.xml`" -X gcov;
diff --git a/.build/BuildAll.msbuild b/.build/BuildAll.msbuild
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0" DefaultTargets="BuildAll">
 
-
 	<Target Name="BuildAll">
 		<MSBuild Projects="$(MSBuildProjectDirectory)\BuildMadBee.msbuild" ContinueOnError="false"
 				 Properties="Platform=x86;PublishMode=Nuget;SignAssembly=true">
@@ -13,8 +12,17 @@
 			<Output ItemName="OutputFiles" TaskParameter="TargetOutputs"/>
 		</MSBuild>
 
+		<CreateItem Include="$(MSBuildProjectDirectory)\..\Managed.Adb.Tests\*.csproj">
+			<Output ItemName="TestProjects" TaskParameter="Include"/>
+		</CreateItem>
+		<MSBuild Projects="@(TestProjects)" Properties="PublishMode=Nuget;Platform=x86;Configuration=Debug;">
+			<Output ItemName="OutputFiles" TaskParameter="TargetOutputs"/>
+		</MSBuild>
 
-
+
+		<Exec Command="$(MSBuildProjectDirectory)\..\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -log:All -register:user -target:$(MSBuildProjectDirectory)\..\packages\xunit.runner.console.2.1.0\tools\xunit.console.x86.exe -filter:&quot;+[Managed.Adb]* -[Managed.Adb]Managed.Adb.Properties.*&quot; -excludebyattribute:*.ExcludeFromCodeCoverage* -hideskipped:All -output:&quot;$(MSBuildProjectDirectory)\..\managed.adb.coverage.xml&quot; -targetargs:&quot;\&quot;$(MSBuildProjectDirectory)\..\Managed.Adb.Tests\bin\x86\Debug\Managed.Adb.Tests.dll\&quot; -verbose -noshadow&quot;"
+					WorkingDirectory="$(MSBuildProjectDirectory)\..\"
+					Condition=" '$(CI)' == 'False' OR '$(CI)' == '' " />
 	</Target>
 
 </Project>
diff --git a/.build/SharedProperties.msbuild b/.build/SharedProperties.msbuild
@@ -84,11 +84,11 @@
 		<PublishNuGet Condition=" '$(PublishMode)' == 'NuGet' ">PublishNuGet</PublishNuGet>
 		<NugetPath>$(MSBuildProjectDirectory)\..\.nuget</NugetPath>
 		<Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">x86</Platform>
-		<LocalDeploy Condition=" '$(LocalDeploy)' == '' ">E:\Development\deploy\nuget</LocalDeploy>
+		<LocalDeploy Condition=" '$(LocalDeploy)' == '' AND '$(CI)' == 'False'">E:\Development\deploy\nuget</LocalDeploy>
 		<ProjectFriendlyName>madbee</ProjectFriendlyName>
 		<NugetPackageId>$(CI_PROJECT_FRIENDLY_NAME).$(Platform)</NugetPackageId>
 		<NugetPackageId Condition=" '$(Platform)' == 'x86' ">$(CI_PROJECT_FRIENDLY_NAME)</NugetPackageId>
-		<DescriptionFile>$(MSBuildProjectDirectory)\Build\publish-changelog.txt</DescriptionFile>
+		<DescriptionFile>$(MSBuildProjectDirectory)\Build\publishChangelog.txt</DescriptionFile>
 		<ReleasesPath>$(CI_ARTIFACT_PATH)\$(Configuration)\nuget\</ReleasesPath>
 
 
@@ -115,7 +115,7 @@
 		</CreateProperty>
 
 
-		<CreateProperty Value="DefineConstants=$(DefineConstants) $(PlatformConstant);OSPlatform=$(OSPlatform);ReleasePlatform=$(ReleasePlatform);SignAssemblies=$(SignAssemblies);Configuration=$(Configuration);OutputPath=$(OutputPath);CI_BUILD_VERSION=$(CI_BUILD_VERSION);CI_BUILD_CONDITION=$(CI_BUILD_CONDITION);CI_PROJECT_NAME=$(CI_PROJECT_NAME);CI_PROJECT_FRIENDLY_NAME=$(CI_PROJECT_FRIENDLY_NAME);CI_BUILD_DATE=$(CI_BUILD_DATE);CI_BUILD_TIME=$(CI_BUILD_TIME);CI_ARTIFACT_PATH=$(CI_ARTIFACT_PATH);CI_PROJECT_PATH=$(CI_PROJECT_PATH);">
+		<CreateProperty Value="DefineConstants=$(DefineConstants) $(PlatformConstant);OSPlatform=$(OSPlatform);ReleasePlatform=$(ReleasePlatform);SignAssemblies=$(SignAssemblies);Configuration=$(Configuration);OutputPath=$(OutputPath);CI_BUILD_VERSION=$(CI_BUILD_VERSION);CI_BUILD_CONDITION=$(CI_BUILD_CONDITION);CI_PROJECT_NAME=$(CI_PROJECT_NAME);CI_PROJECT_FRIENDLY_NAME=$(CI_PROJECT_FRIENDLY_NAME);CI_BUILD_DATE=$(CI_BUILD_DATE);CI_BUILD_TIME=$(CI_BUILD_TIME);CI_ARTIFACT_PATH=$(CI_ARTIFACT_PATH);CI_PROJECT_PATH=$(CI_PROJECT_PATH);CI_REPO_BRANCH=$(CI_REPO_BRANCH)">
 			<Output PropertyName="MSBuildProperties" TaskParameter="Value" />
 		</CreateProperty>
 	</Target>
@@ -243,8 +243,8 @@
 		<MakeDir Directories="$(ReleasesPath)" Condition="!Exists('$(ReleasesPath)')" />
 		<Copy SourceFiles="$(OutputPath)\$(NugetPackage)" DestinationFiles="$(ReleasesPath)\$(NugetPackage)" />
 
-		<MakeDir Directories="$(LocalDeploy)" Condition=" '$(LocalDeploy)' != '' AND !Exists('$(LocalDeploy)')" ContinueOnError="true" />
-		<Copy SourceFiles="$(ReleasesPath)\$(NugetPackage)" DestinationFolder="$(LocalDeploy)" Condition=" '$(LocalDeploy)' != '' AND Exists('$(LocalDeploy)') " />
+		<MakeDir Directories="$(LocalDeploy)" Condition=" '$(LocalDeploy)' != '' AND !Exists('$(LocalDeploy)') AND '$(CI)' == 'False' " ContinueOnError="true" />
+		<Copy SourceFiles="$(ReleasesPath)\$(NugetPackage)" DestinationFolder="$(LocalDeploy)" Condition=" '$(LocalDeploy)' != '' AND Exists('$(LocalDeploy)') AND '$(CI)' == 'False' " />
 
 		<Delete Files="$(OutputPath)\$(NugetPackage)" />
 	</Target>

diff --git a/.build/WebPublish.msbuild b/.build/WebPublish.msbuild
@@ -15,7 +15,7 @@
 		<OutputPath>bin\</OutputPath>
 
 		<DeleteFirst Condition="'$(DeleteFirst)' == ''">True</DeleteFirst>
-		<MSBuildProperties>Configuration=$(Configuration);Platform=$(Platform);OutputPath=$(OutputPath);VisualStudioVersion=12.0;DefineConstants=MVC5</MSBuildProperties>
+		<MSBuildProperties>Configuration=$(Configuration);Platform=$(Platform);OutputPath=$(OutputPath);VisualStudioVersion=14.0;DefineConstants=MVC5</MSBuildProperties>
 
 	</PropertyGroup>
 

diff --git a/.build/publish-changelog.txt → .build/publishChangelog.txt b/.build/publish-changelog.txt → .build/publishChangelog.txt
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 **/.vs/*
 # Generated Version File:
 */VersionAssemblyInfo.cs
+**/*.coverage.xml
 
 #nuget
 [pP]ackages/*

diff --git a/Madb.Site/Madb.Site.csproj b/Madb.Site/Madb.Site.csproj
@@ -62,8 +62,8 @@
     <Reference Include="MoreLinq">
       <HintPath>..\packages\morelinq.1.1.0\lib\net35\MoreLinq.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">

diff --git a/Madb.Site/Web.config b/Madb.Site/Web.config
@@ -71,7 +71,7 @@
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="MoreLinq" publicKeyToken="384d532d7e88985d" culture="neutral" />

diff --git a/Madb.Site/packages.config b/Madb.Site/packages.config
@@ -3,7 +3,7 @@
   <package id="Antlr" version="3.4.1.9004" targetFramework="net451" />
   <package id="bootstrap" version="3.2.0" targetFramework="net451" />
   <package id="Camalot.Common" version="1.0.5937.17275" targetFramework="net451" />
-  <package id="Camalot.Common.Mvc5" version="5.0.5937.17276" targetFramework="net451" />
+  <package id="Camalot.Common.Mvc5" version="5.0.5230.247" targetFramework="net451" />
   <package id="font-awesome" version="4.1.0" targetFramework="net451" />
   <package id="jQuery" version="2.1.1" targetFramework="net451" />
   <package id="jQuery.Validation" version="1.13.0" targetFramework="net451" />
@@ -17,7 +17,7 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net451" />
   <package id="Modernizr" version="2.8.3" targetFramework="net451" />
   <package id="morelinq" version="1.1.0" targetFramework="net451" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+  <package id="Newtonsoft.Json" version="8.0.1" targetFramework="net451" />
   <package id="Owin" version="1.0" targetFramework="net451" />
   <package id="Respond" version="1.4.2" targetFramework="net451" />
   <package id="WebGrease" version="1.5.2" targetFramework="net451" />