diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs index 1e7b36fd450..5149c86c9a3 100644 --- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs +++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs @@ -160,7 +160,7 @@ public static string AddToLibraryButton { } /// - /// Looks up a localized string similar to I would like to participate in data collection. + /// Looks up a localized string similar to I would like to participate in data collection for Machine Learning Programs. /// public static string AgreeToMLAutocompleteTOUText { get { @@ -2279,7 +2279,7 @@ public static string DynamoViewSettingMenuNumberFormat { } /// - /// Looks up a localized string similar to Agreement and _Terms of Use. + /// Looks up a localized string similar to Agreements for _Data Collection. /// public static string DynamoViewSettingMenuShowDataReportingDialog { get { @@ -2287,15 +2287,6 @@ public static string DynamoViewSettingMenuShowDataReportingDialog { } } - /// - /// Looks up a localized string similar to Display the dialog of agreement on data collecting and Machine Learning Node Autocomplete terms of use. - /// - public static string DynamoViewSettingMenuShowDataReportingDialogTooltip { - get { - return ResourceManager.GetString("DynamoViewSettingMenuShowDataReportingDialogTooltip", resourceCulture); - } - } - /// /// Looks up a localized string similar to Square Centimeter. /// @@ -9962,7 +9953,7 @@ public static string UpdateMessage { } /// - /// Looks up a localized string similar to Agreement and Terms of Use. + /// Looks up a localized string similar to Agreements for Data Collection. /// public static string UsageReportPromptDialogTitle { get { diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx index 53a702137cd..9dcd6add055 100644 --- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx +++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx @@ -764,7 +764,7 @@ Don't worry, you'll have the option to save your work. Setting menu | Decimal inch - Agreement and _Terms of Use + Agreements for _Data Collection Dynamo menu | Show user agreement dialog about data collecting @@ -2220,10 +2220,10 @@ Installing the latest update requires Dynamo and any host applications to close. Do you want to install the latest Dynamo update? - Agreement and Terms of Use + Agreements for Data Collection - I would like to participate in data collection + I would like to participate in data collection for Machine Learning Programs Keep 1 input list's nesting @@ -2315,9 +2315,6 @@ Uninstall the following packages: {0}? Filter by - - Display the dialog of agreement on data collecting and Machine Learning Node Autocomplete terms of use - ..\ViewModels\Watch3D\compiledShaders\psDynamoMesh;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -3882,4 +3879,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in Millimeters - \ No newline at end of file + diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx index 767a569dbbb..f8530049348 100644 --- a/src/DynamoCoreWpf/Properties/Resources.resx +++ b/src/DynamoCoreWpf/Properties/Resources.resx @@ -487,7 +487,7 @@ Setting menu | Decimal inch - Agreement and _Terms of Use + Agreements for _Data Collection Dynamo menu | Show user agreement dialog about data collecting @@ -1151,10 +1151,10 @@ Don't worry, you'll have the option to save your work. Cancel - Agreement and Terms of Use + Agreements for Data Collection - I would like to participate in data collection + I would like to participate in data collection for Machine Learning Programs Clear @@ -2605,9 +2605,6 @@ Uninstall the following packages: {0}? Filter by - - Display the dialog of agreement on data collecting and Machine Learning Node Autocomplete terms of use - ..\ViewModels\Watch3D\compiledShaders\psDynamoMesh;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -3869,4 +3866,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in Millimeters - \ No newline at end of file + diff --git a/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs index 06c4efe9711..7a9a8ac03f8 100644 --- a/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs @@ -374,7 +374,7 @@ internal void DisplayMachineLearningResults() if (viewModelElement != null) { - viewModelElement.AutoCompletionNodeMachineLearningInfo = new AutoCompletionNodeMachineLearningInfo(true, true, result.Score * 100); + viewModelElement.AutoCompletionNodeMachineLearningInfo = new AutoCompletionNodeMachineLearningInfo(true, true, Math.Round(result.Score * 100)); results.Add(viewModelElement); } } @@ -407,7 +407,7 @@ internal void DisplayMachineLearningResults() if (viewModelElement != null) { - viewModelElement.AutoCompletionNodeMachineLearningInfo = new AutoCompletionNodeMachineLearningInfo(true, true, result.Score * 100); + viewModelElement.AutoCompletionNodeMachineLearningInfo = new AutoCompletionNodeMachineLearningInfo(true, true, Math.Round(result.Score * 100)); results.Add(viewModelElement); } } diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml index 82e8b72a55d..3824a34408b 100644 --- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml +++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml @@ -306,9 +306,6 @@ Command="{Binding Path=ToggleIsAnalyticsReportingApprovedCommand, Source={x:Static service:UsageReportingManager.Instance} }" CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:DynamoView}}}" Visibility="{Binding HideReportOptions, Converter={StaticResource InverseBoolToVisibilityCollapsedConverter}}"> - - - PackageVersions { get { return Header.versions.Select(x => x.version); } } + public IEnumerable PackageVersions { get { return Header.versions.OrderByDescending(x => x.version).Select(x => x.version); } } /// /// Hosts dependencies specified for latest version of particular package diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/Commands/RenameCommand.cs b/src/Tools/NodeDocumentationMarkdownGenerator/Commands/RenameCommand.cs index 3d6a8f1ee69..88ec090c2b6 100644 --- a/src/Tools/NodeDocumentationMarkdownGenerator/Commands/RenameCommand.cs +++ b/src/Tools/NodeDocumentationMarkdownGenerator/Commands/RenameCommand.cs @@ -61,7 +61,7 @@ private static void RenameFile(string file) private static void RenameFile(string file, string baseName, string shortName) { - var content = File.ReadAllText(file); + var content = HttpUtility.UrlDecode(File.ReadAllText(file)); content = content.Replace(baseName, shortName); var path = Path.GetDirectoryName(file); var newFile = Path.Combine(path, shortName + ".md"); diff --git a/test/Libraries/SystemTestServices/SystemTestBase.cs b/test/Libraries/SystemTestServices/SystemTestBase.cs index 774a09abb68..24390bbf9e9 100644 --- a/test/Libraries/SystemTestServices/SystemTestBase.cs +++ b/test/Libraries/SystemTestServices/SystemTestBase.cs @@ -194,7 +194,8 @@ protected virtual void StartDynamo(TestSessionConfiguration testConfig) StartInTestMode = true, PathResolver = pathResolver, GeometryFactoryPath = preloader.GeometryFactoryPath, - ProcessMode = TaskProcessMode.Synchronous + ProcessMode = TaskProcessMode.Synchronous, + DynamoCorePath = testConfig.DynamoCorePath }); ViewModel = DynamoViewModel.Start( @@ -305,15 +306,29 @@ public void AssertPreviewCount(string guid, int count) Assert.AreEqual(count, data.GetElements().ToList().Count); } - public NodeModel GetNode(string guid) where T : NodeModel + /// + /// Returns the NodeModel corresponding to the input guid + /// + /// A NodeModel (or derived) type + /// The node Guid + /// + /// + [Obsolete("This method will be removed in a future version of Dynamo")] + public NodeModel GetNode(string guid) where T : class { + bool isNodeModel = typeof(T) == typeof(NodeModel); + bool isDerivedFromNodeModel = typeof(T).IsSubclassOf(typeof(NodeModel)); + if ( !isNodeModel && !isDerivedFromNodeModel) + { + throw new Exception($"{typeof(T)} is not of type NodeModel"); + } var allNodes = ViewModel.Model.CurrentWorkspace.Nodes; var nodes = allNodes.Where(x => string.CompareOrdinal(x.GUID.ToString(), guid) == 0); if (nodes.Count() < 1) return null; else if (nodes.Count() > 1) throw new Exception("There are more than one nodes with the same GUID!"); - return nodes.ElementAt(0) as T; + return nodes.ElementAt(0); } public object GetPreviewValue(string guid) diff --git a/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs b/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs index aa591f752ae..371a0afcce3 100644 --- a/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs +++ b/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs @@ -520,6 +520,62 @@ public void CanRenameFile() Assert.IsTrue(content.Contains("CoreNodeModels.HigherOrder.Map")); } + [Test] + public void CanRenameFileLongName() + { + // Arrange + var originalOutDirName = "fallback_docs"; + var filesDirectory = "LongNameFiles"; + var emptySpaceChar = "%20"; + var originalOutDir = new DirectoryInfo(Path.Combine(toolsTestFilesDirectory, originalOutDirName, filesDirectory)); + + tempDirectory = CreateTempOutputDirectory(); + Assert.That(tempDirectory.Exists); + + CopyFilesRecursively(originalOutDir, tempDirectory); + + var originalMdFile = tempDirectory.GetFiles("*.md", SearchOption.TopDirectoryOnly) + .Select(x => x.Name).FirstOrDefault(); + Assert.IsNotNull(originalMdFile); + + //Check that the original MD file contains space characters URL encoded + var originalMdFileContent = Path.Combine(tempDirectory.FullName, originalMdFile); + Assert.IsTrue(File.ReadAllText(originalMdFileContent).Contains(emptySpaceChar)); + + // Act + var opts = new RenameOptions + { + InputMdDirectory = tempDirectory.FullName, + MaxLength = 90 + }; + + //Rename all the files in the temp directory + RenameCommand.HandleRename(opts); + + // Assert + var finalMdFile = tempDirectory.GetFiles("*.md", SearchOption.TopDirectoryOnly) + .Select(x => x.Name).FirstOrDefault(); + Assert.IsNotNull(finalMdFile); + + var hashedName = Path.GetFileNameWithoutExtension(finalMdFile); + + //Validates that all the renamed files start with the hashed name + var allFiles = tempDirectory.GetFiles("*.*", SearchOption.TopDirectoryOnly).Select(x => x.Name); + foreach(var file in allFiles) + { + Assert.IsTrue(file.StartsWith(hashedName)); + } + + //Get the image file name renamed + var imageFile = tempDirectory.GetFiles("*.jpg", SearchOption.TopDirectoryOnly) + .Select(x => x.Name).FirstOrDefault(); + Assert.IsNotNull(imageFile); + + //Validates that the image file name is present inside the md file content. + var finalMdFileContent = Path.Combine(tempDirectory.FullName, finalMdFile); + Assert.IsTrue(File.ReadAllText(finalMdFileContent).Contains(imageFile)); + } + [Test] public void CanRenameFilesInADirectory() { diff --git a/test/Tools/docGeneratorTestFiles/fallback_docs/LongNameFiles/Autodesk.DesignScript.Geometry.CoordinateSystem.ByOriginVectors(origin, xAxis, yAxis, zAxis).dyn b/test/Tools/docGeneratorTestFiles/fallback_docs/LongNameFiles/Autodesk.DesignScript.Geometry.CoordinateSystem.ByOriginVectors(origin, xAxis, yAxis, zAxis).dyn new file mode 100644 index 00000000000..09737eb966d --- /dev/null +++ b/test/Tools/docGeneratorTestFiles/fallback_docs/LongNameFiles/Autodesk.DesignScript.Geometry.CoordinateSystem.ByOriginVectors(origin, xAxis, yAxis, zAxis).dyn @@ -0,0 +1,510 @@ +{ + "Uuid": "3c9d0464-8643-5ffe-96e5-ab1769818209", + "IsCustomNode": false, + "Description": "", + "Name": "ByOriginVectors", + "ElementResolver": { + "ResolutionMap": {} + }, + "Inputs": [], + "Outputs": [], + "Nodes": [ + { + "ConcreteType": "CoreNodeModels.Watch, CoreNodeModels", + "NodeType": "ExtensionNode", + "Id": "d86188a165304a8385aae4a9531e3672", + "Inputs": [ + { + "Id": "2d914730ea324f958e05f99ad7952c22", + "Name": "", + "Description": "Node to evaluate.", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "8620e90e3be94bf5a7b4b9f49e6278bb", + "Name": "", + "Description": "Watch contents.", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Visualize the output of node." + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.CodeBlockNodeModel, DynamoCore", + "NodeType": "CodeBlockNode", + "Code": "2;", + "Id": "72602684b1b64b16b05cabb5f77a6fbd", + "Inputs": [], + "Outputs": [ + { + "Id": "819b341b89d540fcaa862b8852010a32", + "Name": "", + "Description": "Value of expression at line 1", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Allows for DesignScript code to be authored directly" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "NodeType": "FunctionNode", + "FunctionSignature": "Autodesk.DesignScript.Geometry.Point.ByCoordinates@double,double,double", + "Id": "11569a47bcb346c2b834bfefb91a4f57", + "Inputs": [ + { + "Id": "6e5e58012cb44ce0a9d3a268ff89b2fb", + "Name": "x", + "Description": "double\nDefault value : 0", + "UsingDefaultValue": true, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "13aac907e6184fde9a22193bd1331c54", + "Name": "y", + "Description": "double\nDefault value : 0", + "UsingDefaultValue": true, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "02e941da59054ada87e616a7f9182e04", + "Name": "z", + "Description": "double\nDefault value : 0", + "UsingDefaultValue": true, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "704c425506fa41478db1cf48e07bfd19", + "Name": "Point", + "Description": "Point", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Auto", + "Description": "Form a Point given 3 cartesian coordinates\n\nPoint.ByCoordinates (x: double = 0, y: double = 0, z: double = 0): Point" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "NodeType": "FunctionNode", + "FunctionSignature": "Autodesk.DesignScript.Geometry.Vector.ByCoordinates@double,double,double", + "Id": "337978e8b98c4d868e808205abf40de3", + "Inputs": [ + { + "Id": "8fc91f5adc894bca89899a3736dd164d", + "Name": "x", + "Description": "X coordinate\n\ndouble\nDefault value : 0", + "UsingDefaultValue": true, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "4b3c68dad3c94a1e92fb98540f756647", + "Name": "y", + "Description": "Y coordinate\n\ndouble\nDefault value : 0", + "UsingDefaultValue": true, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "44c159a2127e4f20be880f29b8894540", + "Name": "z", + "Description": "Z coordinate\n\ndouble\nDefault value : 0", + "UsingDefaultValue": true, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "94773d257847429fa2cabf6d55700157", + "Name": "Vector", + "Description": "Vector", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Auto", + "Description": "Form a Vector by 3 Euclidean coordinates\n\nVector.ByCoordinates (x: double = 0, y: double = 0, z: double = 0): Vector" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.CodeBlockNodeModel, DynamoCore", + "NodeType": "CodeBlockNode", + "Code": "2;", + "Id": "8fb6380247b448baab7de14761320dce", + "Inputs": [], + "Outputs": [ + { + "Id": "71f922a4e4d047e7a2a66a4041db6671", + "Name": "", + "Description": "Value of expression at line 1", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Allows for DesignScript code to be authored directly" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "NodeType": "FunctionNode", + "FunctionSignature": "Autodesk.DesignScript.Geometry.Vector.ByCoordinates@double,double,double", + "Id": "e39b5218a2f44902971414941f9e467c", + "Inputs": [ + { + "Id": "d123cdce221e438cb2c9aef37542f553", + "Name": "x", + "Description": "X coordinate\n\ndouble\nDefault value : 0", + "UsingDefaultValue": true, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "b01ec1f7aa144f7db8939579c30bace7", + "Name": "y", + "Description": "Y coordinate\n\ndouble\nDefault value : 0", + "UsingDefaultValue": true, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "110d806c342f4a919b19fc70e03bd2fe", + "Name": "z", + "Description": "Z coordinate\n\ndouble\nDefault value : 0", + "UsingDefaultValue": true, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "1d3f4f81f6844527949670ba45108901", + "Name": "Vector", + "Description": "Vector", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Auto", + "Description": "Form a Vector by 3 Euclidean coordinates\n\nVector.ByCoordinates (x: double = 0, y: double = 0, z: double = 0): Vector" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.CodeBlockNodeModel, DynamoCore", + "NodeType": "CodeBlockNode", + "Code": "1;", + "Id": "7cda1185b79e41a387895af30e7c0482", + "Inputs": [], + "Outputs": [ + { + "Id": "2fe031b178a74164963e60f44028e76f", + "Name": "", + "Description": "Value of expression at line 1", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Allows for DesignScript code to be authored directly" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.CodeBlockNodeModel, DynamoCore", + "NodeType": "CodeBlockNode", + "Code": "2;", + "Id": "8f8f665e3cda49f280746e9cc1edcbd9", + "Inputs": [], + "Outputs": [ + { + "Id": "967420d1dd654b3a8c4f7e70973579e6", + "Name": "", + "Description": "Value of expression at line 1", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Allows for DesignScript code to be authored directly" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "NodeType": "FunctionNode", + "FunctionSignature": "Autodesk.DesignScript.Geometry.CoordinateSystem.ByOriginVectors@Autodesk.DesignScript.Geometry.Point,Autodesk.DesignScript.Geometry.Vector,Autodesk.DesignScript.Geometry.Vector,Autodesk.DesignScript.Geometry.Vector", + "Id": "d0e98bdb46bf4f9aba607fd9f281e12d", + "Inputs": [ + { + "Id": "449157f12d0241ecb65b4ff5c19b4e3b", + "Name": "origin", + "Description": "Point\nDefault value : Autodesk.DesignScript.Geometry.Point.ByCoordinates(0, 0, 0)", + "UsingDefaultValue": true, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "0057ba426303471d83ee80240fcf815e", + "Name": "xAxis", + "Description": "Vector\nDefault value : Autodesk.DesignScript.Geometry.Vector.ByCoordinates(1, 0, 0)", + "UsingDefaultValue": true, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "e73f1d3369c642728e51c7ec1888a159", + "Name": "yAxis", + "Description": "Vector\nDefault value : Autodesk.DesignScript.Geometry.Vector.ByCoordinates(0, 1, 0)", + "UsingDefaultValue": true, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "d33e35d449c8414dac81950181f822cb", + "Name": "zAxis", + "Description": "Vector\nDefault value : Autodesk.DesignScript.Geometry.Vector.ByCoordinates(0, 0, 1)", + "UsingDefaultValue": true, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "9943265af5c94c96bd7d14940ea1b11c", + "Name": "CoordinateSystem", + "Description": "CoordinateSystem", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Auto", + "Description": "Create a CoordinateSystem at the origin with X and Y axis, with Z axis ignored completely. Input Vectors are normalized before creating the CoordinateSystem.\n\nCoordinateSystem.ByOriginVectors (origin: Point = Autodesk.DesignScript.Geometry.Point.ByCoordinates(0, 0, 0), xAxis: Vector = Autodesk.DesignScript.Geometry.Vector.ByCoordinates(1, 0, 0), yAxis: Vector = Autodesk.DesignScript.Geometry.Vector.ByCoordinates(0, 1, 0), zAxis: Vector = Autodesk.DesignScript.Geometry.Vector.ByCoordinates(0, 0, 1)): CoordinateSystem" + } + ], + "Connectors": [ + { + "Start": "819b341b89d540fcaa862b8852010a32", + "End": "6e5e58012cb44ce0a9d3a268ff89b2fb", + "Id": "bef92e12ff574562a166245b7dbfb3c9" + }, + { + "Start": "819b341b89d540fcaa862b8852010a32", + "End": "13aac907e6184fde9a22193bd1331c54", + "Id": "f9e4676b44184283849c472c63695a54" + }, + { + "Start": "819b341b89d540fcaa862b8852010a32", + "End": "02e941da59054ada87e616a7f9182e04", + "Id": "43679c54d4984d569715080408fba04d" + }, + { + "Start": "704c425506fa41478db1cf48e07bfd19", + "End": "449157f12d0241ecb65b4ff5c19b4e3b", + "Id": "47a90edd44d84f338b9ef652d7a1837f" + }, + { + "Start": "94773d257847429fa2cabf6d55700157", + "End": "0057ba426303471d83ee80240fcf815e", + "Id": "b6e7c4a4ba544895937711861176c969" + }, + { + "Start": "71f922a4e4d047e7a2a66a4041db6671", + "End": "4b3c68dad3c94a1e92fb98540f756647", + "Id": "8f6af2c5424646118e45a506f7991073" + }, + { + "Start": "71f922a4e4d047e7a2a66a4041db6671", + "End": "8fc91f5adc894bca89899a3736dd164d", + "Id": "90c2195d04cf4cee94fec7b0438364d0" + }, + { + "Start": "71f922a4e4d047e7a2a66a4041db6671", + "End": "44c159a2127e4f20be880f29b8894540", + "Id": "2f484952c70542b8b7930b4773f17e5e" + }, + { + "Start": "1d3f4f81f6844527949670ba45108901", + "End": "e73f1d3369c642728e51c7ec1888a159", + "Id": "4fb9aeb103d8493f9dbfbfb5a4cb9cbc" + }, + { + "Start": "2fe031b178a74164963e60f44028e76f", + "End": "d123cdce221e438cb2c9aef37542f553", + "Id": "5f45356ec5bb42a0888033679ee87e7f" + }, + { + "Start": "2fe031b178a74164963e60f44028e76f", + "End": "b01ec1f7aa144f7db8939579c30bace7", + "Id": "5f73fb8b1c3a4dc8af0bbbbc038b13c6" + }, + { + "Start": "967420d1dd654b3a8c4f7e70973579e6", + "End": "110d806c342f4a919b19fc70e03bd2fe", + "Id": "9c346312857643b3b6988c44b176d75b" + }, + { + "Start": "9943265af5c94c96bd7d14940ea1b11c", + "End": "2d914730ea324f958e05f99ad7952c22", + "Id": "7910c6e3d5b44768b6a8a46a05ae0e8c" + } + ], + "Dependencies": [], + "Bindings": [], + "View": { + "Dynamo": { + "ScaleFactor": 1.0, + "HasRunWithoutCrash": true, + "IsVisibleInDynamoLibrary": true, + "Version": "2.0.1.5055", + "RunType": "Automatic", + "RunPeriod": "1000" + }, + "Camera": { + "Name": "Background Preview", + "EyeX": 6.0688209533691406, + "EyeY": 4.51063346862793, + "EyeZ": 1.5671737194061279, + "LookX": -1.7978543043136597, + "LookY": -0.73139345645904541, + "LookZ": -0.85327517986297607, + "UpX": -0.12260746210813522, + "UpY": 0.99074780941009521, + "UpZ": -0.058190420269966125 + }, + "NodeViews": [ + { + "ShowGeometry": true, + "Name": "Watch", + "Id": "d86188a165304a8385aae4a9531e3672", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "X": 422.58728329119123, + "Y": 2743.52336605886 + }, + { + "ShowGeometry": true, + "Name": "Code Block", + "Id": "72602684b1b64b16b05cabb5f77a6fbd", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "X": -273.296648597838, + "Y": 2774.48698768449 + }, + { + "ShowGeometry": true, + "Name": "Point.ByCoordinates", + "Id": "11569a47bcb346c2b834bfefb91a4f57", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "X": -153.80384278826, + "Y": 2743.52336605886 + }, + { + "ShowGeometry": true, + "Name": "Vector.ByCoordinates", + "Id": "337978e8b98c4d868e808205abf40de3", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "X": -159.40384278826, + "Y": 2889.17375172643 + }, + { + "ShowGeometry": true, + "Name": "Code Block", + "Id": "8fb6380247b448baab7de14761320dce", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "X": -273.296648597838, + "Y": 2919.70486828047 + }, + { + "ShowGeometry": true, + "Name": "Vector.ByCoordinates", + "Id": "e39b5218a2f44902971414941f9e467c", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "X": -159.40384278826, + "Y": 3029.02831388662 + }, + { + "ShowGeometry": true, + "Name": "Code Block", + "Id": "7cda1185b79e41a387895af30e7c0482", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "X": -273.296648597838, + "Y": 3059.55943044066 + }, + { + "ShowGeometry": true, + "Name": "Code Block", + "Id": "8f8f665e3cda49f280746e9cc1edcbd9", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "X": -273.296648597838, + "Y": 3147.26707216241 + }, + { + "ShowGeometry": true, + "Name": "CoordinateSystem.ByOriginVectors", + "Id": "d0e98bdb46bf4f9aba607fd9f281e12d", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "X": 105.75058649383601, + "Y": 2743.52336605886 + } + ], + "Annotations": [], + "X": 335.52907871996149, + "Y": -2555.4960660888196, + "Zoom": 1.0332137540626696 + } +} \ No newline at end of file diff --git a/test/Tools/docGeneratorTestFiles/fallback_docs/LongNameFiles/Autodesk.DesignScript.Geometry.CoordinateSystem.ByOriginVectors(origin, xAxis, yAxis, zAxis).md b/test/Tools/docGeneratorTestFiles/fallback_docs/LongNameFiles/Autodesk.DesignScript.Geometry.CoordinateSystem.ByOriginVectors(origin, xAxis, yAxis, zAxis).md new file mode 100644 index 00000000000..36309cc701e --- /dev/null +++ b/test/Tools/docGeneratorTestFiles/fallback_docs/LongNameFiles/Autodesk.DesignScript.Geometry.CoordinateSystem.ByOriginVectors(origin, xAxis, yAxis, zAxis).md @@ -0,0 +1,10 @@ +## In Depth +`CoordinateSystem.ByOriginVectors (origin, xAxis, yAxis, zAxis)` returns a new CoordinateSystem at an input origin point with input X, Y, and Z axes. + +In the example below, the CoordinateSystem is placed at an origin with new vectors for the X, Y, and Z axes. The result is a CoordinateSystem rotated relative to the original CoordinateSystem. + +___ +## Example File + +![ByOriginVectors (origin, xAxis, yAxis, zAxis)](./Autodesk.DesignScript.Geometry.CoordinateSystem.ByOriginVectors(origin,%20xAxis,%20yAxis,%20zAxis)_img.jpg) + diff --git a/test/Tools/docGeneratorTestFiles/fallback_docs/LongNameFiles/Autodesk.DesignScript.Geometry.CoordinateSystem.ByOriginVectors(origin, xAxis, yAxis, zAxis)_img.jpg b/test/Tools/docGeneratorTestFiles/fallback_docs/LongNameFiles/Autodesk.DesignScript.Geometry.CoordinateSystem.ByOriginVectors(origin, xAxis, yAxis, zAxis)_img.jpg new file mode 100644 index 00000000000..74fa2ec1505 Binary files /dev/null and b/test/Tools/docGeneratorTestFiles/fallback_docs/LongNameFiles/Autodesk.DesignScript.Geometry.CoordinateSystem.ByOriginVectors(origin, xAxis, yAxis, zAxis)_img.jpg differ diff --git a/tools/NuGet/build_props/DynamoVisualProgramming.Tests.props b/tools/NuGet/build_props/DynamoVisualProgramming.Tests.props new file mode 100644 index 00000000000..b9be3bf82b4 --- /dev/null +++ b/tools/NuGet/build_props/DynamoVisualProgramming.Tests.props @@ -0,0 +1,9 @@ + + + + TestServices.dll.config + Always + True + + + diff --git a/tools/NuGet/build_props/TestServices.dll.config b/tools/NuGet/build_props/TestServices.dll.config new file mode 100644 index 00000000000..0d8d234ba38 --- /dev/null +++ b/tools/NuGet/build_props/TestServices.dll.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec index bd2127d8cd4..d4e0c3df2d1 100644 --- a/tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec +++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec @@ -10,27 +10,15 @@ content\images\logo.png false - Assemblies required to start a DynamoModel and execute DesignScript code. Contains the following files: - 1) DynamoApplications.dll - 2) DynamoCore.dll - 3) DynamoInstallDetective.dll - 4) DynamoShapeManager.dll - 5) DynamoUtilities.dll - 6) ProtoCore.dll - 7) DesignScriptBuiltin.dll - 8) VMDataBridge.dll - 9) DSCPython.dll - 10) DynamoPackages.dll + Assemblies required to reference core APIs from Dynamo. This package contains the core assemblies for Dynamo. Copyright Autodesk 2023 - - + - @@ -57,4 +45,4 @@ - + \ No newline at end of file diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec index 26bcb36c694..1041a024aa8 100644 --- a/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec +++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec @@ -10,13 +10,7 @@ content\images\logo.png false - Reference the core node types for Dynamo. It contains the following files: - 1) Analysis.dll - 2) GeometryColor.dll - 3) DSCoreNodes.dll - 4) CoreNodeModels.dll - 5) Watch3DNodeModels.dll - 6) UnitNodeModels.dll + Reference the core node types for Dynamo. Copyright Autodesk 2023 diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec index 2e1ccddb92c..5b47ba3dfaf 100644 --- a/tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec +++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec @@ -9,23 +9,30 @@ https://github.com/DynamoDS/Dynamo content\images\logo.png false - Unit and system test infrastructure for Dynamo. It contains the following files: - 1) DynamoCoreTests.dll - 2) SystemTestServices.dll - 3) TestServices.dll + Unit and system test infrastructure for Dynamo. This package contains all that is required to get up and running creating tests for Dynamo libraries. Copyright Autodesk 2023 - + + + + + + + + + + + diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec index 84a8254e081..f93449ba0fc 100644 --- a/tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec +++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec @@ -10,18 +10,10 @@ content\images\logo.png false - Build node libraries for Dynamo with custom UI in WPF. It contains the following files: - 1) DynamoCoreWpf.dll - 2) CoreNodeModelsWpf.dll + Build node libraries for Dynamo with custom UI in WPF. This package contains all that is required to get up and running building nodes for the Dynamo Visual Programming language with custom UI in WPF. Copyright Autodesk 2023 - - - - - - diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec index b756cebe764..6d58e8088cf 100644 --- a/tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec +++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec @@ -9,9 +9,7 @@ https://github.com/DynamoDS/Dynamo content\images\logo.png false - Build zero touch node libraries for Dynamo. It contains the following files: - 1) DynamoUnits.dll - 2) ProtoGeometry.dll + Build zero touch node libraries for Dynamo. This package contains all that is required to get up and running building zero touch libraries for the Dynamo Visual Programming language. Copyright Autodesk 2023 @@ -29,4 +27,4 @@ - + \ No newline at end of file