Merge branch 'release/2.4.0'

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,29 @@
+*IF BUG, INCLUDE THIS PART:*
+
+### Steps to reproduce
+
+1.
+2.
+3.
+
+Platform:
+.NET version:
+
+### Expected behaviour
+
+Tell us what should happen
+
+### Actual behaviour
+
+Tell us what happens instead
+Can you also include a screen shot?
+
+
+
+*IF IT IS A NEW FEATURE REQUEST, INCLUDE THIS PART:*
+
+### Feature description
+
+Write a description of the feature. How should it work? How should it look?
+Include some graphics if this could help!
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,14 @@
+Fixes # .
+
+### Checklist
+
+- [ ] I have included examples or tests
+- [ ] I have updated the change log
+- [ ] I am listed in the CONTRIBUTORS file
+- [ ] I have cleaned up the commit history (use rebase and squash)
+
+### Changes proposed in this pull request:
+
+-
+-
+-

.gitignore

@@ -121,4 +121,5 @@ Thumbs.db
 Desktop.ini
 
 # mstest test results
-TestResults
+TestResults
+/.vs

AUTHORS

@@ -0,0 +1,12 @@
+# This is the official list of authors for copyright purposes.
+# This file is distinct from the CONTRIBUTORS file.
+# See the latter for an explanation.
+
+# Names should be added to this file as
+#	Name or Organization <email address>
+# The email address is not required for organizations.
+
+# Please keep the list sorted.
+# Please notify the first person on the list to be added here.
+
+CatenaLogic

CONTRIBUTORS

@@ -0,0 +1,15 @@
+# This is the official list of people who have contributed
+# to this repository.
+# The AUTHORS file lists the copyright holders; this file
+# lists people.
+
+# People submitting code should be listed in this file (by email address).
+
+# Names should be added to this file like so:
+#     Name <email address>
+
+# Please keep the list sorted.
+
+Geert van Horrik <geert@catenalogic.com>
+Wesley Eledui <wefilmer@gmail.com>
+Marek Fišera <mara@neptuo.com>

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 CatenaLogic
+Copyright (c) 2014 - 2016 CatenaLogic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,9 +2,7 @@ GitLink
 ==========
 
 [![Join the chat at https://gitter.im/GitTools/GitLink](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/GitTools/GitLink?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 ![License](https://img.shields.io/github/license/gittools/gitlink.svg)
-![NuGet downloads](https://img.shields.io/nuget/dt/gitlink.svg)
 ![Version](https://img.shields.io/nuget/v/gitlink.svg)
 ![Pre-release version](https://img.shields.io/nuget/vpre/gitlink.svg)
 ![Chocolatey count](https://img.shields.io/chocolatey/dt/gitlink.svg)
@@ -18,11 +16,13 @@ GitLink let's users step through your code hosted on GitHub! **Help make .NET op
 
 -- 
 
-**Important note** 
+**Important** 
 
 *GitLink* was formerly named *GitHubLink*. By adding support to more Git hosting services the name seemed not covering the whole package. The old GitHubLink packages on NuGet and Chocolatey will no longer be updated or maintained.
 
--- 
+*Private git repositories* might be problematic. [More info](#source-stepping-returns-html).
+
+--
 
 GitLink makes symbol servers obsolete which saves you both time with uploading source files with symbols and the user no longer has to specify custom symbol servers (such as symbolsource.org).
 
@@ -46,11 +46,22 @@ When using GitLink, the user no longer has to specify symbol servers. The only r
 
 ![Enabling source server support](doc/images/visualstudio_symbolslocation.png)
 
+* Verify that there is not a case mismatch in git folder names vs. references in the .csproj that was used during packaging. E.g. GitHub will not serve /Folder/Somefile.cs if Visual Studio requests /FOLdeR/Somefile.cs.
+
 ## Source Stepping returns HTML
 If your repository is private, you are likely seeing the logon HTML from your git host.
 
 * Log onto your git host in Internet Explorer
-* Purge your local symbol cache 
+* Purge your local symbol cache
+
+Note that this approach is not guaranteed to work.  Visual Studio needs to authenticate to retrieve the source files
+but does not ask the user for credentials to do so.  There are ways to work around this, but no mechanism is currently
+provided out-of-the-box in *GitLink*.
+
+Possible workarounds
+* Include a mechanism in the pdb to retrieve credentials (using PowerShell and Windows credentials store) (see [#37](https://github.com/GitTools/GitLink/issues/37))
+* Use a proxy service that does not require authentication (see [#66](https://github.com/GitTools/GitLink/issues/66) and [Source server with Git repository](https://shonnlyga.wordpress.com/2016/05/28/source-server-with-git-repository))
+
 
 # Supported git providers
 
@@ -218,6 +229,7 @@ Below is a list of projects already using GitLink (alphabetically ordered).
 
 - <a href="http://www.catelproject.com" target="_blank">Catel</a>
 - <a href="http://www.expandframework.com/" target="_blank">eXpand</a>
+- <a href="https://fakeiteasy.github.io/" target="_blank">FakeItEasy</a>
 - <a href="https://github.com/fluentribbon/Fluent.Ribbon" target="_blank">Fluent.Ribbon</a>
 - <a href="https://github.com/GitTools/GitLink" target="_blank">GitLink</a>
 - <a href="https://github.com/MahApps/MahApps.Metro" target="_blank">MahApps.Metro</a>
@@ -250,6 +262,8 @@ Below is a list of projects already using GitLink (alphabetically ordered).
 - <a href="https://github.com/MetacoSA/QBitNinja" target="_blank">QBitNinja</a>
 - <a href="http://reactiveui.net" target="_blank">ReactiveUI</a>
 - <a href="http://romanticweb.net" target="_blank">Romantic Web</a>
+- <a href="https://github.com/dotnet/roslyn" target="_blank">Roslyn</a>
+- <a href="https://github.com/volkanceylan/serenity" target="_blank">Serenity</a>
 - <a href="https://github.com/xunit/xunit" target="_blank">xUnit.net</a>
 - <a href="https://github.com/xunit/visualstudio.xunit" target="_blank">xUnit.net Visual Studio Runner</a>
 

deployment/Chocolatey/template/GitHubLink/GitHubLink.nuspec

@@ -16,9 +16,9 @@
 	<tags>source symbol symbols server sourcelink github bitbucket git stepping debugging</tags>
 
 	<language>en-US</language>
-	<projectUrl>https://github.com/CatenaLogic/GitLink/</projectUrl>	
-	<licenseUrl>https://github.com/CatenaLogic/GitLink/blob/develop/LICENSE</licenseUrl>
-	<iconUrl>https://raw.githubusercontent.com/CatenaLogic/GitLink/develop/design/logo/logo_64.png</iconUrl>
+	<projectUrl>https://github.com/GitTools/GitLink/</projectUrl>	
+	<licenseUrl>https://github.com/GitTools/GitLink/blob/develop/LICENSE</licenseUrl>
+	<iconUrl>https://raw.githubusercontent.com/GitTools/GitLink/develop/design/logo/logo_64.png</iconUrl>
 
     <dependencies>
       <dependency id="gitlink" version="[VERSION]" />

deployment/Chocolatey/template/GitHubLink/tools/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 - 2016 CatenaLogic
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

deployment/Chocolatey/template/GitLink/GitLink.nuspec

@@ -17,8 +17,8 @@
 	<tags>gitlink githublinksource symbol symbols server sourcelink github bitbucket git stepping debugging</tags>
 
 	<language>en-US</language>
-	<projectUrl>https://github.com/CatenaLogic/GitLink/</projectUrl>	
-	<licenseUrl>https://github.com/CatenaLogic/GitLink/blob/develop/LICENSE</licenseUrl>
-	<iconUrl>https://raw.githubusercontent.com/CatenaLogic/GitLink/develop/design/logo/logo_128.png</iconUrl>
+	<projectUrl>https://github.com/GitTools/GitLink/</projectUrl>	
+	<licenseUrl>https://github.com/GitTools/GitLink/blob/develop/LICENSE</licenseUrl>
+	<iconUrl>https://raw.githubusercontent.com/GitTools/GitLink/develop/design/logo/logo_128.png</iconUrl>
   </metadata>
 </package>

deployment/Chocolatey/template/GitLink/tools/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 - 2016 CatenaLogic
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

deployment/NuGet/template/GitHubLink/GitHubLink.nuspec

@@ -5,6 +5,7 @@
     <version>[VERSION]</version>
 	<title>GitHubLink</title>
     <authors>GeertvanHorrik</authors>
+    <developmentDependency>true</developmentDependency>
 
 	<description>
 	  ** Note: this is a maintenance package, GitHubLink is replaced by GitLink **
@@ -16,9 +17,9 @@
 	<tags>source symbol symbols server sourcelink github bitbucket git stepping debugging</tags>
 
 	<language>en-US</language>
-	<projectUrl>https://github.com/CatenaLogic/GitLink/</projectUrl>	
-	<licenseUrl>https://github.com/CatenaLogic/GitLink/blob/develop/LICENSE</licenseUrl>
-	<iconUrl>https://raw.githubusercontent.com/CatenaLogic/GitLink/develop/design/logo/logo_64.png</iconUrl>
+	<projectUrl>https://github.com/GitTools/GitLink/</projectUrl>	
+	<licenseUrl>https://github.com/GitTools/GitLink/blob/develop/LICENSE</licenseUrl>
+	<iconUrl>https://raw.githubusercontent.com/GitTools/GitLink/develop/design/logo/logo_64.png</iconUrl>
 
     <dependencies>
       <dependency id="gitlink" version="[VERSION]" />

deployment/NuGet/template/GitLink/GitLink.nuspec

@@ -5,6 +5,7 @@
     <version>[VERSION]</version>
 	<title>GitLink</title>
     <authors>GeertvanHorrik</authors>
+    <developmentDependency>true</developmentDependency>
 
 	<description>
 	  GitLink let's users step through your code hosted on any Git hosting service! This makes symbol servers obsolete which saves you both time 
@@ -17,8 +18,8 @@
 	<tags>gitlink githublink source symbol symbols server sourcelink github bitbucket git stepping debugging</tags>
 
 	<language>en-US</language>
-	<projectUrl>https://github.com/CatenaLogic/GitLink/</projectUrl>	
-	<licenseUrl>https://github.com/CatenaLogic/GitLink/blob/develop/LICENSE</licenseUrl>
-	<iconUrl>https://raw.githubusercontent.com/CatenaLogic/GitLink/develop/design/logo/logo_64.png</iconUrl>
+	<projectUrl>https://github.com/GitTools/GitLink/</projectUrl>	
+	<licenseUrl>https://github.com/GitTools/GitLink/blob/develop/LICENSE</licenseUrl>
+	<iconUrl>https://raw.githubusercontent.com/GitTools/GitLink/develop/design/logo/logo_64.png</iconUrl>
   </metadata>
 </package>

deployment/NuGet/template/GitLinkTask/Build/dotnet/GitLink.targets

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <UsingTask TaskName="GitLinkTask.LinkProject" AssemblyFile="$(MSBuildThisFileDirectory)..\..\GitLinkTask.dll" />
+
+    <Target Name="GitLinkProject" AfterTargets="CopyFilesToOutputDirectory">
+        <LinkProject
+            SolutionDirectory="$(SolutionDir)"
+            ProjectName="$(MSBuildProjectName)" />
+    </Target>
+</Project>

deployment/NuGet/template/GitLinkTask/GitLinkTask.nuspec

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <id>gitlinktask</id>
+    <version>[VERSION]</version>
+	<title>GitLinkTask</title>
+    <authors>GeertvanHorrik</authors>
+    <developmentDependency>true</developmentDependency>
+
+	<description>
+	  GitLink let's users step through your code hosted on any Git hosting service! This makes symbol servers obsolete which saves you both time 
+      with uploading source files with symbols and the user no longer has to specify custom symbol servers (such as symbolsource.org).
+	</description>
+
+	<summary>
+	</summary>
+
+	<tags>gitlink githublink source symbol symbols server sourcelink github bitbucket git stepping debugging</tags>
+
+	<language>en-US</language>
+	<projectUrl>https://github.com/GitTools/GitLink/</projectUrl>	
+	<licenseUrl>https://github.com/GitTools/GitLink/blob/develop/LICENSE</licenseUrl>
+	<iconUrl>https://raw.githubusercontent.com/GitTools/GitLink/develop/design/logo/logo_64.png</iconUrl>
+  </metadata>
+</package>