Resolving SourceTree Merge Conflicts with Visual Studio

I’m currently working with a company where Git is the source control repository of choice and SourceTree is the tool to handle the interactions with the repository.

Until now I’ve been a Team Foundation Server guy, and before that a Subversion guy, and before that a Visual Source Safe guy so I’ve always (with the exception of Source Safe) enjoyed working with those repositories via Visual Studio.  Personally I really like the merge Window in Visual Studio.  I know it and I’m comfortable with it so I like to use it. Continue reading

How to target SQL Server 2014 from a Visual Studio 2013 SQL Server Database Project

I’ve just installed SQL Server 2014 and want to check what might break in my current SQL Server 2008 database when I upgrade it.

Thomas LaRock has written a great article providing a list of a dozen things to check before upgrading and I would definitely suggest making this your first port of call if you’re planning an upgrade.  Continue reading

Adding “unknown” file types to your publication package

I’ve been making some updates to a web services project recently (I say recently it was actually months ago but for some reason I haven’t managed to publish this post until now) and the time has come to deploy it to a test environment.  This in itself brought a few challenges but the one that I want to discuss just now is the issue of including unknown file types in your publication package. Continue reading

After namespace change “multiple types were found that match the controller named ‘X'”

I started work on a new MVC 5 project today and after working on it for a short while I decided I wanted to change the name of the web project to [ProjectName].WebUI from just [ProjectName].  So, I renamed the project, updated the project namespace and updated all my files to use the new namespace so my solution was now made up of [ProjectName].sln, [ProjectName].WebUI and [ProjectName].WebUI.Tests.  All good I thought, but then I went to debug it and got this message:

Multiple types were found that match the controller named ‘Home’. This can happen if the route that services this request (‘{controller}/{action}/{id}’) does not specify namespaces to search for a controller that matches the request. If this is the case, register this route by calling an overload of the ‘MapRoute’ method that takes a ‘namespaces’ parameter.

Continue reading

How to Install a NuGet package Without an Internet Connection

If, like me, you are currently working on a development PC that doesn’t have access to the internet it can be a pain trying to install and maintain third party packages.  I’m a huge fan of NuGet and I thought that as I didn’t have an internet connected machine I wouldn’t be able to connect to it and download my favourite packages via Visual Studio’s Package Manager.  I was wrong though as it’s possible to use Visual Studio’s Package Manager to install NuGet packages even when you don’t have an internet enabled development machine Continue reading

.Net Extension Methods

Extension Methods – What are they?

They are methods written by you which allow you to extend classes that you cannot modify directly.  These might be classes you’re using from a third party DLL, or maybe you work in an organisation where your business objects are untouchable by a lowly developer such as yourself (and me), or maybe you just want to add some extra functionality to the String class.  If any of these situations ring true then extension methods are something you should know about. Continue reading

Managing Static Data in a SQL Server Visual Studio Project

I’m a fan of the SQL Server project type that ships with Visual Studio having used it over the years with a number of projects.  I’ve been away from it for a couple of years though having been working with a company that preferred Redgate’s SQL Source Control offering, so coming back to SQL Server projects again my memory’s been a bit hazy and I’ve struggled how to remember to do some things.

One of these things was how to manage static data Continue reading