浏览代码

Updated gitversion to test

Tigger Kindel 1 年之前
父节点
当前提交
4c5edaa27e

+ 2 - 2
Example/Example.csproj

@@ -7,8 +7,8 @@
     <!-- Do not modify these. -->
     <!-- Do not modify these. -->
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <FileVersion>1.14.0.0</FileVersion>
     <FileVersion>1.14.0.0</FileVersion>
-    <Version>1.14.0-pre0109</Version>
-    <InformationalVersion>1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0111</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8</InformationalVersion>
   </PropertyGroup>
   </PropertyGroup>
   <ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
     <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />

+ 2 - 2
FSharpExample/FSharpExample.fsproj

@@ -4,8 +4,8 @@
     <TargetFramework>net6.0</TargetFramework>
     <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <FileVersion>1.14.0.0</FileVersion>
     <FileVersion>1.14.0.0</FileVersion>
-    <InformationalVersion>1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf</InformationalVersion>
-    <Version>1.14.0-pre0109</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0111</Version>
   </PropertyGroup>
   </PropertyGroup>
   <ItemGroup>
   <ItemGroup>
     <Compile Include="Program.fs" />
     <Compile Include="Program.fs" />

+ 2 - 2
ReactiveExample/ReactiveExample.csproj

@@ -7,8 +7,8 @@
     <!-- Do not modify these. -->
     <!-- Do not modify these. -->
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <FileVersion>1.14.0.0</FileVersion>
     <FileVersion>1.14.0.0</FileVersion>
-    <Version>1.14.0-pre0109</Version>
-    <InformationalVersion>1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0111</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8</InformationalVersion>
   </PropertyGroup>
   </PropertyGroup>
   <ItemGroup>
   <ItemGroup>
     <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />
     <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />

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

@@ -1,51 +1,40 @@
 <Project Sdk="Microsoft.NET.Sdk" InitialTargets="main">
 <Project Sdk="Microsoft.NET.Sdk" InitialTargets="main">
-
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>portable</DebugType>
     <DebugType>portable</DebugType>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix></VersionSuffix>
     <Version>$(VersionPrefix)</Version>
     <Version>$(VersionPrefix)</Version>
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
-    <InformationalVersion>1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf</InformationalVersion>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8</InformationalVersion>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DefineConstants>TRACE;DEBUG_IDISPOSABLE</DefineConstants>
     <DefineConstants>TRACE;DEBUG_IDISPOSABLE</DefineConstants>
     <DebugType>portable</DebugType>
     <DebugType>portable</DebugType>
     <VersionSuffix>pre.$([System.DateTime]::UtcNow.ToString("yyyyMMdd.HHmm"))</VersionSuffix>
     <VersionSuffix>pre.$([System.DateTime]::UtcNow.ToString("yyyyMMdd.HHmm"))</VersionSuffix>
-    <Version>1.14.0-pre0109</Version>
+    <Version>1.14.0-v1-develop-branc0111</Version>
   </PropertyGroup>
   </PropertyGroup>
-
   <PropertyGroup>
   <PropertyGroup>
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <VersionPrefix>1.14.0</VersionPrefix>
     <VersionPrefix>1.14.0</VersionPrefix>
-    <FileVersion>1.14.0.0</FileVersion>
-    <Deterministic>false</Deterministic>
     <PackageVersion>$(Version)</PackageVersion>
     <PackageVersion>$(Version)</PackageVersion>
   </PropertyGroup>
   </PropertyGroup>
-
   <Target Name="main" AfterTargets="Resources">
   <Target Name="main" AfterTargets="Resources">
     <!-- Msbuild will process the first target in the file by default.
     <!-- Msbuild will process the first target in the file by default.
             By creating this target, and making it depend on the two following targets,
             By creating this target, and making it depend on the two following targets,
             we can ensure that they will all be executed
             we can ensure that they will all be executed
             -->
             -->
   </Target>
   </Target>
-
-
   <Target Name="main">
   <Target Name="main">
     <Message Text="Built Terminal.Gui $(Version)" Importance="high" />
     <Message Text="Built Terminal.Gui $(Version)" Importance="high" />
   </Target>
   </Target>
-
   <ItemGroup>
   <ItemGroup>
     <PackageReference Include="NStack.Core" Version="1.0.7" />
     <PackageReference Include="NStack.Core" Version="1.0.7" />
     <InternalsVisibleTo Include="UnitTests" />
     <InternalsVisibleTo Include="UnitTests" />
   </ItemGroup>
   </ItemGroup>
   <!-- Uncomment the RestoreSources element to have dotnet restore pull NStack from a local dir for testing -->
   <!-- Uncomment the RestoreSources element to have dotnet restore pull NStack from a local dir for testing -->
-
   <PropertyGroup>
   <PropertyGroup>
     <!-- See https://stackoverflow.com/a/44463578/297526 -->
     <!-- See https://stackoverflow.com/a/44463578/297526 -->
     <!--<RestoreSources>$(RestoreSources);..\..\NStack\NStack\bin\Debug;https://api.nuget.org/v3/index.json</RestoreSources>-->
     <!--<RestoreSources>$(RestoreSources);..\..\NStack\NStack\bin\Debug;https://api.nuget.org/v3/index.json</RestoreSources>-->
   </PropertyGroup>
   </PropertyGroup>
-
-
   <!-- API Documentation -->
   <!-- API Documentation -->
   <ItemGroup>
   <ItemGroup>
     <None Include="..\docfx\images\logo.png">
     <None Include="..\docfx\images\logo.png">
@@ -57,7 +46,6 @@
       <PackagePath>\</PackagePath>
       <PackagePath>\</PackagePath>
     </None>
     </None>
   </ItemGroup>
   </ItemGroup>
-  
   <ItemGroup>
   <ItemGroup>
     <Compile Update="Resources\Strings.Designer.cs">
     <Compile Update="Resources\Strings.Designer.cs">
       <DesignTime>True</DesignTime>
       <DesignTime>True</DesignTime>
@@ -65,21 +53,17 @@
       <DependentUpon>Strings.resx</DependentUpon>
       <DependentUpon>Strings.resx</DependentUpon>
     </Compile>
     </Compile>
   </ItemGroup>
   </ItemGroup>
-  
   <ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Resources\Strings.resx">
     <EmbeddedResource Update="Resources\Strings.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Strings.Designer.cs</LastGenOutput>
       <LastGenOutput>Strings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     </EmbeddedResource>
   </ItemGroup>
   </ItemGroup>
-  
   <!-- Enable Nuget Source Link for github -->
   <!-- Enable Nuget Source Link for github -->
   <ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="System.Management" Version="7.0.2" />
     <PackageReference Include="System.Management" Version="7.0.2" />
   </ItemGroup>
   </ItemGroup>
-
-
   <PropertyGroup>
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.1;net7.0</TargetFrameworks>
     <TargetFrameworks>net472;netstandard2.1;net7.0</TargetFrameworks>
     <RootNamespace>Terminal.Gui</RootNamespace>
     <RootNamespace>Terminal.Gui</RootNamespace>

+ 2 - 2
UICatalog/UICatalog.csproj

@@ -9,8 +9,8 @@
     <!-- Do not modify these. -->
     <!-- Do not modify these. -->
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <FileVersion>1.14.0.0</FileVersion>
     <FileVersion>1.14.0.0</FileVersion>
-    <Version>1.14.0-pre0109</Version>
-    <InformationalVersion>1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0111</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8</InformationalVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

+ 2 - 2
UnitTests/UnitTests.csproj

@@ -11,8 +11,8 @@
     <!-- Do not modify these. -->
     <!-- Do not modify these. -->
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <FileVersion>1.14.0.0</FileVersion>
     <FileVersion>1.14.0.0</FileVersion>
-    <Version>1.14.0-pre0109</Version>
-    <InformationalVersion>1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0111</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8</InformationalVersion>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE</DefineConstants>
     <DefineConstants>TRACE</DefineConstants>