Bump Dynamo to 3.1 (#14719)

* Bump to 3.1

* Tweak

* Bump year in algorithm to 2023.

* Fix test

* Hardening unittest

LICENSE.txt

@@ -1,4 +1,4 @@
-@DYNAMO v.3.0.0 © 2023 Autodesk, Inc.  All rights reserved.
+@DYNAMO v.3.1.0 © 2024 Autodesk, Inc.  All rights reserved.
 Dynamo License
 
 Those portions created by Ian are provided with the following copyright:

src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs

@@ -8,7 +8,7 @@
 // associated with an assembly.
 [assembly: AssemblyCompany("Autodesk, Inc")]
 [assembly: AssemblyProduct("Dynamo")]
-[assembly: AssemblyCopyright("Copyright © Autodesk, Inc 2023")]
+[assembly: AssemblyCopyright("Copyright � Autodesk, Inc 2024")]
 [assembly: AssemblyTrademark("")]
 
 //In order to begin building localizable applications, set
@@ -45,7 +45,7 @@
 // to distinguish one build from another. AssemblyFileVersion is specified
 // in AssemblyVersionInfo.cs so that it can be easily incremented by the
 // automated build process.
-[assembly: AssemblyVersion("3.0.0.5795")]
+[assembly: AssemblyVersion("3.1.0.3411")]
 
 
 // By default, the "Product version" shown in the file properties window is
@@ -64,4 +64,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("3.0.0.5795")]
+[assembly: AssemblyFileVersion("3.1.0.3411")]

src/AssemblySharedInfoGenerator/AssemblySharedInfo.tt

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 // associated with an assembly.
 [assembly: AssemblyCompany("Autodesk, Inc")]
 [assembly: AssemblyProduct("Dynamo")]
-[assembly: AssemblyCopyright("Copyright © Autodesk, Inc 2023")]
+[assembly: AssemblyCopyright("Copyright © Autodesk, Inc 2024")]
 [assembly: AssemblyTrademark("")]
 
 //In order to begin building localizable applications, set
@@ -68,9 +68,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyFileVersion("<#= this.MajorVersion #>.<#= this.MinorVersion #>.<#= this.BuildNumber #>.<#= this.RevisionNumber #>")]
 <#+
 int MajorVersion = 3;
-int MinorVersion = 0;
+int MinorVersion = 1;
 int BuildNumber = 0;
 // The datetime baseline we choose using this algorithm will affect build number and all nuget packages uploaded
 // Please only change when major or minor version got incremented
-int RevisionNumber = ((int)(DateTime.UtcNow - new DateTime(2022,1,1)).TotalDays)*10+((int)DateTime.UtcNow.Hour)/3;
+int RevisionNumber = ((int)(DateTime.UtcNow - new DateTime(2023,1,1)).TotalDays)*10+((int)DateTime.UtcNow.Hour)/3;
 #>

src/Config/upiconfig.xml

@@ -8,17 +8,17 @@
         <upi_attribute name='id' value='DYN'/>
         <upi_element name='level'>
           <upi_attribute name='name' value='release'/>
-          <upi_attribute name='id' value='3.0.0'/>
+          <upi_attribute name='id' value='3.1.0'/>
           <upi_element name='level'>
             <upi_attribute name='name' value='master'/>
             <upi_attribute name='id' value='Win64'/>
             <upi_element name='level'>
               <upi_attribute name='name' value='build'/>
-              <upi_attribute name='id' value='3.0.0' />
+              <upi_attribute name='id' value='3.1.0' />
             </upi_element>
           </upi_element>
         </upi_element>
       </upi_element>
     </upi_element>
   </UpiValueRetrieval>
-</UpiDllConfig> 
+</UpiDllConfig> 

test/DynamoCoreWpfTests/PreferencesViewModelTests.cs

@@ -154,8 +154,8 @@ public void PathManagerWithDifferentHostTest()
             string dynamoRevitHostPath = "C:\\Program Files\\Autodesk\\Revit 2024\\AddIns\\DynamoForRevit\\Revit)";
             singletonPathManager.AssignHostPathAndIPathResolver(dynamoRevitHostPath, revitPathResolver);
 
-            string dynamoRevitUserDataDirectory = "C:\\Users\\user\\AppData\\Roaming\\Dynamo\\Dynamo Revit\\3.0";
-            string dynamoRevitCommonDataDirectory = "C:\\ProgramData\\Autodesk\\RVT 2024\\Dynamo\\3.0";
+            string dynamoRevitUserDataDirectory = "C:\\Users\\user\\AppData\\Roaming\\Dynamo\\Dynamo Revit\\3.1";
+            string dynamoRevitCommonDataDirectory = "C:\\ProgramData\\Autodesk\\RVT 2024\\Dynamo\\3.1";
             string dynamoRevitSamplesPath = "C:\\ProgramData\\Autodesk\\RVT 2024\\Dynamo\\samples\\en-US";
 
             Assert.AreEqual(Path.GetFullPath(singletonPathManager.UserDataDirectory), Path.GetFullPath(dynamoRevitUserDataDirectory));

test/Libraries/DynamoPythonTests/PythonTestsWithLogging.cs

@@ -33,15 +33,18 @@ protected override DynamoModel.IStartConfiguration CreateStartConfiguration(IPre
         [Test]
         public void DynamoPrintLogsToConsole()
         {
-            var expectedOutput = "Greeting CPython node: Hello from Python3!!!" + Environment.NewLine
-                  + "Greeting CPython String node: Hello from Python3!!!" + Environment.NewLine
-                  + "Greeting CPython String node: Hello from Python3!!!" + Environment.NewLine
-                  + "Multiple print parameter node: Hello Dynamo Print !!!" + Environment.NewLine
-                  + "Print separator parameter node: Hello_Dynamo_Print_!!!" + Environment.NewLine
-                  + @"`!£$%^&*()_+-[{]}#~'@;:|\,<.>/? Special character node: Lot's of special characters!!!";
+            var expectedOutput1 = "Greeting CPython node: Hello from Python3!!!" + Environment.NewLine;
+            var expectedOutput2 = "Greeting CPython String node: Hello from Python3!!!" + Environment.NewLine;
+            var expectedOutput3 = "Multiple print parameter node: Hello Dynamo Print !!!" + Environment.NewLine;
+            var expectedOutput4 = "Print separator parameter node: Hello_Dynamo_Print_!!!" + Environment.NewLine;
+            var expectedOutput5 = @"!£$%^&*()_+-[{]}#~'@;:|\,<.>/? Special character node: Lot's of special characters!!!";
 
             CurrentDynamoModel.OpenFileFromPath(Path.Combine(TestDirectory, "core", "python", "DynamoPrint.dyn"));
-            StringAssert.Contains(expectedOutput, CurrentDynamoModel.Logger.LogText);
+            StringAssert.Contains(expectedOutput1, CurrentDynamoModel.Logger.LogText);
+            StringAssert.Contains(expectedOutput2, CurrentDynamoModel.Logger.LogText);
+            StringAssert.Contains(expectedOutput3, CurrentDynamoModel.Logger.LogText);
+            StringAssert.Contains(expectedOutput4, CurrentDynamoModel.Logger.LogText);
+            StringAssert.Contains(expectedOutput5, CurrentDynamoModel.Logger.LogText);
         }
 
         [Test]

tools/autobuild/build.json

@@ -1,9 +1,9 @@
 {
   "product_id": "DYN",
-  "release_id": "3.0.0",
+  "release_id": "3.1.0",
   "master_id": "Win64",
-  "build_id": "3.0.0",
-  "name": "3.0.0",
+  "build_id": "3.1.0",
+  "name": "3.1.0",
   "build_milestone": "FCS",
   "description":"Build"
-}
+}

tools/autobuild/master.json

@@ -1,11 +1,11 @@
 {
   "product_id": "DYN",
-  "release_id": "3.0.0",
-  "name": "DynamoCore3.0.0 Win64",
+  "release_id": "3.1.0",
+  "name": "DynamoCore3.1.0 Win64",
   "master_id": "Win64",
   "language_pk": 1,
   "language_code_pk": 3,
   "master_platform_pk": 2,
   "master_type_pk": 1,
-  "description":"DynamoCore3.0.0"
-}
+  "description":"DynamoCore3.1.0"
+}

tools/autobuild/release.json

@@ -1,8 +1,8 @@
 {
   "product_id": "DYN",
-  "release_id": "3.0.0",
-  "name": "DynamoCore3.0.0",
-  "marketing_release_name": "DynamoCore3.0.0",
-  "description":"DynamoCore3.0.0",
-  "code_name": "DynamoCore3.0.0"
-}
+  "release_id": "3.1.0",
+  "name": "DynamoCore3.1.0",
+  "marketing_release_name": "DynamoCore3.1.0",
+  "description":"DynamoCore3.1.0",
+  "code_name": "DynamoCore3.1.0"
+}