Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Splitted "extern" directory into "lib" (dependencies) and "tools". Re…

…named "extern" to "old_extern".
  • Loading branch information...
commit f33d85a7e9c5852d3e141a3aed5f298917a57aaa 1 parent 883e358
@nulltoken nulltoken authored
Showing with 17 additions and 24 deletions.
  1. +2 −9 CLI/GitSharp.CLI.csproj
  2. +5 −6 Core/GitSharp.Core.csproj
  3. +2 −2 Core/default.build
  4. +1 −0  GitSharp.sln
  5. +2 −2 Tests/GitSharp.Tests.csproj
  6. +1 −1  Tests/default.build
  7. 0  extern/FileMap/License.txt → Winterdom.IO.FileMap License.txt
  8. +1 −1  build-ci.cmd
  9. +1 −1  build.cmd
  10. +2 −2 common.xml
  11. BIN  extern/nunit.core.dll
  12. BIN  extern/nunit.core.interfaces.dll
  13. BIN  extern/nunit.util.dll
  14. 0  {extern → lib}/DiffieHellman.dll
  15. 0  {extern → lib}/ICSharpCode.SharpZipLib.dll
  16. 0  {extern → lib}/ICSharpCode.SharpZipLib.xml
  17. 0  {extern → lib}/Org.Mentalis.Security.dll
  18. 0  {extern → lib}/Tamir.SharpSSH.dll
  19. 0  {extern/FileMap → lib}/Winterdom.IO.FileMap.dll
  20. 0  {extern/FileMap → lib}/Winterdom.IO.FileMap.pdb
  21. 0  {extern → old_extern}/CodePlex.MSBuildTasks.dll
  22. 0  {extern → old_extern}/Routrek.granados License.txt
  23. 0  {extern → old_extern}/Routrek.granados.dll
  24. 0  {extern → tools}/nant/NAnt.Core.dll
  25. 0  {extern → tools}/nant/NAnt.DotNetTasks.dll
  26. 0  {extern → tools}/nant/NAnt.Win32Tasks.dll
  27. 0  {extern → tools}/nant/NAnt.exe
  28. 0  {extern → tools}/nant/NAnt.exe.config
  29. 0  {extern → tools}/nant/log4net.dll
  30. 0  {extern → tools}/nunit/nunit-console-runner.dll
  31. 0  {extern → tools}/nunit/nunit-console.exe
  32. 0  {extern → tools}/nunit/nunit-console.exe.config
  33. 0  {extern → tools}/nunit/nunit.core.dll
  34. 0  {extern → tools/nunit}/nunit.core.extensions.dll
  35. 0  {extern → tools}/nunit/nunit.core.interfaces.dll
  36. 0  {extern → tools/nunit}/nunit.framework.dll
  37. 0  {extern → tools/nunit}/nunit.framework.extensions.dll
  38. 0  {extern → tools/nunit}/nunit.framework.xml
  39. 0  {extern → tools}/nunit/nunit.util.dll
View
11 CLI/GitSharp.CLI.csproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{2A467118-E885-44FC-B7AF-DFAD937F6012}</ProjectGuid>
<OutputType>Exe</OutputType>
@@ -52,13 +52,6 @@
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
- <Reference Include="System.Xml.Linq">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
- <Reference Include="System.Data.DataSetExtensions">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
- <Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
View
11 Core/GitSharp.Core.csproj
@@ -37,23 +37,22 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=null">
+ <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\extern\ICSharpCode.SharpZipLib.dll</HintPath>
+ <HintPath>..\lib\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="System" />
- <Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="Tamir.SharpSSH, Version=1.1.1.13, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\extern\Tamir.SharpSSH.dll</HintPath>
+ <HintPath>..\lib\Tamir.SharpSSH.dll</HintPath>
</Reference>
- <Reference Include="Winterdom.IO.FileMap, Version=2.0.2.0, Culture=neutral, PublicKeyToken=4982617362e1edb5">
+ <Reference Include="Winterdom.IO.FileMap, Version=2.0.2.0, Culture=neutral, PublicKeyToken=4982617362e1edb5, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\extern\FileMap\Winterdom.IO.FileMap.dll</HintPath>
+ <HintPath>..\lib\Winterdom.IO.FileMap.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
View
4 Core/default.build
@@ -5,9 +5,9 @@
<property name="build.warnaserrors" value="false"/>
<target name="build" depends="common.init">
- <fileset id="project.references" basedir="../extern">
+ <fileset id="project.references" basedir="../lib">
<include name="ICSharpCode.SharpZipLib.dll" />
- <include name="FileMap/Winterdom.IO.FileMap.dll" />
+ <include name="Winterdom.IO.FileMap.dll" />
<include name="Tamir.SharpSSH.dll" />
</fileset>
<call target="common.copy-references"/>
View
1  GitSharp.sln
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
GitSharp licence.txt = GitSharp licence.txt
MiscUtil licence.txt = MiscUtil licence.txt
README.txt = README.txt
+ Winterdom.IO.FileMap License.txt = Winterdom.IO.FileMap License.txt
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitSharp.CLI", "CLI\GitSharp.CLI.csproj", "{2A467118-E885-44FC-B7AF-DFAD937F6012}"
View
4 Tests/GitSharp.Tests.csproj
@@ -31,9 +31,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.5.0.9122, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\extern\nunit.framework.dll</HintPath>
+ <HintPath>..\tools\nunit\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
View
2  Tests/default.build
@@ -27,7 +27,7 @@
</fileset>
</copy>
<assemblyfileset id="project.references">
- <include name="../extern/nunit.framework.dll" />
+ <include name="../tools/nunit/nunit.framework.dll" />
<include name="../GitSharp/build/${nant.settings.currentframework}/${project.config}/*.dll" />
</assemblyfileset>
<call target="common.copy-references"/>
View
0  extern/FileMap/License.txt → Winterdom.IO.FileMap License.txt
File renamed without changes
View
2  build-ci.cmd
@@ -1 +1 @@
-extern\nant\NAnt.exe
+tools\nant\NAnt.exe
View
2  build.cmd
@@ -1,3 +1,3 @@
-extern\nant\NAnt.exe
+tools\nant\nant.exe
pause
View
4 common.xml
@@ -33,7 +33,7 @@
Path to the folder that contain the external assemblies. For net-2.0 the values will
be lib, lib/net, and lib/net/2.0 respectively.
-->
- <property name="lib.dir" value="extern" dynamic="true" />
+ <property name="lib.dir" value="lib" dynamic="true" />
<property name="lib.family.dir" value="${path::combine(lib.dir, framework::get-family(framework::get-target-framework()))}" dynamic="true" />
<if test="${nant-version.current != nant-version.beta1_086 or framework::get-target-framework() != 'net-3.5'}">
@@ -346,7 +346,7 @@
<target name="common.find-tools">
<!-- Where is nunit-console executable(win/mono) ? -->
<property name="nunit-console2" value="nunit-console2" overwrite="false" />
- <property name="nunit-console" value="${root.dir}/extern/nunit/nunit-console.exe" overwrite="false" />
+ <property name="nunit-console" value="${root.dir}/tools/nunit/nunit-console.exe" overwrite="false" />
<!-- Where is NCover? (on 64-bit Windows NAnt's get-folder-path() returns the x86 directory which is not what we want) -->
<property name="ncover.dir" value="C:\Program Files\NCover" overwrite="false" />
View
BIN  extern/nunit.core.dll
Binary file not shown
View
BIN  extern/nunit.core.interfaces.dll
Binary file not shown
View
BIN  extern/nunit.util.dll
Binary file not shown
View
0  extern/DiffieHellman.dll → lib/DiffieHellman.dll
File renamed without changes
View
0  extern/ICSharpCode.SharpZipLib.dll → lib/ICSharpCode.SharpZipLib.dll
File renamed without changes
View
0  extern/ICSharpCode.SharpZipLib.xml → lib/ICSharpCode.SharpZipLib.xml
File renamed without changes
View
0  extern/Org.Mentalis.Security.dll → lib/Org.Mentalis.Security.dll
File renamed without changes
View
0  extern/Tamir.SharpSSH.dll → lib/Tamir.SharpSSH.dll
File renamed without changes
View
0  extern/FileMap/Winterdom.IO.FileMap.dll → lib/Winterdom.IO.FileMap.dll
File renamed without changes
View
0  extern/FileMap/Winterdom.IO.FileMap.pdb → lib/Winterdom.IO.FileMap.pdb
File renamed without changes
View
0  extern/CodePlex.MSBuildTasks.dll → old_extern/CodePlex.MSBuildTasks.dll
File renamed without changes
View
0  extern/Routrek.granados License.txt → old_extern/Routrek.granados License.txt
File renamed without changes
View
0  extern/Routrek.granados.dll → old_extern/Routrek.granados.dll
File renamed without changes
View
0  extern/nant/NAnt.Core.dll → tools/nant/NAnt.Core.dll
File renamed without changes
View
0  extern/nant/NAnt.DotNetTasks.dll → tools/nant/NAnt.DotNetTasks.dll
File renamed without changes
View
0  extern/nant/NAnt.Win32Tasks.dll → tools/nant/NAnt.Win32Tasks.dll
File renamed without changes
View
0  extern/nant/NAnt.exe → tools/nant/NAnt.exe
File renamed without changes
View
0  extern/nant/NAnt.exe.config → tools/nant/NAnt.exe.config
File renamed without changes
View
0  extern/nant/log4net.dll → tools/nant/log4net.dll
File renamed without changes
View
0  extern/nunit/nunit-console-runner.dll → tools/nunit/nunit-console-runner.dll
File renamed without changes
View
0  extern/nunit/nunit-console.exe → tools/nunit/nunit-console.exe
File renamed without changes
View
0  extern/nunit/nunit-console.exe.config → tools/nunit/nunit-console.exe.config
File renamed without changes
View
0  extern/nunit/nunit.core.dll → tools/nunit/nunit.core.dll
File renamed without changes
View
0  extern/nunit.core.extensions.dll → tools/nunit/nunit.core.extensions.dll
File renamed without changes
View
0  extern/nunit/nunit.core.interfaces.dll → tools/nunit/nunit.core.interfaces.dll
File renamed without changes
View
0  extern/nunit.framework.dll → tools/nunit/nunit.framework.dll
File renamed without changes
View
0  extern/nunit.framework.extensions.dll → tools/nunit/nunit.framework.extensions.dll
File renamed without changes
View
0  extern/nunit.framework.xml → tools/nunit/nunit.framework.xml
File renamed without changes
View
0  extern/nunit/nunit.util.dll → tools/nunit/nunit.util.dll
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.