Christian Engvall

When using git i like to work with Vincent Driessen’s a successful git branching model. But since my projects varies i switch between git and another version control system, and sometimes need a quick refresh to get up to speed with git again. So this is the short version of the successful branching model.

Create feature branch

$ git checkout -b myfeature develop
Switched to a new branch "myfeature"

Merge feature branch

$ git checkout develop
Switched to branch 'develop'
$ git merge --no-ff myfeature
Updating ea1b82a..05e9557
(Summary of changes)
$ git branch -d myfeature
Deleted branch myfeature (was 05e9557).
$ git push origin develop

Create release branch

$ git checkout -b release-1.2 develop
Switched to a new branch "release-1.2"
$ ./bump-version.sh 1.2
Files modified successfully, version bumped to 1.2.
$ git commit -a -m "Bumped version number to 1.2"
[release-1.2 74d9424] Bumped version number to 1.2
1 files changed, 1 insertions(+), 1 deletions(-)

Finish release branch

$ git checkout -b release-1.2 develop
Switched to a new branch "release-1.2"
$ ./bump-version.sh 1.2
Files modified successfully, version bumped to 1.2.
$ git commit -a -m "Bumped version number to 1.2"
[release-1.2 74d9424] Bumped version number to 1.2
1 files changed, 1 insertions(+), 1 deletions(-)

Create hotfix branch

$ git checkout -b hotfix-1.2.1 master
Switched to a new branch "hotfix-1.2.1"
$ ./bump-version.sh 1.2.1
Files modified successfully, version bumped to 1.2.1.
$ git commit -a -m "Bumped version number to 1.2.1"
[hotfix-1.2.1 41e61bb] Bumped version number to 1.2.1
1 files changed, 1 insertions(+), 1 deletions(-)

Finish hotfix branch

$ git checkout master
Switched to branch 'master'
$ git merge --no-ff hotfix-1.2.1
Merge made by recursive.
(Summary of changes)
$ git tag -a 1.2.1

$ git checkout develop
Switched to branch 'develop'
$ git merge --no-ff hotfix-1.2.1
Merge made by recursive.
(Summary of changes)

$ git branch -d hotfix-1.2.1
Deleted branch hotfix-1.2.1 (was abbe5d6).

successful git branch model

Image from http://nvie.com/posts/a-successful-git-branching-model/

This error occurred after an upgrade from Episerver CMS 5 to CMS 6 R2. When trying to publish a page this error message was shown: “urltoimage.jpg”  is not a valid value for “imageproperty”

Vladimir Terziyski wrote the following about why this error is happening:

“I’ve had the same problem some time ago. I’ve narrowed it down to using Native or other custom Virtual path provider. Seems it comes from the new base class for url properties called PropertyFileUrl, from which PropertyImageUrl and PropertyDocumentUrl inherit. It has one method called ValidateUri which throws an exception when the VirtualPathProvider you use doesn’t implement IFileResolver interface. For example - VirtualPathNativeProvider. Here is what is happening:

• The user saves & publishes the page.
• A call to Set accessor for the PropertyUrl.String property is made. Inside it, a call to PropertyFileUrl.ValidateUri method is made
• ValidateUri throws an exception which says that the url is not absolute on the following line:
• GenericHostingEnvironment.VirtualPathProvider.FileExists(uri.LocalPath))
• This exception however is masked behind the text “[imagepath] is not a valid value for [imagepropertyname]”. This text is shown as error in the Edit interface.
• If the selected VirtualPathProvider implements IFileResolver, call to ValidateUri will not be made if the file is resolved.”

How to solve the problem

1. Download the latest release of Episerver CMS 6 R2 from episerver world.
2. Backup your site and database
3. Uninstall EPiServerFramework from the control panel
4. Uninstall EPiserverCMS

5. Uninstall EPiServershared

6. Install EPiServerShared.msi from the latest release of CMS 6 R2
7. Install EPiServerFramework.msi

8. Install EPiServerCMS.msi

9. Copy assemblies from  Program Files (x86)\EPiServer\CMS\6.1.379.0\bin to the site’s bin folder.
10.  Copy assemblies from Program Files (x86)\EPiServer\Framework\6.2.267.1\bin to the site’s bin folder.
11. run an iisreset

These instructions + instructions for Relate can be found here.

I recently ran into the same problem as Jamie Dixon when upgrading a episerver site from cms 5 to cms6. But the solution was a little different.

The error message is:

Cannot resolve dependencies for the following module(s) EPiServer.Cms.Shell.UI.InitializableModule EPiServer.Cms.Shell.UI.InitializableModule EPiServer.Web.InitializationModule EPiServer.Web.InitializationModule

And the problem was the same as Jamies post explained:

“After some digging around and much testing, it turns out that not all of the required DLLs are present in the “6.0.530.0″ folder (C:\Program Files\EPiServer\CMS\6.0.530.0 – on my machine).”

Installing a site without database

And it was solved by installing a site without database from EPiServer Deployment Center. Use all the standard settings and click next until the site is installed.

Episerver deployment center

When the installation has finished copy the contents of the bin folder of the site to this folder: C:\Program Files (x86)\EPiServer\CMS\6.0.530.0\bin

When this is done just run the Upgrade site with SQL Server database again on your site.

This is a wrapper around HttpRuntime.Cache i use when some object is to expensive to get from its source every time. For example a RSS-feed which might only need to get updates from its source every minute.

using System;
using System.Web;
using System.Web.Caching;

public class HttpRuntimeCache
{
    private DateTime _Expiration;

    public DateTime Expiration
    {
        get
        {
            return this._Expiration;
        }
        set
        {
            this._Expiration = value;
        }
    }

    public HttpRuntimeCache()
    {
        this._Expiration = DateTime.Now.AddHours(4);
    }

    public void Add(string key, object objectToCache)
    {
        this.ValidateKey(key);
        this.ValidateCacheObject(objectToCache);
        HttpRuntime.Cache.Add(key, objectToCache, null, this._Expiration, Cache.NoSlidingExpiration, CacheItemPriority.Normal, null);
    }

    public object Get(string key)
    {
        this.ValidateKey(key);
        return HttpRuntime.Cache.Get(key);
    }

    public void Remove(string key)
    {
        this.ValidateKey(key);
        HttpRuntime.Cache.Remove(key);
    }

    private void ValidateKey(string key)
    {
        if (key == null)
        {
            this.ThrowNullKeyError();
        }
        if (key.Length == 0)
        {
            this.ThrowEmptyKeyError();
        }
    }

    private void ValidateCacheObject(object objectToCache)
    {
        if (objectToCache == null)
        {
            this.ThrowObjectError();
        }
    }

    private void ThrowObjectError()
    {
        throw new ArgumentNullException("objectToCache");
    }

    private void ThrowNullKeyError()
    {
        throw new ArgumentNullException("key");
    }

    private void ThrowEmptyKeyError()
    {
        throw new ArgumentException("Input cannot be empty", "key");
    }
}

This code shows how to add and remove a string from the cache. If it’s not removed it will stay there for 4 hours which is set in the contstructor of HttpRuntimeCache class.

string simpleString = "this string will be cached";
HttpRuntimeCache cache = new HttpRuntimeCache();
cache.Add("simpleString", simpleString);
string fromCache = cache.Get("simpleString") as string;
cache.Remove("simpleString");

Change cache expiration

To change the expiration the Expiration property can be set before adding the object to the cache:

string simpleString = "this string will be cached";
HttpRuntimeCache cache = new HttpRuntimeCache();
cache.Expiration = DateTime.Now.AddHours(1);
cache.Add("simpleString", simpleString);

This code can be used to check if a page in episerver is opened in edit mode. It uses HttpContext.Current.Request.UrlReferrer.LocalPath to see if the word admin or edit exists in the url.

Check edit mode code example

private bool IsOpenedInEditMode()
{
    bool isInEditMode = false;
    If(HttpContext.Current.Request.UrlReferrer != null)
    {
        isInEditMode = Regex.IsMatch(HttpContext.Current.Request.UrlReferrer.LocalPath, "/admin/|/edit/", RegexOptions.IgnoreCase);
    }
    return isInEditMode;
}