Browse Source

Changing gitflow/gitversion scheme

Tig Kindel 2 years ago
parent
commit
9b94dfcbb0

+ 4 - 4
Example/Example.csproj

@@ -5,10 +5,10 @@
     <!-- 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. -->
     <!-- Do not modify these. -->
-    <AssemblyVersion>1.10.1.0</AssemblyVersion>
-    <FileVersion>1.10.1.0</FileVersion>
-    <Version>1.10.1</Version>
-    <InformationalVersion>1.10.1+6.Branch.main.Sha.f7ee66ddbf8dbcfb0d96af7d63789879091670ec</InformationalVersion>
+    <AssemblyVersion>1.13.7.0</AssemblyVersion>
+    <FileVersion>1.13.7.0</FileVersion>
+    <Version>1.13.7-v1-build-local-n0059</Version>
+    <InformationalVersion>1.13.7-v1-build-local-nuget.59+Branch.v1-build-local-nuget.Sha.f0d3f664fb6beeb7dc221beae9608f3d4c2e98b5</InformationalVersion>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />

+ 4 - 4
FSharpExample/FSharpExample.fsproj

@@ -2,10 +2,10 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
-    <AssemblyVersion>1.10.1.0</AssemblyVersion>
-    <FileVersion>1.10.1.0</FileVersion>
-    <InformationalVersion>1.10.1+6.Branch.main.Sha.f7ee66ddbf8dbcfb0d96af7d63789879091670ec</InformationalVersion>
-    <Version>1.10.1</Version>
+    <AssemblyVersion>1.13.7.0</AssemblyVersion>
+    <FileVersion>1.13.7.0</FileVersion>
+    <InformationalVersion>1.13.7-v1-build-local-nuget.59+Branch.v1-build-local-nuget.Sha.f0d3f664fb6beeb7dc221beae9608f3d4c2e98b5</InformationalVersion>
+    <Version>1.13.7-v1-build-local-n0059</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.fs" />

+ 26 - 0
GitVersion.yml

@@ -0,0 +1,26 @@
+next-version: 1.13.7
+mode: MainLine
+tag-prefix: '[vV]'
+branches:
+  develop:
+    tag: pre
+    increment: Patch
+  main:
+    tag: rc
+    increment: Patch
+    source-branches:
+    - develop
+    - release
+  feature:
+    tag: useBranchName
+    regex: ^features?[/-]
+    source-branches:
+    - develop
+    - main
+    - release
+    - feature
+    - support
+    - hotfix
+  pull-request:
+    tag: PullRequest
+    increment: Inherit

+ 4 - 4
ReactiveExample/ReactiveExample.csproj

@@ -5,10 +5,10 @@
     <!-- 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. -->
     <!-- Do not modify these. -->
-    <AssemblyVersion>1.10.1.0</AssemblyVersion>
-    <FileVersion>1.10.1.0</FileVersion>
-    <Version>1.10.1</Version>
-    <InformationalVersion>1.10.1+6.Branch.main.Sha.f7ee66ddbf8dbcfb0d96af7d63789879091670ec</InformationalVersion>
+    <AssemblyVersion>1.13.7.0</AssemblyVersion>
+    <FileVersion>1.13.7.0</FileVersion>
+    <Version>1.13.7-v1-build-local-n0059</Version>
+    <InformationalVersion>1.13.7-v1-build-local-nuget.59+Branch.v1-build-local-nuget.Sha.f0d3f664fb6beeb7dc221beae9608f3d4c2e98b5</InformationalVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />

+ 5 - 5
Terminal.Gui/Terminal.Gui.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>portable</DebugType>
   </PropertyGroup>
@@ -10,10 +10,10 @@
     <!-- 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. -->
     <!-- Do not modify these. Do NOT commit after manually running `dotnet-gitversion /updateprojectfiles` -->
-    <AssemblyVersion>1.0</AssemblyVersion>
-    <FileVersion>1.0</FileVersion>
-    <Version>1.0</Version>
-    <InformationalVersion>1.0</InformationalVersion>
+    <AssemblyVersion>1.13.7.0</AssemblyVersion>
+    <FileVersion>1.13.7.0</FileVersion>
+    <InformationalVersion>1.13.7-v1-build-local-nuget.59+Branch.v1-build-local-nuget.Sha.f0d3f664fb6beeb7dc221beae9608f3d4c2e98b5</InformationalVersion>
+    <Version>1.13.7-v1-build-local-n0059</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NStack.Core" Version="1.0.7" />

+ 4 - 4
UICatalog/UICatalog.csproj

@@ -7,10 +7,10 @@
     <!-- 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. -->
     <!-- Do not modify these. -->
-    <AssemblyVersion>1.10.1.0</AssemblyVersion>
-    <FileVersion>1.10.1.0</FileVersion>
-    <Version>1.10.1</Version>
-    <InformationalVersion>1.10.1+6.Branch.main.Sha.f7ee66ddbf8dbcfb0d96af7d63789879091670ec</InformationalVersion>
+    <AssemblyVersion>1.13.7.0</AssemblyVersion>
+    <FileVersion>1.13.7.0</FileVersion>
+    <Version>1.13.7-v1-build-local-n0059</Version>
+    <InformationalVersion>1.13.7-v1-build-local-nuget.59+Branch.v1-build-local-nuget.Sha.f0d3f664fb6beeb7dc221beae9608f3d4c2e98b5</InformationalVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

+ 0 - 10
UnitTests/AssemblyInfo.cs

@@ -1,10 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Reflection;
-using Terminal.Gui;
-using Xunit;
-
-[assembly: AssemblyVersion("1.13.6.0")]
-[assembly: AssemblyFileVersion("1.13.6.0")]
-[assembly: AssemblyInformationalVersion("1.13.6-alpha+Branch.develop.Sha.993e484cf98da0969a173b26cbbe3da03cfc518f")]
-

+ 4 - 4
UnitTests/UnitTests.csproj

@@ -9,10 +9,10 @@
     <!-- 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. -->
     <!-- Do not modify these. -->
-    <AssemblyVersion>1.10.1.0</AssemblyVersion>
-    <FileVersion>1.10.1.0</FileVersion>
-    <Version>1.10.1</Version>
-    <InformationalVersion>1.10.1+6.Branch.main.Sha.f7ee66ddbf8dbcfb0d96af7d63789879091670ec</InformationalVersion>
+    <AssemblyVersion>1.13.7.0</AssemblyVersion>
+    <FileVersion>1.13.7.0</FileVersion>
+    <Version>1.13.7-v1-build-local-n0059</Version>
+    <InformationalVersion>1.13.7-v1-build-local-nuget.59+Branch.v1-build-local-nuget.Sha.f0d3f664fb6beeb7dc221beae9608f3d4c2e98b5</InformationalVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE</DefineConstants>