Moving source in the 'src' folder

to respect .net conventions....
2017-10-13 02:18:15 +02:00
parent 943b410fb1
commit 67322590c2
275 changed files with 26 additions and 269 deletions
@@ -308,3 +308,6 @@ __pycache__/
 *.btm.cs
 *.odx.cs
 *.xsd.cs
+/src/packages/
+/src/GitTfsTest.dll.xml
+/src/.build
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<!--
-<auto-generated>
-    This code was generated by WixSharp.
-    Changes to this file will be lost if the code is regenerated.
-</auto-generated>
-->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="98823cc2-0c2e-4cf7-b5ed-ea2dd3e579c0" Name="GitTfs" Language="1033" Codepage="Windows-1252" Version="0.24.2.0" UpgradeCode="98823cc2-0c2e-4cf7-b5ed-ea2dd26559bf" Manufacturer="SEP">
-    <Package InstallerVersion="200" Compressed="yes" SummaryCodepage="Windows-1252" Languages="1033" />
-    <Media Id="1" Cabinet="GitTfs.cab" EmbedCab="yes" />
-
-    <Directory Id="TARGETDIR" Name="SourceDir" >
-      <Directory Id="ProgramFilesFolder" Name="ProgramFilesFolder">
-        <Directory Id="INSTALLDIR" Name="GitTfs">
-
-          <Component Id="Component.git_tfs.exe" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d8d5d2aa7">
-            <File Id="git_tfs.exe" Source="git-tfs.exe" />
-          </Component>
-
-          <Component Id="Component.git_tfs.exe.config" Guid="98823cc2-0c2e-4cf7-b5ed-ea2de8d74896">
-            <File Id="git_tfs.exe.config" Source="git-tfs.exe.config" />
-          </Component>
-
-          <Component Id="Component.git_tfs.vshost.exe" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d3e2ac591">
-            <File Id="git_tfs.vshost.exe" Source="git-tfs.vshost.exe" />
-          </Component>
-
-          <Component Id="Component.git_tfs.vshost.exe.config" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d919545ef">
-            <File Id="git_tfs.vshost.exe.config" Source="git-tfs.vshost.exe.config" />
-          </Component>
-
-          <Component Id="Component.git_tfs.vshost.exe.manifest" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d830586b1">
-            <File Id="git_tfs.vshost.exe.manifest" Source="git-tfs.vshost.exe.manifest" />
-          </Component>
-
-          <Component Id="Component.LibGit2Sharp.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d0c3b0a61">
-            <File Id="LibGit2Sharp.dll" Source="LibGit2Sharp.dll" />
-          </Component>
-
-          <Component Id="Component.LICENSE" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d0251e100">
-            <File Id="LICENSE" Source="LICENSE" />
-          </Component>
-
-          <Component Id="Component.NDesk.Options.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2dc7b41d0a">
-            <File Id="NDesk.Options.dll" Source="NDesk.Options.dll" />
-          </Component>
-
-          <Component Id="Component.NOTICE" Guid="98823cc2-0c2e-4cf7-b5ed-ea2dd28a056f">
-            <File Id="NOTICE" Source="NOTICE" />
-          </Component>
-
-          <Component Id="Component.README.md" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d1880e4e8">
-            <File Id="README.md" Source="README.md" />
-          </Component>
-
-          <Component Id="Component.StructureMap.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d9ded19de">
-            <File Id="StructureMap.dll" Source="StructureMap.dll" />
-          </Component>
-
-          <Directory Id="INSTALLDIR.GitTfs.Vs2015" Name="GitTfs.Vs2015">
-
-            <Component Id="Component.GitTfs.Vs2015.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d286e967e">
-              <File Id="GitTfs.Vs2015.dll" Source="GitTfs.Vs2015\GitTfs.Vs2015.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.TeamFoundation.Build.Client.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2df62dbdb8">
-              <File Id="Microsoft.TeamFoundation.Build.Client.dll" Source="GitTfs.Vs2015\Microsoft.TeamFoundation.Build.Client.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.TeamFoundation.Build.Common.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2dab4871b3">
-              <File Id="Microsoft.TeamFoundation.Build.Common.dll" Source="GitTfs.Vs2015\Microsoft.TeamFoundation.Build.Common.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.TeamFoundation.Client.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2dd4d1e7fa">
-              <File Id="Microsoft.TeamFoundation.Client.dll" Source="GitTfs.Vs2015\Microsoft.TeamFoundation.Client.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.TeamFoundation.Common.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2daf02aa67">
-              <File Id="Microsoft.TeamFoundation.Common.dll" Source="GitTfs.Vs2015\Microsoft.TeamFoundation.Common.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.TeamFoundation.Diff.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d8738eadb">
-              <File Id="Microsoft.TeamFoundation.Diff.dll" Source="GitTfs.Vs2015\Microsoft.TeamFoundation.Diff.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.TeamFoundation.VersionControl.Client.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d5c4ef6f8">
-              <File Id="Microsoft.TeamFoundation.VersionControl.Client.dll" Source="GitTfs.Vs2015\Microsoft.TeamFoundation.VersionControl.Client.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.TeamFoundation.VersionControl.Common.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2dc8dad7af">
-              <File Id="Microsoft.TeamFoundation.VersionControl.Common.dll" Source="GitTfs.Vs2015\Microsoft.TeamFoundation.VersionControl.Common.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.TeamFoundation.VersionControl.Common.Integration.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d11eeecba">
-              <File Id="Microsoft.TeamFoundation.VersionControl.Common.Integration.dll" Source="GitTfs.Vs2015\Microsoft.TeamFoundation.VersionControl.Common.Integration.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d015a4f39">
-              <File Id="Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll" Source="GitTfs.Vs2015\Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.TeamFoundation.WorkItemTracking.Client.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d0ed7561d">
-              <File Id="Microsoft.TeamFoundation.WorkItemTracking.Client.dll" Source="GitTfs.Vs2015\Microsoft.TeamFoundation.WorkItemTracking.Client.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d137f6fa9">
-              <File Id="Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll" Source="GitTfs.Vs2015\Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.TeamFoundation.WorkItemTracking.Common.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d2a79d050">
-              <File Id="Microsoft.TeamFoundation.WorkItemTracking.Common.dll" Source="GitTfs.Vs2015\Microsoft.TeamFoundation.WorkItemTracking.Common.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d5e437242">
-              <File Id="Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll" Source="GitTfs.Vs2015\Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.VisualStudio.Services.Client.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2de6b2259b">
-              <File Id="Microsoft.VisualStudio.Services.Client.dll" Source="GitTfs.Vs2015\Microsoft.VisualStudio.Services.Client.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.VisualStudio.Services.Common.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d0ac60752">
-              <File Id="Microsoft.VisualStudio.Services.Common.dll" Source="GitTfs.Vs2015\Microsoft.VisualStudio.Services.Common.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.VisualStudio.Services.WebApi.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d4c32ab8e">
-              <File Id="Microsoft.VisualStudio.Services.WebApi.dll" Source="GitTfs.Vs2015\Microsoft.VisualStudio.Services.WebApi.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.WITDataStore32.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d275e8299">
-              <File Id="Microsoft.WITDataStore32.dll" Source="GitTfs.Vs2015\Microsoft.WITDataStore32.dll" />
-            </Component>
-
-            <Component Id="Component.Microsoft.WITDataStore64.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d28bc821c">
-              <File Id="Microsoft.WITDataStore64.dll" Source="GitTfs.Vs2015\Microsoft.WITDataStore64.dll" />
-            </Component>
-
-            <Component Id="Component.Newtonsoft.Json.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d60bfd49a">
-              <File Id="Newtonsoft.Json.dll" Source="GitTfs.Vs2015\Newtonsoft.Json.dll" />
-            </Component>
-
-            <Component Id="Component.System.Net.Http.Formatting.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d1402241e">
-              <File Id="System.Net.Http.Formatting.dll" Source="GitTfs.Vs2015\System.Net.Http.Formatting.dll" />
-            </Component>
-
-            <Component Id="Component.System.Web.Http.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2d544280eb">
-              <File Id="System.Web.Http.dll" Source="GitTfs.Vs2015\System.Web.Http.dll" />
-            </Component>
-
-          </Directory>
-
-          <Directory Id="INSTALLDIR.NativeBinaries" Name="NativeBinaries">
-            <Directory Id="INSTALLDIR.NativeBinaries.amd64" Name="amd64">
-
-              <Component Id="Component.git2_e0902fb.dll" Guid="98823cc2-0c2e-4cf7-b5ed-ea2dda07a157">
-                <File Id="git2_e0902fb.dll" Source="NativeBinaries\amd64\git2-e0902fb.dll" />
-              </Component>
-
-            </Directory>
-
-            <Directory Id="INSTALLDIR.NativeBinaries.x86" Name="x86">
-
-              <Component Id="Component.git2_e0902fb.dll.1" Guid="98823cc2-0c2e-4cf7-b5ed-ea2dc0c032ab">
-                <File Id="git2_e0902fb.dll.1" Source="NativeBinaries\x86\git2-e0902fb.dll" />
-              </Component>
-
-            </Directory>
-          </Directory>
-
-          <Component Id="EnvVars1" Guid="98823cc2-0c2e-4cf7-b5ed-ea2dfd552c9c">
-            <Environment Id="PATH" Name="PATH" Action="set" Part="last" Value="[INSTALLDIR]" />
-
-            <CreateFolder />
-          </Component>
-
-        </Directory>
-      </Directory>
-    </Directory>
-
-    <Property Id="ARPCOMMENTS" Value="A Git/TFS bridge, similar to git-svn"  />
-    <Property Id="ARPHELPLINK" Value="http://git-tfs.com/"  />
-    <Property Id="ARPURLUPDATEINFO" Value="https://github.com/git-tfs/git-tfs/releases"  />
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"  />
-
-    <WixVariable Id="WixUILicenseRtf" Value="C:\data\git-tfs\GitTfs\bin\Release\LICENSE.rtf"  />
-
-    <MajorUpgrade DowngradeErrorMessage="A later version of GitTfs is already installed. Setup will now exit." Schedule="afterInstallInitialize"  />
-
-    <UIRef Id="WixUI_InstallDir"  />
-
-    <Feature Id="Complete" Title="Complete" Absent="allow" Level="1" >
-      <ComponentRef Id="Component.git_tfs.exe" />
-      <ComponentRef Id="Component.git_tfs.exe.config" />
-      <ComponentRef Id="Component.git_tfs.vshost.exe" />
-      <ComponentRef Id="Component.git_tfs.vshost.exe.config" />
-      <ComponentRef Id="Component.git_tfs.vshost.exe.manifest" />
-      <ComponentRef Id="Component.LibGit2Sharp.dll" />
-      <ComponentRef Id="Component.LICENSE" />
-      <ComponentRef Id="Component.NDesk.Options.dll" />
-      <ComponentRef Id="Component.NOTICE" />
-      <ComponentRef Id="Component.README.md" />
-      <ComponentRef Id="Component.StructureMap.dll" />
-      <ComponentRef Id="Component.GitTfs.Vs2015.dll" />
-      <ComponentRef Id="Component.Microsoft.TeamFoundation.Build.Client.dll" />
-      <ComponentRef Id="Component.Microsoft.TeamFoundation.Build.Common.dll" />
-      <ComponentRef Id="Component.Microsoft.TeamFoundation.Client.dll" />
-      <ComponentRef Id="Component.Microsoft.TeamFoundation.Common.dll" />
-      <ComponentRef Id="Component.Microsoft.TeamFoundation.Diff.dll" />
-      <ComponentRef Id="Component.Microsoft.TeamFoundation.VersionControl.Client.dll" />
-      <ComponentRef Id="Component.Microsoft.TeamFoundation.VersionControl.Common.dll" />
-      <ComponentRef Id="Component.Microsoft.TeamFoundation.VersionControl.Common.Integration.dll" />
-      <ComponentRef Id="Component.Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll" />
-      <ComponentRef Id="Component.Microsoft.TeamFoundation.WorkItemTracking.Client.dll" />
-      <ComponentRef Id="Component.Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll" />
-      <ComponentRef Id="Component.Microsoft.TeamFoundation.WorkItemTracking.Common.dll" />
-      <ComponentRef Id="Component.Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll" />
-      <ComponentRef Id="Component.Microsoft.VisualStudio.Services.Client.dll" />
-      <ComponentRef Id="Component.Microsoft.VisualStudio.Services.Common.dll" />
-      <ComponentRef Id="Component.Microsoft.VisualStudio.Services.WebApi.dll" />
-      <ComponentRef Id="Component.Microsoft.WITDataStore32.dll" />
-      <ComponentRef Id="Component.Microsoft.WITDataStore64.dll" />
-      <ComponentRef Id="Component.Newtonsoft.Json.dll" />
-      <ComponentRef Id="Component.System.Net.Http.Formatting.dll" />
-      <ComponentRef Id="Component.System.Web.Http.dll" />
-      <ComponentRef Id="Component.git2_e0902fb.dll" />
-      <ComponentRef Id="Component.git2_e0902fb.dll.1" />
-      <ComponentRef Id="EnvVars1" />
-    </Feature>
-
-  </Product>
-</Wix>
-
@@ -162,7 +162,7 @@ And depending of the version of TFS you use :

    #get the source code
    git clone git://github.com/git-tfs/git-tfs.git
-    cd git-tfs
+    cd git-tfs\src

    #building with Cake (in a powershell console). It will also run the unit tests ;)
    .\build.ps1
@@ -1,29 +1,24 @@
 #appveyor.yml reference: http://www.appveyor.com/docs/appveyor-yml
-#version: 0.25.1.{build}
-#platform: x86
 clone_folder: c:\gittfs
 # build cache to preserve files/folders between builds
 cache:
-  - packages -> paket.lock  # preserve "packages" directory in the root of build folder but will reset it if `paket.lock` is modified
+  - packages -> src\paket.lock  # preserve "packages" directory in the root of build folder but will reset it if `paket.lock` is modified
 init: []
-#before_build:
-#  - ps: $env:Config = "Release"
 build_script:
 - ps: |
    $env:configuration = "Release"
+    cd src
    if($env:target -eq $null)
    {
      $target = "AppVeyorBuild"
      echo "target: $target"
      .\build.ps1 -Target "$target" -Configuration $env:configuration -ScriptArgs '-isDryRun=true -gitHubUserAccount"$env:gitHubUserAccount" -gitHubToken="$env:gitHubToken" -chocolateyToken="$env:chocolateyToken"'
-      #$UseDryRun = "false"
    }
    else
    {
      $target = $env:target
      echo "target: $target"
      .\build.ps1 -Target "$target" -Configuration $env:configuration -ScriptArgs '-isDryRun=false -gitHubUserAccount"$env:gitHubUserAccount" -gitHubToken="$env:gitHubToken" -chocolateyToken="$env:chocolateyToken"'
-      #$UseDryRun = "true"
    }

 test: off
@@ -1,28 +1,20 @@
-The unit tests for git-tfs use [xUnit.net](http://xunit.codeplex.com). All the necessary bits of xunit should be installed by nuget.
+The unit tests for git-tfs use [xUnit.net](https://xunit.github.io/).

 ## CI-style

-If you want to run tests like the CI build, then do this: `msbuild CI.proj`.
-
-## Building
-
-To build the tests, you only need to build the GitTfs, GitTfs.VsFake, LibGit2Sharp, and GitTfsTest projects in VS. All of these will build if you right-click on GitTfsTest and choose 'Build'. From the command-line, you can `msbuild GitTfs.sln /t:GitTfsTest`.
+If you want to run tests like the CI build, then go to the `src` folder and run in a powershell console: `.\build.ps1`.

 ## Running

-To run the tests, you can use the gui runner or the console runner. If you have a VS extension with support for xUnit.net, then you may be able to run the tests inside Visual Studio.
-
-### xUnit.net GUI runner
-
-The gui runner is `packages\xunit.runners.1.9.2\tools\xunit.gui.clr4.x86.exe`. Load the GitTfsTest assembly (i.e. GitTfsTest\bin\Debug\GitTfsTest.dll).
+To run the tests, you can use the console runner.
+You also may be able to run the tests inside Visual Studio in the 'Test Explorer' (or use another launcher like Reshaper, ncrunch, ...).

 ### xUnit.net console runner

 Here is an example running the tests with the console runner:

 ```
-C:\src\git-tfs>packages\xunit.runners.1.9.2\tools
-\xunit.console.clr4.x86.exe GitTfsTest\bin\Debug\GitTfsTest.dll
+C:\src\git-tfs\src>packages\build\xunit.runner.console\tools\net452\xunit.console.exe GitTfsTest\bin\Debug\GitTfsTest.dll
 xUnit.net console test runner (32-bit .NET 4.0.30319.269)
 Copyright (C) 2007-11 Microsoft Corporation.

@@ -19,18 +19,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTfs.Vs2012", "GitTfs.Vs2
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{4A46FEEE-B8A2-4445-B9D1-8160520C7301}"
 	ProjectSection(SolutionItems) = preProject
-		doc\develop-on-mono.md = doc\develop-on-mono.md
-		doc\release-notes\NEXT.md = doc\release-notes\NEXT.md
-		README.md = README.md
-		doc\running-the-unit-tests.md = doc\running-the-unit-tests.md
+		..\doc\develop-on-mono.md = ..\doc\develop-on-mono.md
+		..\doc\release-notes\NEXT.md = ..\doc\release-notes\NEXT.md
+		..\README.md = ..\README.md
+		..\doc\running-the-unit-tests.md = ..\doc\running-the-unit-tests.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CDE05FFA-9DDB-4694-8CA6-6DB7B235CD7F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ChocolateyTemplates", "ChocolateyTemplates", "{AC0FE25D-D76B-4EE7-9EA8-470204451C9F}"
 	ProjectSection(SolutionItems) = preProject
-		ChocolateyTemplates\chocolateyInstall.ps1 = ChocolateyTemplates\chocolateyInstall.ps1
-		ChocolateyTemplates\gittfs.nuspec = ChocolateyTemplates\gittfs.nuspec
+		build\ChocolateyTemplates\chocolateyInstall.ps1 = build\ChocolateyTemplates\chocolateyInstall.ps1
+		build\ChocolateyTemplates\gittfs.nuspec = build\ChocolateyTemplates\gittfs.nuspec
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTfs.Vs2013", "GitTfs.Vs2013\GitTfs.Vs2013.csproj", "{101D3C78-27CC-446A-98EC-E2DE88BF0641}"
@@ -44,7 +44,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTfs.Setup", "GitTfs.Setu
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E25ACEF-468A-4E93-9549-8BBFC72294DF}"
 	ProjectSection(SolutionItems) = preProject
-		appveyor.yml = appveyor.yml
+		..\appveyor.yml = ..\appveyor.yml
 		build.cake = build.cake
 		build.ps1 = build.ps1
 	EndProjectSection
--- a/Show More
+++ b/Show More