merge dotnet 2.0