Skip to content

Commit 9d83e23

Browse files
tigtig
committed
Merge branch 'v2_3777-hexedit' of tig:tig/Terminal.Gui into v2_3777-hexedit
2 parents 8302398 + 2c3a761 commit 9d83e23

File tree

153 files changed

+4264
-3576
lines changed

Some content is hidden

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

153 files changed

+4264
-3576
lines changed

‎.github/workflows/dotnet-core.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,13 @@ jobs:
9090
dotnet-version: 8.x
9191
dotnet-quality: 'ga'
9292

93-
- name: Build Release
93+
- name: Build Release Terminal.Gui
94+
run: dotnet build Terminal.Gui/Terminal.Gui.csproj --configuration Release
95+
96+
- name: Pack Release Terminal.Gui
97+
run: dotnet pack Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ./local_packages
98+
99+
- name: Build Release Solution
94100
run: dotnet build --configuration Release
95101

96102

‎.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ jobs:
4343
- name: Build Release
4444
run: |
4545
dotnet-gitversion /updateprojectfiles
46-
dotnet build --no-incremental --nologo --force --configuration Release
47-
dotnet test --configuration Release
46+
dotnet build Terminal.Gui/Terminal.Gui.csproj --no-incremental --nologo --force --configuration Release
47+
dotnet test Terminal.Gui/Terminal.Gui.csproj --configuration Release
4848
4949
- name: Pack
50-
run: dotnet pack -c Release --include-symbols -p:Version='${{ steps.gitversion.outputs.SemVer }}'
50+
run: dotnet pack Terminal.Gui/Terminal.Gui.csproj -c Release --include-symbols -p:Version='${{ steps.gitversion.outputs.SemVer }}'
5151

5252
# - name: Test to generate Code Coverage Report
5353
# run: |

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,4 @@ demo.*
6161
*.tui/
6262

6363
*.dotCover
64+
/local_packages/

‎NativeAot/NativeAot.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</ItemGroup>
1616

1717
<ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18-
<PackageReference Include="Terminal.Gui" Version="[2.0.0-v2-develop.2189,3)" />
18+
<PackageReference Include="Terminal.Gui" Version="2.0.0" />
1919
<TrimmerRootAssembly Include="Terminal.Gui" />
2020
</ItemGroup>
2121

‎NativeAot/PackTerminalGui.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Step 1: Build and pack Terminal.Gui
2+
dotnet build ../Terminal.Gui/Terminal.Gui.csproj --configuration Release
3+
dotnet pack ../Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ../local_packages
4+
5+
# Step 2: Restore NativeAot with the new package
6+
dotnet restore ./NativeAot.csproj --source ./local_packages
7+
8+
# Step 3: Build NativeAot
9+
dotnet build ./NativeAot.csproj --configuration Release

‎NativeAot/PackTerminalGui.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
# Step 1: Build and pack Terminal.Gui
4+
dotnet build ../Terminal.Gui/Terminal.Gui.csproj --configuration Release
5+
dotnet pack ../Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ../local_packages
6+
7+
# Step 2: Restore NativeAot with the new package
8+
dotnet restore ./NativeAot.csproj --source ./local_packages
9+
10+
# Step 3: Build NativeAot
11+
dotnet build ./NativeAot.csproj --configuration Release

‎SelfContained/PackTerminalGui.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Step 1: Build and pack Terminal.Gui
2+
dotnet build ../Terminal.Gui/Terminal.Gui.csproj --configuration Release
3+
dotnet pack ../Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ../local_packages
4+
5+
# Step 2: Restore SelfContained with the new package
6+
dotnet restore ./SelfContained.csproj --source ./local_packages
7+
8+
# Step 3: Build SelfContained
9+
dotnet build ./SelfContained.csproj --configuration Release

‎SelfContained/PackTerminalGui.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
# Step 1: Build and pack Terminal.Gui
4+
dotnet build ../Terminal.Gui/Terminal.Gui.csproj --configuration Release
5+
dotnet pack ../Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ../local_packages
6+
7+
# Step 2: Restore SelfContained with the new package
8+
dotnet restore ./SelfContained.csproj --source ./local_packages
9+
10+
# Step 3: Build SelfContained
11+
dotnet build ./SelfContained.csproj --configuration Release

‎SelfContained/SelfContained.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
21-
<PackageReference Include="Terminal.Gui" Version="[2.0.0-pre.1788,3)" />
21+
<PackageReference Include="Terminal.Gui" Version="2.0.0" />
2222
<TrimmerRootAssembly Include="Terminal.Gui" />
2323
</ItemGroup>
2424

‎Terminal.Gui/Application/Application.Initialization.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@ internal static void InternalInit (
178178
}
179179

180180
private static void Driver_SizeChanged (object? sender, SizeChangedEventArgs e) { OnSizeChanging (e); }
181-
private static void Driver_KeyDown (object? sender, Key e) { OnKeyDown (e); }
182-
private static void Driver_KeyUp (object? sender, Key e) { OnKeyUp (e); }
183-
private static void Driver_MouseEvent (object? sender, MouseEvent e) { OnMouseEvent (e); }
181+
private static void Driver_KeyDown (object? sender, Key e) { RaiseKeyDownEvent (e); }
182+
private static void Driver_KeyUp (object? sender, Key e) { RaiseKeyUpEvent (e); }
183+
private static void Driver_MouseEvent (object? sender, MouseEventArgs e) { RaiseMouseEvent (e); }
184184

185185
/// <summary>Gets of list of <see cref="ConsoleDriver"/> types that are available.</summary>
186186
/// <returns></returns>

0 commit comments

Comments
 (0)