Преглед на файлове

Changing gitflow/gitversion scheme2

Tig Kindel преди 2 години
родител
ревизия
0610afaaa8

+ 2 - 2
Example/Example.csproj

@@ -7,8 +7,8 @@
     <!-- Do not modify these. -->
     <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>
+    <Version>1.13.7-pre0060</Version>
+    <InformationalVersion>1.13.7-pre.60+Branch.develop.Sha.9b94dfcbb0adb042177b602e7fca383fb1600b57</InformationalVersion>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />

+ 2 - 2
FSharpExample/FSharpExample.fsproj

@@ -4,8 +4,8 @@
     <TargetFramework>net6.0</TargetFramework>
     <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>
+    <InformationalVersion>1.13.7-pre.60+Branch.develop.Sha.9b94dfcbb0adb042177b602e7fca383fb1600b57</InformationalVersion>
+    <Version>1.13.7-pre0060</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.fs" />

+ 6 - 3
GitVersion.yml

@@ -1,10 +1,10 @@
-next-version: 1.13.7
-mode: MainLine
+mode: Mainline
 tag-prefix: '[vV]'
+next-version: 1.13.7
 branches:
   develop:
+    mode: ContinuousDelivery
     tag: pre
-    increment: Patch
   main:
     tag: rc
     increment: Patch
@@ -24,3 +24,6 @@ branches:
   pull-request:
     tag: PullRequest
     increment: Inherit
+ignore:
+  sha: []
+merge-message-formats: {}

+ 2 - 2
ReactiveExample/ReactiveExample.csproj

@@ -7,8 +7,8 @@
     <!-- Do not modify these. -->
     <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>
+    <Version>1.13.7-pre0060</Version>
+    <InformationalVersion>1.13.7-pre.60+Branch.develop.Sha.9b94dfcbb0adb042177b602e7fca383fb1600b57</InformationalVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />

+ 2 - 2
Terminal.Gui/Terminal.Gui.csproj

@@ -12,8 +12,8 @@
     <!-- Do not modify these. Do NOT commit after manually running `dotnet-gitversion /updateprojectfiles` -->
     <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>
+    <InformationalVersion>1.13.7-pre.60+Branch.develop.Sha.9b94dfcbb0adb042177b602e7fca383fb1600b57</InformationalVersion>
+    <Version>1.13.7-pre0060</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NStack.Core" Version="1.0.7" />

+ 2 - 2
UICatalog/UICatalog.csproj

@@ -9,8 +9,8 @@
     <!-- Do not modify these. -->
     <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>
+    <Version>1.13.7-pre0060</Version>
+    <InformationalVersion>1.13.7-pre.60+Branch.develop.Sha.9b94dfcbb0adb042177b602e7fca383fb1600b57</InformationalVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

+ 2 - 2
UnitTests/UnitTests.csproj

@@ -11,8 +11,8 @@
     <!-- Do not modify these. -->
     <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>
+    <Version>1.13.7-pre0060</Version>
+    <InformationalVersion>1.13.7-pre.60+Branch.develop.Sha.9b94dfcbb0adb042177b602e7fca383fb1600b57</InformationalVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE</DefineConstants>