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_border-borderBrush-background-fix_2834

Browse Source
This commit is contained in:
Tig
2023-08-30 06:58:48 -06:00
committed by GitHub
parent 3faaa0a372 17b4e3d56b
commit ee9948a2a6
6 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,14 +21,14 @@ jobs:
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v0
with:
versionSpec: '6.x'
versionSpec: '5.x'
includePrerelease: true
- name: Determine Version
uses: gittools/actions/gitversion/execute@v0
with:
useConfigFile: true
#additionalArguments: /verbosity Diagnostic
#additionalArguments: /b develop
id: gitversion # step id used as reference for output values
- name: Setup dotnet

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-pre0001</Version>
<InformationalVersion>1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7</InformationalVersion>-->
<FileVersion>1.0.0.0</FileVersion>
<Version>1.0.0</Version>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />

16
GitVersion.yml
View File

@@ -1,34 +1,28 @@
next-version: 1.14.0
mode: ContinuousDeployment
tag-prefix: '[vV]'
continuous-delivery-fallback-tag: 'pre'
continuous-delivery-fallback-tag: pre
branches:
develop:
mode: ContinuousDeployment
tag: pre
regex: ^develop
regex: develop
source-branches:
- main
pre-release-weight: 100
main:
tag: rc
increment: Patch
source-branches:
- develop
- main
-
feature:
tag: useBranchName
regex: ^features?[/-]
source-branches:
- develop
- main
-
pull-request:
tag: PullRequest.{BranchName}
increment: Inherit
ignore:
sha: []
merge-message-formats: {}

8
Terminal.Gui/Terminal.Gui.csproj
View File

@@ -5,12 +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-pre0001</Version>
<InformationalVersion>1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7</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-pre0001</Version>
<InformationalVersion>1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7</InformationalVersion>-->
<FileVersion>1.0.0.0</FileVersion>
<Version>1.0.0</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>