From 4f97ab45f676cc71688fe3ddbac217ceb286cd9e Mon Sep 17 00:00:00 2001
From: AlexUstinov <alex.ustinov@servicetitan.com>
Date: Mon, 14 Sep 2020 18:59:39 -0700
Subject: [PATCH 1/3] Use a build number for the package versioning

---
 Directory.Build.props | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 3fdb11f435..0fdad88f54 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,8 +5,6 @@
 
   <!-- Compute intermediate values. To avoid conflicts name all custom variables with Do prefix. -->
   <PropertyGroup>
-    <DoBuildNumber>$(BUILD_NUMBER)</DoBuildNumber>
-    <DoBuildNumber Condition="'$(DoBuildNumber)'==''">0</DoBuildNumber>
     <DoBuildYear>$([System.DateTime]::Today.Year)</DoBuildYear>
     <DoProductName>DataObjects.Net</DoProductName>
     <DoProductAuthors>Xtensive LLC and contributors</DoProductAuthors>
@@ -15,7 +13,11 @@
     <DoMajor>$([System.Version]::new($(DoVersion)).Major)</DoMajor>
     <DoMinor>$([System.Version]::new($(DoVersion)).Minor)</DoMinor>
     <DoPatch>$([System.Version]::new($(DoVersion)).Build)</DoPatch>
+    <DoBuildNumber>$(BUILD_NUMBER)</DoBuildNumber>
+    <DoBuildNumber Condition="'$(DoBuildNumber)'==''">$([System.Version]::new($(DoVersion)).Revision)</DoBuildNumber>
+    <DoBuildNumber Condition="'$(DoBuildNumber)'=='-1'">0</DoBuildNumber>
     <DoVersionName>$(DoMajor).$(DoMinor).$(DoPatch)</DoVersionName>
+    <DoVersionName Condition="'$(DoBuildNumber)'!='0'">$(DoVersionName).$(DoBuildNumber)</DoVersionName>
     <DoVersionName Condition="'$(DoVersionSuffix)'!=''">$(DoVersionName)-$(DoVersionSuffix)</DoVersionName>
     <DoPackageIcon>$(MSBuildThisFileDirectory)do-nuget.png</DoPackageIcon>
   </PropertyGroup>

From 5141f81b6b69ec5fdb84efd2d614b85295232b89 Mon Sep 17 00:00:00 2001
From: AlexUstinov <alex.ustinov@servicetitan.com>
Date: Thu, 17 Sep 2020 15:23:08 -0700
Subject: [PATCH 2/3] Reorganize the Directory.Build.props file to keep the
 related properties and items closer to each other

---
 Directory.Build.props | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0fdad88f54..b49e537a69 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -20,16 +20,20 @@
     <DoVersionName Condition="'$(DoBuildNumber)'!='0'">$(DoVersionName).$(DoBuildNumber)</DoVersionName>
     <DoVersionName Condition="'$(DoVersionSuffix)'!=''">$(DoVersionName)-$(DoVersionSuffix)</DoVersionName>
     <DoPackageIcon>$(MSBuildThisFileDirectory)do-nuget.png</DoPackageIcon>
+    <DoGeneratePackage>true</DoGeneratePackage>
+    <DoGeneratePackage Condition="$(MSBuildProjectName) == 'Xtensive.Orm.Weaver'">false</DoGeneratePackage>
+    <DoGeneratePackage Condition="$(MSBuildProjectName) == 'Xtensive.Orm.Manual'">false</DoGeneratePackage>
+    <DoGeneratePackage Condition="$(MSBuildProjectName) == 'TestCommon'">false</DoGeneratePackage>
+    <DoGeneratePackage Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">false</DoGeneratePackage>
   </PropertyGroup>
 
   <PropertyGroup>
+    <NoLogo>true</NoLogo>
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <SolutionDir Condition="$(SolutionDir) == ''">$([MSBuild]::EnsureTrailingSlash(
       $([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)', 'Orm.sln'))))</SolutionDir>
     <Configuration Condition="$(Configuration) == ''">Debug</Configuration>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <NoLogo>true</NoLogo>
-    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <ArtifactsDir Condition="'$(ArtifactsDir)'==''">$(SolutionDir)_Build\</ArtifactsDir>
     <BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(ArtifactsDir)obj\$(Configuration)\$(MSBuildProjectName)'))\</BaseIntermediateOutputPath>
     <BaseOutputPath >$([System.IO.Path]::GetFullPath('$(ArtifactsDir)bin\$(Configuration)'))\</BaseOutputPath>
@@ -41,25 +45,6 @@
     <OrmKeyFile>$(SolutionDir)Orm\Orm.snk</OrmKeyFile>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <GeneratePackageOnBuild Condition="$(MSBuildProjectName) == 'Xtensive.Orm.Weaver'">false</GeneratePackageOnBuild>
-    <GeneratePackageOnBuild Condition="$(MSBuildProjectName) == 'Xtensive.Orm.Manual'">false</GeneratePackageOnBuild>
-    <GeneratePackageOnBuild Condition="$(MSBuildProjectName) == 'TestCommon'">false</GeneratePackageOnBuild>
-    <GeneratePackageOnBuild Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">false</GeneratePackageOnBuild>
-    <GeneratePackageOnBuild Condition="$(GeneratePackageOnBuild)=='' AND '$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
-
-    <IncludeSymbols Condition="$(GeneratePackageOnBuild) == 'true'">true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
-    <PackageReference Condition="$(GeneratePackageOnBuild) == 'true'"
-                      Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-  </ItemGroup>
-
   <!-- Populate standard properties. -->
   <PropertyGroup>
     <Product>$(DoProductName)</Product>
@@ -76,9 +61,19 @@
     <PackageOutputPath>$(MSBuildThisFileDirectory)_Build\$(Configuration)\packages\</PackageOutputPath>
     <RepositoryUrl>https://github.com/DataObjects-NET/dataobjects-net</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
+
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <GeneratePackageOnBuild Condition="$(DoGeneratePackage) == 'true' AND '$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
+    <IncludeSymbols Condition="$(GeneratePackageOnBuild) == 'true'">true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
   <ItemGroup>
+    <SourceRoot Include="$(SolutionDir)"/>
+    <PackageReference Condition="$(DoGeneratePackage) == 'true'"
+                      Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
     <None Include="$(DoPackageIcon)" Visible="false" >
       <PackagePath>.</PackagePath>
       <Pack>true</Pack>

From 5933acd435db3cbdcf13b804fca57f3e46a8de10 Mon Sep 17 00:00:00 2001
From: AlexUstinov <alex.ustinov@servicetitan.com>
Date: Wed, 2 Dec 2020 15:50:30 -0800
Subject: [PATCH 3/3] Fix package version calculation algorithm

---
 Directory.Build.props | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index b49e537a69..da86ae4788 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,17 +9,24 @@
     <DoProductName>DataObjects.Net</DoProductName>
     <DoProductAuthors>Xtensive LLC and contributors</DoProductAuthors>
     <DoProductCopyright>2003-$(DoBuildYear) $(DoProductAuthors)</DoProductCopyright>
-    <DoVersionSuffix Condition="'$(DoVersionSuffix)'=='dev'">dev-$(DoBuildNumber)</DoVersionSuffix>
+
     <DoMajor>$([System.Version]::new($(DoVersion)).Major)</DoMajor>
     <DoMinor>$([System.Version]::new($(DoVersion)).Minor)</DoMinor>
-    <DoPatch>$([System.Version]::new($(DoVersion)).Build)</DoPatch>
-    <DoBuildNumber>$(BUILD_NUMBER)</DoBuildNumber>
-    <DoBuildNumber Condition="'$(DoBuildNumber)'==''">$([System.Version]::new($(DoVersion)).Revision)</DoBuildNumber>
-    <DoBuildNumber Condition="'$(DoBuildNumber)'=='-1'">0</DoBuildNumber>
-    <DoVersionName>$(DoMajor).$(DoMinor).$(DoPatch)</DoVersionName>
-    <DoVersionName Condition="'$(DoBuildNumber)'!='0'">$(DoVersionName).$(DoBuildNumber)</DoVersionName>
-    <DoVersionName Condition="'$(DoVersionSuffix)'!=''">$(DoVersionName)-$(DoVersionSuffix)</DoVersionName>
+    <DoBuild>$([System.Version]::new($(DoVersion)).Build)</DoBuild>
+    <DoRevision>$([System.Version]::new($(DoVersion)).Revision)</DoRevision>
+
+    <DoFileRevision>$(BUILD_NUMBER)</DoFileRevision>
+    <DoFileRevision Condition="'$(DoFileRevision)' == '' AND '$(DoRevision)' != '-1'">$(DoRevision)</DoFileRevision>
+    <DoFileRevision Condition="'$(DoFileRevision)' == ''">0</DoFileRevision>
+
+    <DoVersionSuffix Condition="'$(DoVersionSuffix)' == 'dev'">dev-$(DoFileRevision)</DoVersionSuffix>
+
+    <DoVersionName>$(DoMajor).$(DoMinor).$(DoBuild)</DoVersionName>
+    <DoVersionName Condition="'$(DoRevision)' != '-1'">$(DoVersionName).$(DoRevision)</DoVersionName>
+    <DoVersionName Condition="'$(DoVersionSuffix)' != ''">$(DoVersionName)-$(DoVersionSuffix)</DoVersionName>
+
     <DoPackageIcon>$(MSBuildThisFileDirectory)do-nuget.png</DoPackageIcon>
+
     <DoGeneratePackage>true</DoGeneratePackage>
     <DoGeneratePackage Condition="$(MSBuildProjectName) == 'Xtensive.Orm.Weaver'">false</DoGeneratePackage>
     <DoGeneratePackage Condition="$(MSBuildProjectName) == 'Xtensive.Orm.Manual'">false</DoGeneratePackage>
@@ -34,7 +41,7 @@
     <SolutionDir Condition="$(SolutionDir) == ''">$([MSBuild]::EnsureTrailingSlash(
       $([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)', 'Orm.sln'))))</SolutionDir>
     <Configuration Condition="$(Configuration) == ''">Debug</Configuration>
-    <ArtifactsDir Condition="'$(ArtifactsDir)'==''">$(SolutionDir)_Build\</ArtifactsDir>
+    <ArtifactsDir Condition="'$(ArtifactsDir)' == ''">$(SolutionDir)_Build\</ArtifactsDir>
     <BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(ArtifactsDir)obj\$(Configuration)\$(MSBuildProjectName)'))\</BaseIntermediateOutputPath>
     <BaseOutputPath >$([System.IO.Path]::GetFullPath('$(ArtifactsDir)bin\$(Configuration)'))\</BaseOutputPath>
     <BaseOutputPath Condition="$(MSBuildProjectName.Contains('Tests'))">$([System.IO.Path]::GetFullPath('$(ArtifactsDir)tests'))\</BaseOutputPath>
@@ -52,7 +59,7 @@
     <Authors>$(DoProductAuthors)</Authors>
     <Version>$(DoVersionName)</Version>
     <AssemblyVersion>$(DoMajor).$(DoMinor).0.0</AssemblyVersion>
-    <FileVersion>$(DoMajor).$(DoMinor).$(DoPatch).$(DoBuildNumber)</FileVersion>
+    <FileVersion>$(DoMajor).$(DoMinor).$(DoBuild).$(DoFileRevision)</FileVersion>
     <Copyright>$(DoProductCopyright)</Copyright>
     <PackageProjectUrl>https://dataobjects.net/</PackageProjectUrl>
     <PackageIcon>do-nuget.png</PackageIcon>