In a recent version of GitHub for Windows, we made a quiet change that had a subtle effect you might have noticed. We changed the default merge strategy for *.csproj and similar files. If you make changes to a .csproj file in a branch and then merge it to another branch, you'll probably run into more merge conflicts now than before. Why? Well, it used to be that we would do a union merge for *.csproj files. The git merge-file documentation describes this option as such: Instead of leaving conflicts in the file, resolve conflicts favouring our (or their or both) side
of the lines. For those who don't speak the commonwealth English, "favouring" is a common British mispelling of the one true spelling of "favoring". :trollface: So when a conflict occurs, it tries to resolve it by accepting all changes more or less. It's basically a cop out. This strategy can be set in a .gitattributes file like so if you really want this behavior for your repository.
*.csproj merge=unionBut let me show why you probably don't want to do that and why we ended up changing this. Union Merges Gone Wild Suppose we start with the following simplified foo.csproj file in our master branch...(Read whole news on source site)
I have seen lots developers are not seeing benefits of Test Driven development. When you do Test Driven development there are lots of benefits. So I thought it will be good idea to write a blog post about it. What is Test Driven Development: As per wikipedia Test Driven Development is Test-driven development (TDD) is a software development process that relies on the repetition of a very short development cycle: first the developer writes an (initially failing) automated test case that... [[ This is a content summary only. Visit my website for full links, other content, and more! ]]
Originally posted on: http://geekswithblogs.net/darrengosbell/archive/2014/04/17/running-mdx-studio-against-sql-2012.aspxEven though MDX Studio has not been updated since SQL 2008 it’s still a fantastic tool for working with MDX. However if you have only installed SQL 2012 (or later) on your machine then you may get errors like the following: System.IO.FileNotFoundException: Could not load file or assembly 'Microsoft.AnalysisServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91' or one of its dependencies. The system cannot find the file specified.
File name: 'Microsoft.AnalysisServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91' There are two ways to address this issue: 1. Install either the
SQL 2008 or SQL 2008 R2 version of AMO (which is part of the SQL Server feature pack) 2. Configure assembly redirection via a config file. You can download a copy of the mdxstudio.exe.config file from my onedrive or save the following xml to a file of that name (this file needs to be in the same folder as the MDXStudio.exe file). This file redirects the 2008 / 2008R2 version of Microsoft.AnalysisServices.dll (v10.0.0.0) to the SQL 2012 version (v184.108.40.206) to redirect to later versions it’s just a matter of changing the newVersion attribute (assuming that the new...(Read whole news on source site)
If you’re running into a bug like I did, there are good and bad news. Good – Microsoft acknowledged this bug and will fix it, bad – it will happen in the next release (not sure then). In MS favour I have to admit that they turn things really quick, so who knows, it might be already in the release notes of the next release :)
Less than a year ago, I gave you a quick overview of the many investments we made to debugging and profiling in Visual Studio 2013 RTM and got some great feedback from you about what we’d done. Now, with Visual Studio 2013 Update 2 RC available for download, I wanted to run you through the enhancements we have made since last summer. We’ve done a lot, so this summary post mostly links to other posts. I wanted to talk about two of the larger efforts we’ve made first: the Performance and Diagnostics hub (from where you can
run tools such as the HTML UI Responsiveness tool, XAML UI Responsiveness tool, and Energy Consumption tool) and the ability to analyze .NET memory dumps. With the Performance and Diagnostics hub, you now have the capability to run more than one tool at a time and look at the results in a combined view, so that you can cross-correlate activity from one tool with activity from another (e.g. "I can see that while my CPU was doing X, my UI was doing Y"). We’ve also introduced a new CPU Usage tool, for seeing where your...(Read whole news on source site)
Microsoft CEO Satya Nadella introduces Azure Intelligent Systems Service and Analytics Platform System.