From d3beb5f4a11e630c7799109bd671f4cdb8001128 Mon Sep 17 00:00:00 2001
From: halex2005 <harl_aa@skbkontur.ru>
Date: Wed, 25 May 2016 17:24:46 +0500
Subject: [PATCH] cleanup, use major and minor version in assembly version

---
 appveyor.yml                   |   4 ----
 build.cake                     |  17 ++++++++++++-----
 nuspec/DiadocApi.nuspec        |   2 +-
 nuspec/diadoc-icon-128-128.png | Bin 0 -> 2088 bytes
 4 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 nuspec/diadoc-icon-128-128.png

diff --git a/appveyor.yml b/appveyor.yml
index 3960e665..f44107f4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,10 +6,6 @@ configuration:
   - Debug
   - Release
   
-branches:
-  except:
-    - /^diadocsdk-csharp-v/
-
 environment:
   diadoc_signing_secret:
     secure: anZ3SPfv+ZQGxXQdwHzCqwo0sKmdAVySXJr6j8sDIcuUjFqit9n1V+Va+UG+dIw8
diff --git a/build.cake b/build.cake
index 306b8bee..d7fc0fc4 100644
--- a/build.cake
+++ b/build.cake
@@ -85,27 +85,34 @@ Task("Build")
 Task("GenerateVersionInfo")
 	.Does(context =>
 	{
-		var majorVersion = 1;
 		var tagVersion = GetVersionFromTag();
-		var clearVersion = ClearVersionTag(tagVersion) ?? "1.36.1";
+		var clearVersion = ClearVersionTag(tagVersion) ?? "1.0.0";
 		var semanticVersionForNuget = GetSemanticVersionV1(clearVersion);
 		var semanticVersion = GetSemanticVersionV2(clearVersion) + dbgSuffix;
 		var appveyorVersion = GetAppVeyorBuildVersion(clearVersion);
+
+		var versionParts = clearVersion.Split('.');
+		var majorVersion = 1;
+		var minorVersion = 0;
+		int.TryParse(versionParts[0], out majorVersion);
+		if (versionParts.Length > 1)
+			int.TryParse(versionParts[1], out minorVersion);
+		var assemblyVersion = string.Format("{0}.{1}.0.0", majorVersion, minorVersion);
+		
 		if (!string.IsNullOrEmpty(clearVersion))
 		{
 			Information("Version from tag: {0}", clearVersion);
+			Information("Assembly version: {0}", assemblyVersion);
 			Information("Nuget version: {0}", semanticVersionForNuget);
 			Information("Semantic version: {0}", semanticVersion);
 			Information("AppVeyor version: {0}", appveyorVersion);
-			var versionParts = clearVersion.Split('.');
-			int.TryParse(versionParts[0], out majorVersion);
 		}
 
 		var datetimeNow = DateTime.Now;
 		var secondsPart = (long)datetimeNow.TimeOfDay.TotalSeconds;
 		var assemblyInfo = new AssemblyInfoSettings
 		{
-			Version = string.Format("{0}.0.0.0", majorVersion),
+			Version = assemblyVersion,
 			FileVersion = semanticVersionForNuget,
 			InformationalVersion = semanticVersion
 		};
diff --git a/nuspec/DiadocApi.nuspec b/nuspec/DiadocApi.nuspec
index 8aba444c..ab5325b4 100644
--- a/nuspec/DiadocApi.nuspec
+++ b/nuspec/DiadocApi.nuspec
@@ -6,7 +6,7 @@
     <owners>SKB Kontur</owners>
     <licenseUrl>https://github.com/diadoc/diadocsdk-charp/blob/master/LICENSE.md</licenseUrl>
     <projectUrl>https://github.com/diadoc/diadocsdk-charp</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/diadoc/diadocsdk-csharp/master/nuspec/diadoc-icon-64-64.png</iconUrl>
+    <iconUrl>https://raw.githubusercontent.com/diadoc/diadocsdk-csharp/master/nuspec/diadoc-icon-128-128.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Official Diadoc SDK</description>
     <copyright>Copyright 2016</copyright>
diff --git a/nuspec/diadoc-icon-128-128.png b/nuspec/diadoc-icon-128-128.png
new file mode 100644
index 0000000000000000000000000000000000000000..8959abf168e207930935a65da7c2ee965abcb71b
GIT binary patch
literal 2088
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

literal 0
HcmV?d00001