Particular · HEskandari · Nov 7, 2016 · Nov 3, 2016
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,41 @@
-# Created by https://www.gitignore.io/api/visualstudio
+nugets
+chocos/
+deploy
+build32
+binaries
+*.vshost.*
+.nu
+_UpgradeReport.*
+*.cache
+*~
+*.swp
+results
+CommonAssemblyInfo.cs
+lib/sqlite/System.Data.SQLite.dll
+*.orig
+Samples/DataBus/storage
+packages
+PrecompiledWeb
+core-only
+Release
+Artifacts
+LogFiles
+csx
+*.ncrunchproject
+*.ncrunchsolution
+_NCrunch_NServiceBus/*
+logs
+run-git.cmd
+src/Chocolatey/Build/*
+
+installer/[F|f]iles
+installer/[C|c]ustom[A|a]ctions
+installer/ServiceControl-cache
+
+Index.dat
+Storage.dat
+
+# Created by https://www.gitignore.io
 
 ### VisualStudio ###
 ## Ignore Visual Studio temporary files, build results, and
@@ -10,250 +47,37 @@
 *.userosscache
 *.sln.docstates
 
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
 x64/
 x86/
+build/
 bld/
 [Bb]in/
 [Oo]bj/
-[Ll]og/
 
-# Visual Studio 2015 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
+# Roslyn cache directories
+*.ide/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUNIT
+#NUNIT
 *.VisualState.xml
 TestResult.xml
 
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
 
 # ReSharper is a .NET coding add-in
 _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
-.cr/
+src/scaffolding.config
+src/Setup/ServiceInsight-cache/
diff --git a/src/ServiceInsight.Tests/AboutViewModelTests.cs b/src/ServiceInsight.Tests/AboutViewModelTests.cs
@@ -1,5 +1,6 @@
 namespace ServiceInsight.Tests
 {
+    using Caliburn.Micro;
     using NSubstitute;
     using NUnit.Framework;
     using ServiceInsight.Framework;
@@ -13,19 +14,22 @@ public class AboutViewModelTests
         NetworkOperations networkOperations;
         IServiceControl serviceControl;
         LicenseRegistrationViewModel licenseRegistration;
+        AboutViewModel sut;
 
         [SetUp]
         public void Initialize()
         {
             networkOperations = Substitute.For<NetworkOperations>();
             serviceControl = Substitute.For<IServiceControl>();
             licenseRegistration = Substitute.For<LicenseRegistrationViewModel>();
+
+            sut = new AboutViewModel(networkOperations, serviceControl, licenseRegistration);
         }
 
         [Test]
         public void Should_fetch_service_control_version()
         {
-            var sut = CreateViewModel();
+            ((IActivate)sut).Activate();
 
             serviceControl.Received(1).GetVersion();
         }
@@ -36,15 +40,15 @@ public void Should_display_service_control_version()
             const string ServiceControlVersion = "0.8.0-Unstable379";
             serviceControl.GetVersion().Returns(ServiceControlVersion);
 
-            var sut = CreateViewModel();
+            ((IActivate)sut).Activate();
 
             sut.ServiceControlVersion.ShouldBe(ServiceControlVersion);
         }
 
         [Test]
         public void Should_display_application_version_number()
         {
-            var sut = CreateViewModel();
+            ((IActivate)sut).Activate();
 
             sut.AppVersion.ShouldNotBe(null);
             sut.AppVersion.ShouldNotBeEmpty();
@@ -53,15 +57,10 @@ public void Should_display_application_version_number()
         [Test]
         public void Should_display_short_commit_hash()
         {
-            var sut = CreateViewModel();
+            ((IActivate)sut).Activate();
 
             sut.CommitHash.ShouldNotBe(null);
             sut.CommitHash.Length.ShouldBe(7);
         }
-
-        private AboutViewModel CreateViewModel()
-        {
-            return new AboutViewModel(networkOperations, serviceControl, licenseRegistration);
-        }
     }
 }
diff --git a/src/ServiceInsight.Tests/App.config b/src/ServiceInsight.Tests/App.config
@@ -51,7 +51,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Caliburn.Micro" publicKeyToken="8e5891231f2ed21f" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.2.0" newVersion="2.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.2.0" newVersion="1.5.2.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>