Browse Source

coimmented csproj

Tigger Kindel 1 year ago
parent
commit
af1768dad7

+ 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-v1-develop-branc0113</Version>
-    <InformationalVersion>1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0114</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3</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-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d</InformationalVersion>
-    <Version>1.14.0-v1-develop-branc0113</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0114</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-v1-develop-branc0113</Version>
-    <InformationalVersion>1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0114</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3</InformationalVersion>
   </PropertyGroup>
   </PropertyGroup>
   <ItemGroup>
   <ItemGroup>
     <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />
     <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />

+ 8 - 13
Terminal.Gui/Terminal.Gui.csproj

@@ -1,27 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk" InitialTargets="main">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- =================================================================== -->
   <!-- =================================================================== -->
   <!-- Version numbers -->
   <!-- Version numbers -->
   <!-- Automatically updated by gitversion (run `dotnet-gitversion /updateprojectfiles`)  -->
   <!-- Automatically updated by gitversion (run `dotnet-gitversion /updateprojectfiles`)  -->
+  <!-- GitVersion.xml controls settings  -->
   <!-- =================================================================== -->
   <!-- =================================================================== -->
   <PropertyGroup>
   <PropertyGroup>
     <VersionPrefix>1.14.0</VersionPrefix>
     <VersionPrefix>1.14.0</VersionPrefix>
+    <VersionSuffix>pre.$([System.DateTime]::UtcNow.ToString("yyyyMMdd.HHmm"))</VersionSuffix>
     <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-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d</InformationalVersion>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3</InformationalVersion>
     <PackageVersion>$(Version)</PackageVersion>
     <PackageVersion>$(Version)</PackageVersion>
-    <Version>1.14.0-v1-develop-branc0113</Version>
+    <Version>1.14.0-v1-develop-branc0114</Version>
   </PropertyGroup>
   </PropertyGroup>
   <!-- =================================================================== -->
   <!-- =================================================================== -->
-  <!-- Enables printing of version info during build -->
+  <!-- Enables printing of version info after build -->
   <!-- =================================================================== -->
   <!-- =================================================================== -->
-  <Target Name="main" AfterTargets="Resources">
-    <!-- Msbuild will process the first target in the file by default.
-            By creating this target, and making it depend on the two following targets,
-            we can ensure that they will all be executed
-            -->
-  </Target>
-  <Target Name="main">
-    <Message Text="Built Terminal.Gui $(Version)" Importance="high" />
+  <Target Name="Diag" AfterTargets="Pack">
+    <Message Text="Built and packaged: $(OutDir)$(OutputPath)Terminal.Gui.dll $(AssemblyVersion)" Importance="high" />
   </Target>
   </Target>
   <!-- =================================================================== -->
   <!-- =================================================================== -->
   <!-- .NET Build Settings -->
   <!-- .NET Build Settings -->
@@ -33,7 +29,6 @@
   <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>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup>
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.1;net7.0</TargetFrameworks>
     <TargetFrameworks>net472;netstandard2.1;net7.0</TargetFrameworks>

+ 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-v1-develop-branc0113</Version>
-    <InformationalVersion>1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0114</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3</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-v1-develop-branc0113</Version>
-    <InformationalVersion>1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0114</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3</InformationalVersion>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE</DefineConstants>
     <DefineConstants>TRACE</DefineConstants>