Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/scripts/check_file_version.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,13 @@ $excludedFiles = @(
"JsonSchema.Net.dll",
"JsonPointer.Net.dll",
"Json.More.dll",
"DynamoPlayer.*.dll"
"DynamoPlayer.*.dll",
# DynamoAssistant built-in package (DYN-10450) — versioned independently of Dynamo, signed in its own pipeline.
"AutodeskAssistantViewExtension.dll",
"AutodeskAssistantViewExtension.resources.dll",
"AdpSDKCSharpWrapper.dll",
"Analytics.NET.ADP.dll",
"Analytics.NET.Core.dll"
)
$noVersion = @()
$wrongVersion = @()
Expand Down
25 changes: 25 additions & 0 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2234,6 +2234,31 @@
</ItemGroup>
<Copy SourceFiles="@(DynamoMcpPkg)" DestinationFolder="$(DynamoMcpDestRoot)%(RecursiveDir)" SkipUnchangedFiles="True" />
</Target>
<!--
DynamoAssistant (Autodesk Assistant) built-in package (DYN-10450). Consumed as a signed NuGet
(id DynamoVisualProgramming.DynamoAssistant) published by the Dynamo-AutodeskAssistant repo to
nuget.org (mirrors DynamoMCP / PythonNet3Engine's NuGet-consume pattern):
* ExcludeAssets="all" -> files only, no compile/runtime refs
* GeneratePathProperty="true" -> exposes $(PkgDynamoVisualProgramming_DynamoAssistant)
Hard-pinned to an exact version so a transitive bump can't pull an AA built against a
different DynamoVisualProgramming.* API. Bump in lockstep with the AA release for this line.
-->
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.DynamoAssistant" Version="[0.3.1]" GeneratePathProperty="true" ExcludeAssets="all" />

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Description just updated

</ItemGroup>
<!--
The NuGet wraps the assembled package under bin\, so $(PkgDynamoVisualProgramming_DynamoAssistant)\bin IS
the package layout (pkg.json + bin\ + extra\). Copy it verbatim into Built-In Packages.
-->
<Target Name="BuildDynamoAssistantDynamoPackage" AfterTargets="Build">
<PropertyGroup>
<DynamoAssistantDestRoot>$(OutputPath)\Built-In Packages\packages\DynamoAssistant\</DynamoAssistantDestRoot>
</PropertyGroup>
<ItemGroup>
<DynamoAssistantPkg Include="$(PkgDynamoVisualProgramming_DynamoAssistant)\bin\**\*" />
</ItemGroup>
<Copy SourceFiles="@(DynamoAssistantPkg)" DestinationFolder="$(DynamoAssistantDestRoot)%(RecursiveDir)" SkipUnchangedFiles="True" />
</Target>
<Target Name="CopyPMWizardHtmlFiles" AfterTargets="Build">
<ItemGroup>
<HtmlAndBundleFiles Include="Packages\PackageManagerWizard\dist\index.html" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public void PackageManagerLoadsAndAddsViewExtension()
Is.EquivalentTo(
new List<string>
{
"Autodesk Assistant",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is just a unit test, however to be consistent, I think now the package name is: DynamoAssistant instead of AutodeskAssistant

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @edwin-vasquez-ucaldas! Good catch to double-check. This particular assertion compares View.viewExtensionManager.ViewExtensions.Select(x => x.Name) — i.e. the view extension's display Name property, not the NuGet/package name.

  • Package (pkg.json) name: DynamoAssistant
  • View extension Name (what this test asserts): Autodesk Assistant (with a space)

I confirmed the value from the shipped AutodeskAssistantViewExtension.dll (Dynamo.AutodeskAssistant.AutodeskAssistantViewExtension), and its Name returns "Autodesk Assistant". So "Autodesk Assistant" is correct here — changing it to "DynamoAssistant" would make the test fail. Keeping it as-is. 🙂

"Documentation Browser",
"Dynamo MCP View Extension",
"DynamoManipulationExtension",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class PackageManagerUITests : SystemTestBase

internal string BuiltinPackagesTestDir { get { return Path.Combine(TestDirectory, "builtinpackages testdir", "Packages"); } }

internal int ExpectedNumberOfBuiltInPackages { get { return 3; } }
internal int ExpectedNumberOfBuiltInPackages { get { return 4; } }

#region Utility functions

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public void PackageManagerLoadsRuntimeGeneratedExtension()
public void PackageManagerViewExtensionHasCorrectNumberOfRequestedExtensions()
{
var pkgViewExtension = View.viewExtensionManager.ViewExtensions.OfType<PackageManagerViewExtension>().FirstOrDefault();
Assert.AreEqual(pkgViewExtension.RequestedExtensions.Count(), 3);
Assert.AreEqual(pkgViewExtension.RequestedExtensions.Count(), 4);
}

[Test]
Expand Down Expand Up @@ -208,7 +208,7 @@ public void LateLoadedViewExtensionsHaveMethodsCalled()
var pkg = loader.ScanPackageDirectory(pkgDir);
loader.LoadPackages(new List<Package> { pkg });
Assert.AreEqual(1, loader.RequestedExtensions.Count());
Assert.AreEqual(4, View.viewExtensionManager.ViewExtensions.OfType<PackageManagerViewExtension>().FirstOrDefault().RequestedExtensions.Count());
Assert.AreEqual(5, View.viewExtensionManager.ViewExtensions.OfType<PackageManagerViewExtension>().FirstOrDefault().RequestedExtensions.Count());
Assert.IsTrue(viewExtensionLoadStart);
Assert.IsTrue(viewExtensionAdd);
Assert.IsTrue(viewExtensionLoaded);
Expand Down
Loading