Restructure repository

.gitignore

@@ -14,7 +14,7 @@ obj/
 bin/
 
 #ignore output mild compiler
-GitExtensionsShellEx/Generated/
+src/native/**/Generated/
 
 #ignore some unwanted files
 *.ncb

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "Externals/Git.hub"]
-	path = Externals/Git.hub
+	path = externals/Git.hub
 	url = ../../gitextensions/Git.hub.git
 [submodule "Externals/conemu-inside"]
-	path = Externals/conemu-inside
+	path = externals/conemu-inside
 	url = ../../gitextensions/conemu-inside.git
 [submodule "Externals/ICSharpCode.TextEditor"]
-	path = Externals/ICSharpCode.TextEditor
+	path = externals/ICSharpCode.TextEditor
 	url = ../../gitextensions/ICSharpCode.TextEditor.git
 [submodule "Externals/EasyHook"]
-	path = Externals/EasyHook
+	path = externals/EasyHook
 	url = ../../gitextensions/EasyHook.git

.vscode/tasks.json

@@ -20,7 +20,7 @@
             "type": "process",
             "args": [
                 "build",
-                ".\\scripts\\native.proj"
+                ".\\src\\native\\build.proj"
             ],
             "problemMatcher": "$msCompile",
             "group": {

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
-  <Import Project="scripts\RepoLayout.props" />
-  <Import Project="scripts\Tests.props" />
+  <Import Project="eng\RepoLayout.props" />
+  <Import Project="eng\Tests.props" />
 
   <PropertyGroup>
     <LangVersion>12</LangVersion>
@@ -13,7 +13,7 @@
     <TargetFramework>$(SolutionTargetFramework)</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)GitExtensions.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)eng\GitExtensions.ruleset</CodeAnalysisRuleSet>
 
     <!-- More information: https://aka.ms/msbuild/net8-binaryformatter -->
     <GenerateResourceWarnOnBinaryFormatterUse>false</GenerateResourceWarnOnBinaryFormatterUse>
@@ -63,16 +63,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)scripts\stylecop.json">
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)eng\stylecop.json">
       <Link>stylecop.json</Link>
     </AdditionalFiles>
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)scripts\vs-threading.MainThreadAssertingMethods.txt">
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)eng\vs-threading.MainThreadAssertingMethods.txt">
       <Visible>False</Visible>
     </AdditionalFiles>
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)scripts\vs-threading.MainThreadSwitchingMethods.txt">
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)eng\vs-threading.MainThreadSwitchingMethods.txt">
       <Visible>False</Visible>
     </AdditionalFiles>
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)scripts\vs-threading.TypesRequiringMainThread.txt">
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)eng\vs-threading.TypesRequiringMainThread.txt">
       <Visible>False</Visible>
     </AdditionalFiles>
   </ItemGroup>

Directory.Build.targets

@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="scripts\Tests.targets" />
+  <Import Project="eng\Tests.targets" />
 
   <ItemGroup Condition="'$(EnableStyleCopAnalyzers)' != 'false'">
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" />

README.md

@@ -161,12 +161,8 @@ For more information see our [code of conduct](CODE_OF_CONDUCT.md).
 
 * We thank all the people who contribute, the project exists because of you<br />
   <a href="https://github.com/gitextensions/gitextensions/contributors"><img src="https://opencollective.com/gitextensions/contributors.svg?width=890&button=false" /></a>
-* We thank JetBRAINS for [ReSharper](https://www.jetbrains.com/resharper/) licenses<br />
-  <a href="https://www.jetbrains.com/?from=gitextensions" target="_blank"><img src="./GitUI/Resources/Icons/originals/jetbrains-variant-4.png"></a>
 * We thank [Transifex](https://www.transifex.com/) for helping us with translations<br />
   <a href="https://www.transifex.com/" target="_blank"><img src="./GitUI/Resources/Icons/originals/transifex.svg"></a>
-* We thank [SemanticMerge](https://www.semanticmerge.com) for licenses<br />
-  <a href="https://www.semanticmerge.com" target="_blank"><img src="./GitUI/Resources/Icons/originals/semanticmerge-logo.svg"></a>
 * We thank [SignPath.io](https://signpath.io/?utm_source=foundation&utm_medium=github&utm_campaign=gitextension) for the free code signing<br />
   <a href="https://signpath.io/?utm_source=foundation&utm_medium=github&utm_campaign=gitextension" target="_blank"><img src="./GitUI/Resources/Icons/originals/signpath_logo.png"></a>
 * We thank [SignPath Foundation](https://signpath.org/?utm_source=foundation&utm_medium=github&utm_campaign=gitextension) for the signing certificate
@@ -202,4 +198,3 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 * Issue tracker: [github.com/gitextensions/gitextensions/issues](https://github.com/gitextensions/gitextensions/issues)
 * Wiki: [github.com/gitextensions/gitextensions/wiki](https://github.com/gitextensions/gitextensions/wiki)
 * Gitter chat: [gitter.im/gitextensions/gitextensions](https://gitter.im/gitextensions/gitextensions?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-* [How to visualize Git repository's history](/gource%20video.md)

appveyor.experimental.yml

@@ -47,7 +47,7 @@ install:
 - cmd: git submodule update --init --recursive
 - cmd: echo /logger:"%ProgramFiles%\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll">> Directory.Build.rsp
 - cmd: |-
-    cd scripts
+    cd eng
     C:\\Python35\\python set_version_to.py -v %APPVEYOR_BUILD_VERSION% -t %APPVEYOR_BUILD_VERSION%
     cd ..
 
@@ -57,7 +57,7 @@ build_script:
 - ps: |
     # for release branches mark the repo as clean
     if (!$env:APPVEYOR_PULL_REQUEST_TITLE -and $env:APPVEYOR_REPO_BRANCH.StartsWith("release/")) {
-      & .\scripts\Mark-RepoClean.ps1
+      & .\eng\Mark-RepoClean.ps1
     }
 
     # if building a temporary merge with master, soft reset to the PR commit so the build contains the PR's hash instead of the merge-commit's hash
@@ -78,7 +78,7 @@ build_script:
     }
 
     # it would be nice to run '.\cibuild.cmd -loc -logFileName localise.binlog /p:NoBuild=true' but it doesn't work without `-build` switch :\
-    Push-Location .\GitExtensions
+    Push-Location .\src\app\GitExtensions
     msbuild /p:Configuration=Release /t:_UpdateEnglishTranslations /p:RunTranslationApp=true /p:ContinuousIntegrationBuild=true /v:m /bl:..\artifacts\log\localise.binlog
     if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
     Pop-Location

appveyor.yml

@@ -43,7 +43,7 @@ install:
 - ps: |
       if($env:GE_USE_LATEST_DOTNET -eq $true)
       {
-        .\scripts\Update-DotnetVersion.ps1
+        .\eng\Update-DotnetVersion.ps1
       }
 - ps: |
       # Install the required .NET SDK
@@ -53,7 +53,7 @@ install:
       Remove-Item -Path .\dotnet-install.ps1
 - cmd: git submodule update --init --recursive
 - cmd: |-
-    cd scripts
+    cd eng
     C:\\Python311\\python set_version_to.py -v %APPVEYOR_BUILD_VERSION% -t %APPVEYOR_BUILD_VERSION%
     cd ..
     git --version
@@ -71,7 +71,7 @@ build_script:
     }
 - ps: |
     # build VC++
-    dotnet build .\scripts\native.proj -c Release --verbosity q --nologo /bl:.\artifacts\log\native.binlog
+    dotnet build .\src\native\build.proj -c Release --verbosity q --nologo /bl:.\artifacts\log\native.binlog
     if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
 - ps: |
     # build .NET
@@ -83,7 +83,7 @@ build_script:
     git reset --hard HEAD
 - ps: |
     # Verify that new strings (if any) have been processed and ready for localisation
-    Push-Location .\GitExtensions
+    Push-Location .\src\app\GitExtensions
     dotnet msbuild /p:Configuration=Release /t:_UpdateEnglishTranslations /p:RunTranslationApp=true /p:ContinuousIntegrationBuild=true /v:m /bl:..\artifacts\log\localise.binlog
     Pop-Location
     if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }