Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into v1_alt-key-on-toplevel-with-menubar-fix_2810

Browse Source
This commit is contained in:
Tig
2023-08-30 06:54:16 -06:00
committed by GitHub
parent 3a937cd290 17b4e3d56b
commit 1c6295efa5
9 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/dotnet-core.yml vendored
View File

@@ -12,7 +12,6 @@ on:
jobs:
build:
runs-on: ubuntu-latest
steps:
@@ -22,14 +21,16 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0
dotnet-quality: 'ga'
- name: Install dependencies
run: |
dotnet restore
- name: Build Debug
run: dotnet build --configuration Debug --no-restore
run: |
dotnet build --configuration Debug --no-restore
- name: Test
run: |
sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json

13
.github/workflows/publish.yml vendored
View File

@@ -16,22 +16,27 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 #fetch-depth is needed for GitVersion
fetch-depth: 0 # fetch-depth is needed for GitVersion
- name: Install and calculate the new version with GitVersion
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v0
with:
versionSpec: 5.x
versionSpec: '5.x'
includePrerelease: true
- name: Determine Version
uses: gittools/actions/gitversion/execute@v0
with:
useConfigFile: true
#additionalArguments: /b develop
id: gitversion # step id used as reference for output values
- name: Setup dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0
dotnet-quality: 'ga'
- name: Install dependencies
run: dotnet restore

6
Example/Example.csproj
View File

@@ -4,10 +4,8 @@
<TargetFramework>net7.0</TargetFramework>
<!-- Version numbers are automatically updated by gitversion when a release is released -->
<!-- Do not modify these. -->
<AssemblyVersion>1.14.0.0</AssemblyVersion>
<FileVersion>1.14.0.0</FileVersion>
<Version>1.14.0</Version>
<InformationalVersion>1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96</InformationalVersion>
<FileVersion>1.0.0.0</FileVersion>
<Version>1.0.0</Version>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />

4
FSharpExample/FSharpExample.fsproj
View File

@@ -4,8 +4,8 @@
<TargetFramework>net6.0</TargetFramework>
<AssemblyVersion>1.14.0.0</AssemblyVersion>
<FileVersion>1.14.0.0</FileVersion>
<InformationalVersion>1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96</InformationalVersion>
<Version>1.14.0</Version>
<InformationalVersion>1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7</InformationalVersion>
<Version>1.14.0-pre0001</Version>
</PropertyGroup>
<ItemGroup>
<Compile Include="Program.fs" />

7
GitVersion.yml
View File

@@ -1,10 +1,14 @@
mode: ContinuousDeployment
tag-prefix: '[vV]'
continuous-delivery-fallback-tag: 'pre'
continuous-delivery-fallback-tag: pre
branches:
develop:
mode: ContinuousDeployment
tag: pre
regex: develop
source-branches:
- main
pre-release-weight: 100
main:
tag: rc
increment: Patch
@@ -22,4 +26,3 @@ branches:
increment: Inherit
ignore:
sha: []
merge-message-formats: {}

6
ReactiveExample/ReactiveExample.csproj
View File

@@ -4,10 +4,10 @@
<TargetFramework>net7.0</TargetFramework>
<!-- Version numbers are automatically updated by gitversion when a release is released -->
<!-- Do not modify these. -->
<AssemblyVersion>1.14.0.0</AssemblyVersion>
<!--<AssemblyVersion>1.14.0.0</AssemblyVersion>
<FileVersion>1.14.0.0</FileVersion>
<Version>1.14.0</Version>
<InformationalVersion>1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96</InformationalVersion>
<Version>1.14.0-pre0001</Version>
<InformationalVersion>1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7</InformationalVersion>-->
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />

7
Terminal.Gui/Terminal.Gui.csproj
View File

@@ -5,11 +5,8 @@
<!-- GitVersion.xml controls settings -->
<!-- =================================================================== -->
<PropertyGroup>
<!--<AssemblyVersion>1.14.0.0</AssemblyVersion>
<FileVersion>1.14.0.0</FileVersion>
<InformationalVersion>1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96</InformationalVersion>
<PackageVersion>$(Version)</PackageVersion>
<Version>1.14.0</Version>-->
<FileVersion>1.0.0.0</FileVersion>
<Version>1.0.0</Version>
</PropertyGroup>
<!-- =================================================================== -->
<!-- .NET Build Settings -->

6
UICatalog/UICatalog.csproj
View File

@@ -7,10 +7,8 @@
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<!-- Version numbers are automatically updated by gitversion when a release is released -->
<!-- Do not modify these. -->
<AssemblyVersion>1.14.0.0</AssemblyVersion>
<FileVersion>1.14.0.0</FileVersion>
<Version>1.14.0</Version>
<InformationalVersion>1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96</InformationalVersion>
<FileVersion>1.0.0.0</FileVersion>
<Version>1.0.0</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>

6
UnitTests/UnitTests.csproj
View File

@@ -8,10 +8,8 @@
<UseDataCollector />
<!-- Version numbers are automatically updated by gitversion when a release is released -->
<!-- Do not modify these. -->
<AssemblyVersion>1.14.0.0</AssemblyVersion>
<FileVersion>1.14.0.0</FileVersion>
<Version>1.14.0</Version>
<InformationalVersion>1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96</InformationalVersion>
<FileVersion>1.0.0.0</FileVersion>
<Version>1.0.0</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>