Skip to content

Commit 96d4150

Browse files
love-lingerlove-linger
committed
project: reorganize the structure of the project.
* remove dotnet-tool.json because the project does not rely on any dotnet tools. * remove Directory.Build.props because the solution has only one project. * move src/SourceGit to src. It's not needed to put all sources into a subfolder of src since there's only one project.
1 parent 96e60da commit 96d4150

319 files changed

Lines changed: 37 additions & 53 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.config/dotnet-tools.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Directory.Build.props‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎SourceGit.sln‎

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,63 @@
1-
1+
22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.31903.59
4+
VisualStudioVersion = 17.9.34714.143
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceGit", "src\SourceGit\SourceGit.csproj", "{CD98D9AA-079A-4A79-9212-850EB97CF2ED}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGit", "src\SourceGit.csproj", "{2091C34D-4A17-4375-BEF3-4D60BE8113E4}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C2487DDC-93D3-485F-943D-5DDF23B92A57}"
9-
EndProject
10-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".files", ".files", "{2850A14C-4E9A-42EF-9559-C83610D4FBDE}"
11-
ProjectSection(SolutionItems) = preProject
12-
.editorconfig = .editorconfig
13-
.gitignore = .gitignore
14-
LICENSE = LICENSE
15-
README.md = README.md
16-
.gitattributes = .gitattributes
17-
Directory.Build.props = Directory.Build.props
18-
global.json = global.json
19-
EndProjectSection
20-
EndProject
21-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{39979501-8501-43A7-AD23-F0BCF02CADB3}"
22-
EndProject
23-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{B7D4C4BA-BD7E-4B36-A0E2-3B226F419B8F}"
24-
ProjectSection(SolutionItems) = preProject
25-
.config\dotnet-tools.json = .config\dotnet-tools.json
26-
EndProjectSection
27-
EndProject
28-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{E6B9E250-EA2D-4665-831D-A547F707718D}"
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{773082AC-D9C8-4186-8521-4B6A7BEE6158}"
299
ProjectSection(SolutionItems) = preProject
3010
build\build.linux.sh = build\build.linux.sh
3111
build\build.osx.command = build\build.osx.command
32-
build\build.windows.bat = build\build.windows.bat
12+
build\build.windows.ps1 = build\build.windows.ps1
3313
EndProjectSection
3414
EndProject
35-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{EAB376FC-F69F-4EDB-8E04-D3F326A9F015}"
15+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{FD384607-ED99-47B7-AF31-FB245841BC92}"
3616
ProjectSection(SolutionItems) = preProject
3717
build\resources\App.icns = build\resources\App.icns
3818
build\resources\App.plist = build\resources\App.plist
3919
build\resources\SourceGit.desktop.template = build\resources\SourceGit.desktop.template
4020
EndProjectSection
4121
EndProject
42-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{8E67D51A-1C97-4B57-A0C4-C7916A6E983D}"
22+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{F45A9D95-AF25-42D8-BBAC-8259C9EEE820}"
4323
EndProject
44-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{8F83FE02-B6BB-4F96-8532-ACC5B8E3C33F}"
24+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{67B6D05F-A000-40BA-ADB4-C9065F880D7B}"
4525
ProjectSection(SolutionItems) = preProject
4626
.github\workflows\ci.yml = .github\workflows\ci.yml
4727
EndProjectSection
4828
EndProject
29+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{49A7C2D6-558C-4FAA-8F5D-EEE81497AED7}"
30+
EndProject
31+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{3AB707DB-A02C-4AFC-BF12-D7DF2B333BAC}"
32+
ProjectSection(SolutionItems) = preProject
33+
.editorconfig = .editorconfig
34+
.gitattributes = .gitattributes
35+
.gitignore = .gitignore
36+
global.json = global.json
37+
LICENSE = LICENSE
38+
README.md = README.md
39+
EndProjectSection
40+
EndProject
4941
Global
5042
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5143
Debug|Any CPU = Debug|Any CPU
5244
Release|Any CPU = Release|Any CPU
5345
EndGlobalSection
46+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
47+
{2091C34D-4A17-4375-BEF3-4D60BE8113E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48+
{2091C34D-4A17-4375-BEF3-4D60BE8113E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
49+
{2091C34D-4A17-4375-BEF3-4D60BE8113E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
50+
{2091C34D-4A17-4375-BEF3-4D60BE8113E4}.Release|Any CPU.Build.0 = Release|Any CPU
51+
EndGlobalSection
5452
GlobalSection(SolutionProperties) = preSolution
5553
HideSolutionNode = FALSE
5654
EndGlobalSection
57-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
58-
{CD98D9AA-079A-4A79-9212-850EB97CF2ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59-
{CD98D9AA-079A-4A79-9212-850EB97CF2ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
60-
{CD98D9AA-079A-4A79-9212-850EB97CF2ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
61-
{CD98D9AA-079A-4A79-9212-850EB97CF2ED}.Release|Any CPU.Build.0 = Release|Any CPU
62-
EndGlobalSection
6355
GlobalSection(NestedProjects) = preSolution
64-
{CD98D9AA-079A-4A79-9212-850EB97CF2ED} = {C2487DDC-93D3-485F-943D-5DDF23B92A57}
65-
{EAB376FC-F69F-4EDB-8E04-D3F326A9F015} = {E6B9E250-EA2D-4665-831D-A547F707718D}
66-
{8F83FE02-B6BB-4F96-8532-ACC5B8E3C33F} = {8E67D51A-1C97-4B57-A0C4-C7916A6E983D}
56+
{2091C34D-4A17-4375-BEF3-4D60BE8113E4} = {49A7C2D6-558C-4FAA-8F5D-EEE81497AED7}
57+
{FD384607-ED99-47B7-AF31-FB245841BC92} = {773082AC-D9C8-4186-8521-4B6A7BEE6158}
58+
{67B6D05F-A000-40BA-ADB4-C9065F880D7B} = {F45A9D95-AF25-42D8-BBAC-8259C9EEE820}
59+
EndGlobalSection
60+
GlobalSection(ExtensibilityGlobals) = postSolution
61+
SolutionGuid = {7FF1B9C6-B5BF-4A50-949F-4B407A0E31C9}
6762
EndGlobalSection
6863
EndGlobal

‎build/build.linux.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
rm -rf SourceGit
4-
dotnet publish ../src/SourceGit/SourceGit.csproj -c Release -r linux-x64 -o SourceGit -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
4+
dotnet publish ../src/SourceGit.csproj -c Release -r linux-x64 -o SourceGit -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
55
cp resources/SourceGit.desktop.template SourceGit/SourceGit.desktop.template
66
cp resources/App.icns SourceGit/SourceGit.icns
77
tar -zcvf SourceGit.linux-x64.tar.gz --exclude="*/en" --exclude="*/zh" --exclude="*/*.dbg" SourceGit

‎build/build.osx.command‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ cp resources/App.plist SourceGit.app/Contents/Info.plist
77
cp resources/App.icns SourceGit.app/Contents/Resources/App.icns
88

99
mkdir -p SourceGit.app/Contents/MacOS
10-
dotnet publish ../src/SourceGit/SourceGit.csproj -c Release -r osx-arm64 -o SourceGit.app/Contents/MacOS -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
10+
dotnet publish ../src/SourceGit.csproj -c Release -r osx-arm64 -o SourceGit.app/Contents/MacOS -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
1111
zip SourceGit.osx-arm64.zip -r SourceGit.app -x "*/en/*" -x "*/zh/*" -x "*/*\.dsym/*"
1212

1313
rm -rf SourceGit.app/Contents/MacOS
1414

1515
mkdir -p SourceGit.app/Contents/MacOS
16-
dotnet publish ../src/SourceGit/SourceGit.csproj -c Release -r osx-x64 -o SourceGit.app/Contents/MacOS -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
16+
dotnet publish ../src/SourceGit.csproj -c Release -r osx-x64 -o SourceGit.app/Contents/MacOS -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
1717
zip SourceGit.osx-x64.zip -r SourceGit.app -x "*/en/*" -x "*/zh/*" -x "*/*\.dsym/*"

‎build/build.windows.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ if (Test-Path SourceGit.win-x64.zip) {
66
Remove-Item SourceGit.win-x64.zip -Force
77
}
88

9-
dotnet publish ..\src\SourceGit\SourceGit.csproj -c Release -r win-x64 -o SourceGit -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
9+
dotnet publish ..\src\SourceGit.csproj -c Release -r win-x64 -o SourceGit -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
1010

1111
Remove-Item SourceGit\*.pdb -Force
1212
Remove-Item SourceGit\zh -Recurse -Force
1313
Remove-Item SourceGit\en -Recurse -Force
1414

15-
Compress-Archive -Path SourceGit -DestinationPath SourceGit.win-x64.zip
15+
Compress-Archive -Path SourceGit -DestinationPath SourceGit.win-x64.zip

src/SourceGit/App.JsonCodeGen.cs renamed to src/App.JsonCodeGen.cs

File renamed without changes.

src/SourceGit/App.axaml renamed to src/App.axaml

File renamed without changes.

src/SourceGit/App.axaml.cs renamed to src/App.axaml.cs

File renamed without changes.

src/SourceGit/App.ico renamed to src/App.ico

File renamed without changes.

0 commit comments

Comments
 (0)