I have a .NET 2.0, precompiled and deployed web site. I have decompiled the site and added new functionality to a 'dev branch' of the site. I now need to upgrade the site to .NET 3.5, so that the new features can function, and add the new features to the 'production' site.
How can I go about this merge of features into the 'production' site? I have several C# classes, new pages, and uncompiled source code for existing pages.