Browse Source

Merge branch 'develop' of tig:gui-cs/Terminal.Gui into develop

Tigger Kindel 2 years ago
parent
commit
1096007111

+ 1 - 1
Example/Example.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <!-- In the source tree the version will always be 1.0 for all projects. -->
     <!-- In the source tree the version will always be 1.0 for all projects. -->
     <!-- Do not modify these. -->
     <!-- Do not modify these. -->

+ 5 - 8
README.md

@@ -7,15 +7,12 @@
 [![License](https://img.shields.io/github/license/gui-cs/gui.cs.svg)](LICENSE)
 [![License](https://img.shields.io/github/license/gui-cs/gui.cs.svg)](LICENSE)
 ![Bugs](https://img.shields.io/github/issues/gui-cs/gui.cs/bug)
 ![Bugs](https://img.shields.io/github/issues/gui-cs/gui.cs/bug)
 
 
-***The current release of Terminal.Gui [(v1.10)](https://www.nuget.org/packages/Terminal.Gui) is stable, rich, and broadly used. The team is now focused on designing and building a significant upgrade we're referring to as `v2`. Therefore, `v1` is now in maintenance mode.***
+***The current, stable, release of Terminal.Gui is [v1.x](https://www.nuget.org/packages/Terminal.Gui). It is stable, rich, and broadly used. The team is now focused on designing and building a significant upgrade we're referring to as `v2`. Therefore:***
+ * *`v1` is now in maintenance mode, meaning we will accept PRs for v1.x (the `develop` branch) only for issues impacting existing functionality.*
+ * *All new development happens on the `v2_develop` branch. See the V2 discussion [here](https://github.com/gui-cs/Terminal.Gui/discussions/1940).*
+ * *Developers are encouraged to continue building on [v1.x](https://www.nuget.org/packages/Terminal.Gui) until we announce `v2` is stable.*
 
 
-***This means we will accept PRs for v1.x (the `develop` branch) only for issues impacting existing functionality. All new development will happen on the `v2_develop` branch. See the V2 discussion [here](https://github.com/gui-cs/Terminal.Gui/discussions/1940).***
-
-***Developers are encouraged to continue building on `v1` until we announce `v2` is stable.***
-
-# Terminal.Gui - Cross Platform Terminal UI toolkit for .NET
-
-A toolkit for building rich console apps for .NET, .NET Core, and Mono that works on Windows, the Mac, and Linux/Unix.
+**Terminal.Gui**: A toolkit for building rich console apps for .NET, .NET Core, and Mono that works on Windows, the Mac, and Linux/Unix.
 
 
 ![Sample app](docfx/images/sample.gif)
 ![Sample app](docfx/images/sample.gif)
 
 

+ 1 - 1
ReactiveExample/ReactiveExample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <!-- In the source tree the version will always be 2.0 for all projects. -->
     <!-- In the source tree the version will always be 2.0 for all projects. -->
     <!-- Do not modify these. -->
     <!-- Do not modify these. -->

+ 2 - 0
Terminal.Gui/ConsoleDrivers/CursesDriver/binding.cs

@@ -331,6 +331,7 @@ namespace Unix.Terminal {
 #pragma warning disable RCS1102 // Make class static.
 #pragma warning disable RCS1102 // Make class static.
 	internal class Delegates {
 	internal class Delegates {
 #pragma warning restore RCS1102 // Make class static.
 #pragma warning restore RCS1102 // Make class static.
+#pragma warning disable CS8981 // The type name only contains lower-cased ascii characters. Such names may become reserved for the language.
 		public delegate IntPtr initscr ();
 		public delegate IntPtr initscr ();
 		public delegate int endwin ();
 		public delegate int endwin ();
 		public delegate bool isendwin ();
 		public delegate bool isendwin ();
@@ -555,4 +556,5 @@ namespace Unix.Terminal {
 		}
 		}
 	}
 	}
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
+#pragma warning restore CS8981 // The type name only contains lower-cased ascii characters. Such names may become reserved for the language.
 }
 }

+ 12 - 7
Terminal.Gui/README.md

@@ -49,6 +49,16 @@ Doing so will update the `.csproj` files in your branch with version info, which
 
 
 ## Publishing a Release of Terminal.Gui
 ## Publishing a Release of Terminal.Gui
 
 
+First, use the [Semantic Versioning](https://semver.org/) rules.to determine the new verison number. 
+
+Given a version number MAJOR.MINOR.PATCH, increment the:
+
+* MAJOR version when you make incompatible API changes
+* MINOR version when you add functionality in a backwards compatible manner
+* PATCH version when you make backwards compatible bug fixes
+
+Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format.
+
 To release a new version (e.g. with a higher `major`, `minor`, or `patch` value) tag a commit using `git tag` and then push that tag directly to the `main` branch on `github.com/gui-cs/Terminal.Gui` (`upstream`).
 To release a new version (e.g. with a higher `major`, `minor`, or `patch` value) tag a commit using `git tag` and then push that tag directly to the `main` branch on `github.com/gui-cs/Terminal.Gui` (`upstream`).
 
 
 The `tag` must be of the form `v<major>.<minor>.<patch>`, e.g. `v2.3.4`.
 The `tag` must be of the form `v<major>.<minor>.<patch>`, e.g. `v2.3.4`.
@@ -67,7 +77,7 @@ The PR title should be of the form "Release v2.3.4"
 ```powershell
 ```powershell
 git checkout develop
 git checkout develop
 git pull upstream develop
 git pull upstream develop
-git checkout -b v_2_3_4
+git checkout -b v2_3_4
 git add .
 git add .
 git commit -m "Release v2.3.4"
 git commit -m "Release v2.3.4"
 git push
 git push
@@ -117,13 +127,8 @@ https://www.nuget.org/packages/Terminal.Gui
 
 
 ### 10) Add a new Release in Github: https://github.com/gui-cs/Terminal.Gui/releases
 ### 10) Add a new Release in Github: https://github.com/gui-cs/Terminal.Gui/releases
 
 
-Generate release notes with the list of PRs since the last release 
+Generate release notes with the list of PRs since the last release.
 
 
-Use `gh` to get a list with just titles to make it easy to paste into release notes: 
-
-```powershell
-gh pr list --limit 500 --search "is:pr is:closed is:merged closed:>=2021-05-18"
-```
 ### 11) Update the `develop` branch with the new version
 ### 11) Update the `develop` branch with the new version
 
 
 ```powershell
 ```powershell

+ 1 - 1
Terminal.Gui/Terminal.Gui.csproj

@@ -56,7 +56,7 @@
     <PackageReference Include="System.Management" Version="7.0.0" />
     <PackageReference Include="System.Management" Version="7.0.0" />
   </ItemGroup>
   </ItemGroup>
   <PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0;net7.0</TargetFrameworks>
     <RootNamespace>Terminal.Gui</RootNamespace>
     <RootNamespace>Terminal.Gui</RootNamespace>
     <AssemblyName>Terminal.Gui</AssemblyName>
     <AssemblyName>Terminal.Gui</AssemblyName>
     <DocumentationFile>bin\Release\Terminal.Gui.xml</DocumentationFile>
     <DocumentationFile>bin\Release\Terminal.Gui.xml</DocumentationFile>