Merge branch 'release/1.5.0'

GitTools · Aug 27, 2014 · abfb231 · abfb231
2 parents 28d97a2 + b5a5027
commit abfb231
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -116,10 +116,12 @@ GitHubLink creates a source index file and updates the PDB file so it will retri
 <a name="ProjectsUsingGitHubLink"></a>
 # Projects using GitHubLink #
 
-Below is a list of projects already using GitHubLink.
+Below is a list of projects already using GitHubLink (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://github.com/GeertvanHorrik/GitHubLink" target="_blank">GitHubLink</a>
+- <a href="https://github.com/orcomp/orchestra" target="_blank">Orchestra</a>
 
 Are you using GitHubLink in your projects? Let us know and we will add your project to the list.
 

diff --git a/lib/RestorePackages.bat b/lib/RestorePackages.bat
diff --git a/scripts - Clean all.bat b/scripts - Clean all.bat
@@ -0,0 +1,7 @@
+REM Deleting packages
+for /d %%p in (".\lib\*.*") do rmdir "%%p" /s /q
+
+REM Deleting output
+rmdir .\output /s /q
+
+pause
diff --git a/scripts - Restore packages.bat b/scripts - Restore packages.bat
@@ -0,0 +1,4 @@
+for /f %%a in ('dir /b src\*.sln') do call tools\nuget\nuget.exe restore src\%%a -PackagesDirectory .\lib
+
+
+pause
diff --git a/src/GitHubLink/FodyWeavers.xml b/src/GitHubLink/FodyWeavers.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Weavers>
-  <Costura />
+  <Costura>
+    <IncludeAssemblies>
+      Catel.Core
+      FSharp.Core
+      LibGit2Sharp
+      SourceLink
+    </IncludeAssemblies>
+  </Costura>
 </Weavers>
diff --git a/src/GitHubLink/GitHubLink.csproj b/src/GitHubLink/GitHubLink.csproj
@@ -50,7 +50,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Catel.Core.3.9.0.1404200146-beta\lib\net45\Catel.Core.dll</HintPath>
     </Reference>
-    <Reference Include="FSharp.Core, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="FSharp.Core, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <Private>True</Private>
+    </Reference>
     <Reference Include="LibGit2Sharp">
       <HintPath>..\..\lib\LibGit2Sharp.0.17.0.0\lib\net35\LibGit2Sharp.dll</HintPath>
       <Private>True</Private>

diff --git a/src/GitHubLink/HelpWriter.cs b/src/GitHubLink/HelpWriter.cs
@@ -30,10 +30,11 @@ Note that the solution must be built because this application will update existi
 
 GitHubLink [solutionPath] -url [urlToRepository]
 
-    solutionPath     The directory containing the solution with the pdb files.
-    -url [url]       Url to remote git repository.
-    -b [branch]      Name of the branch to use on the remote repository.
-    -l [file]        
+    solutionPath       The directory containing the solution with the pdb files.
+    -url [url]         Url to remote git repository.
+    -c [config]        Name of the configuration, default value is 'Release'.
+    -b [branch]        Name of the branch to use on the remote repository.
+    -l [file]          The log file to write to.
 ";
             writer(message);
         }

diff --git a/src/GitHubLink/Program.cs b/src/GitHubLink/Program.cs
@@ -53,6 +53,10 @@ private static int Main(string[] args)
             {
                 Log.Error(ex, "An unexpected error occurred");
 
+#if DEBUG
+                WaitForKeyPress();
+#endif
+
                 return -1;
             }
         }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		for /f %%a in ('dir /b src\*.sln') do call tools\nuget\nuget.exe restore src\%%a -PackagesDirectory .\lib


		pause