Skip to content

Commit f247807

Browse files
authored
Merge pull request #3788 from gui-cs/v2_develop
`v2_release` <- `v2_develop`
2 parents 6f85ee6 + 3715166 commit f247807

File tree

621 files changed

+17829
-25939
lines changed

Some content is hidden

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

621 files changed

+17829
-25939
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Bug report
33
about: Create a report to help us improve
44
title: ''
5-
labels: ''
5+
labels: bug
66
assignees: ''
77

88
---
@@ -36,3 +36,6 @@ If applicable, add screenshots to help explain your problem.
3636

3737
**Additional context**
3838
Add any other context about the problem here.
39+
40+
**Set Project & Milestone**
41+
If you have access, please don't forget to set the right Project and Milestone.

.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/

CommunityToolkitExample/LoginView.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ public LoginView (LoginViewModel viewModel)
1919
{
2020
ViewModel.Password = passwordInput.Text;
2121
};
22-
loginButton.Accept += (_, _) =>
22+
loginButton.Accepting += (_, _) =>
2323
{
2424
if (!ViewModel.CanLogin) { return; }
2525
ViewModel.LoginCommand.Execute (null);
2626
};
2727

28-
clearButton.Accept += (_, _) =>
28+
clearButton.Accepting += (_, _) =>
2929
{
3030
ViewModel.ClearCommand.Execute (null);
3131
};

Example/Example.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public ExampleWindow ()
6363
};
6464

6565
// When login button is clicked display a message popup
66-
btnLogin.Accept += (s, e) =>
66+
btnLogin.Accepting += (s, e) =>
6767
{
6868
if (userNameText.Text == "admin" && passwordText.Text == "password")
6969
{

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

NativeAot/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public ExampleWindow ()
9393
};
9494

9595
// When login button is clicked display a message popup
96-
btnLogin.Accept += (s, e) =>
96+
btnLogin.Accepting += (s, e) =>
9797
{
9898
if (userNameText.Text == "admin" && passwordText.Text == "password")
9999
{

0 commit comments

Comments
 (0)