[build] Prepare for a 1.0 stable release.

Sure why not!
alanmcgovern · Sep 6, 2019 · 46c0a69 · 46c0a69
1 parent 44654cf
commit 46c0a69
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/beta.txt b/beta.txt
diff --git a/src/MonoTorrent/MonoTorrent.csproj b/src/MonoTorrent/MonoTorrent.csproj
@@ -5,7 +5,7 @@
     <LangVersion>7.2</LangVersion>
     <NoWarn>$(NoWarn);1591;1572;1573;1570;1584</NoWarn>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <MonoTorrentABIVersion>0.99.0.0</MonoTorrentABIVersion>
+    <MonoTorrentABIVersion>1.0.0.0</MonoTorrentABIVersion>
 
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 

diff --git a/src/MonoTorrent/MonoTorrent/VersionInfo.cs b/src/MonoTorrent/MonoTorrent/VersionInfo.cs
@@ -47,7 +47,7 @@ public static class VersionInfo
         /// </summary>
         internal static readonly string ClientVersion;
 
-        internal static readonly string DhtClientVersion = $"{ClientIdentifier}06";
+        internal static readonly string DhtClientVersion;
 
         /// <summary>
         /// The full version of this library.
@@ -56,18 +56,39 @@ public static class VersionInfo
 
         static VersionInfo ()
         {
-            Version  = System.Version.Parse(typeof(VersionInfo).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version);
+            Version  = new Version (
+                int.Parse (ThisAssembly.Git.SemVer.Major),
+                int.Parse (ThisAssembly.Git.SemVer.Minor),
+                int.Parse (ThisAssembly.Git.SemVer.Patch)
+            );
+
+            // The scheme for generating the peerid includes the version number using the scheme:
+            // ABCC, where A is the major, B is the minor and CC is the build version.
+            if (Version.Major > 9)
+                throw new ArgumentException ("The major version should be between 0 and 9 (inclusive)");
+            if (Version.Minor > 9)
+                throw new ArgumentException ("The minor version should be between 0 and 9 (inclusive)");
+             if (Version.Build > 99)
+                throw new ArgumentException ("The build version should be between 0 and 99 (inclusive)");
 
             // 'MO' for MonoTorrent then four digit version number
-            string version = string.Format ("{0}{1}{2}{3}", Math.Max (Version.Major, 0),
+            string version = string.Format ("{0}{1}{2:00}", Math.Max (Version.Major, 0),
                                                             Math.Max (Version.Minor, 0),
-                                                            Math.Max (Version.Build, 0),
-                                                            Math.Max (Version.Revision, 0));
+                                                            Math.Max (Version.Build, 0));
             if (version.Length > 4)
                 version = version.Substring (0, 4);
             else
                 version = version.PadRight (4, '0');
             ClientVersion = $"{ClientIdentifier}{version}";
+
+            // The DHT spec calls for a 2 char version identifier... urgh. I'm just going to
+            // generate a 4 character version identifier anyway as, hopefully, anyone using
+            // this field treats it like the opaque identifier it is supposed to be.
+            //
+            // If this causes issues then we should just trim the first 2 digits from this
+            // and accept that it's not a unique identifier anymore. If we keep the last
+            // two then we're more likely to be able to disambiguate.
+            DhtClientVersion = $"{ClientIdentifier}{version}";
         }
     }
 }
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.99.0
+1.0.0