Merge branch 'dev' into release

SignalR · Jun 19, 2018 · f5610c2 · f5610c2
2 parents 5154322 + 9b05bcb
commit f5610c2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/build/Microsoft.AspNet.SignalR.versions.targets b/build/Microsoft.AspNet.SignalR.versions.targets
@@ -8,7 +8,7 @@
         <!-- Change this to set the build quality of the project. Use values like "alpha", "beta", "rc1", "rtm", etc. -->
         <!-- These values are used in SemVer, so make sure to always increase these alphabetically. -->
         <!-- For non-nightly RTM builds, we don't set the build quality. -->
-        <BuildQuality Condition="'$(Nightly)' == 'true'">pre</BuildQuality>
+        <BuildQuality Condition="'$(Nightly)' == 'true'">rtm</BuildQuality>
         <ScaleoutBuildQuality Condition="'$(Nightly)' == 'true'">pre</ScaleoutBuildQuality>
         <KatanaBuildQuality Condition="'$(Nightly)' == 'true'">rtw</KatanaBuildQuality>
 

diff --git a/samples/Microsoft.AspNet.SignalR.Samples/Scripts/hubs.js b/samples/Microsoft.AspNet.SignalR.Samples/Scripts/hubs.js
@@ -1,5 +1,5 @@
 /*!
- * ASP.NET SignalR JavaScript Library v2.3.0-pre
+ * ASP.NET SignalR JavaScript Library v2.3.0-rtm
  * http://signalr.net/
  *
  * Copyright (c) .NET Foundation. All rights reserved.

diff --git a/src/Common/CommonVersionInfo.cs b/src/Common/CommonVersionInfo.cs
@@ -5,4 +5,4 @@
 
 [assembly: AssemblyVersion("2.3.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("2.3.0-pre")]
+[assembly: AssemblyInformationalVersion("2.3.0-rtm")]
diff --git a/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.core.js b/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.core.js
@@ -1,6 +1,6 @@
 /*global window:false */
 /*!
- * ASP.NET SignalR JavaScript Library v2.3.0-pre
+ * ASP.NET SignalR JavaScript Library v2.3.0-rtm
  * http://signalr.net/
  *
  * Copyright (c) .NET Foundation. All rights reserved.

diff --git a/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.version.js b/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.version.js
@@ -5,5 +5,5 @@
 /*global window:false */
 /// <reference path="jquery.signalR.core.js" />
 (function ($, undefined) {
-    $.signalR.version = "2.3.0-pre";
+    $.signalR.version = "2.3.0-rtm";
 }(window.jQuery));
diff --git a/src/Microsoft.AspNet.SignalR.Core/Scripts/hubs.js b/src/Microsoft.AspNet.SignalR.Core/Scripts/hubs.js
@@ -1,5 +1,5 @@
 /*!
- * ASP.NET SignalR JavaScript Library v2.3.0-pre
+ * ASP.NET SignalR JavaScript Library v2.3.0-rtm
  * http://signalr.net/
  *
  * Copyright (c) .NET Foundation. All rights reserved.