Skip to content

Commit c1bf718

Browse files
DYN-10450: Consume DynamoAssistant NuGet as a built-in package (#17187)
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 885f06b commit c1bf718

5 files changed

Lines changed: 36 additions & 4 deletions

File tree

.github/scripts/check_file_version.ps1

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,13 @@ $excludedFiles = @(
8181
"JsonSchema.Net.dll",
8282
"JsonPointer.Net.dll",
8383
"Json.More.dll",
84-
"DynamoPlayer.*.dll"
84+
"DynamoPlayer.*.dll",
85+
# DynamoAssistant built-in package (DYN-10450) — versioned independently of Dynamo, signed in its own pipeline.
86+
"AutodeskAssistantViewExtension.dll",
87+
"AutodeskAssistantViewExtension.resources.dll",
88+
"AdpSDKCSharpWrapper.dll",
89+
"Analytics.NET.ADP.dll",
90+
"Analytics.NET.Core.dll"
8591
)
8692
$noVersion = @()
8793
$wrongVersion = @()

src/DynamoCoreWpf/DynamoCoreWpf.csproj

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2234,6 +2234,31 @@
22342234
</ItemGroup>
22352235
<Copy SourceFiles="@(DynamoMcpPkg)" DestinationFolder="$(DynamoMcpDestRoot)%(RecursiveDir)" SkipUnchangedFiles="True" />
22362236
</Target>
2237+
<!--
2238+
DynamoAssistant (Autodesk Assistant) built-in package (DYN-10450). Consumed as a signed NuGet
2239+
(id DynamoVisualProgramming.DynamoAssistant) published by the Dynamo-AutodeskAssistant repo to
2240+
nuget.org (mirrors DynamoMCP / PythonNet3Engine's NuGet-consume pattern):
2241+
* ExcludeAssets="all" -> files only, no compile/runtime refs
2242+
* GeneratePathProperty="true" -> exposes $(PkgDynamoVisualProgramming_DynamoAssistant)
2243+
Hard-pinned to an exact version so a transitive bump can't pull an AA built against a
2244+
different DynamoVisualProgramming.* API. Bump in lockstep with the AA release for this line.
2245+
-->
2246+
<ItemGroup>
2247+
<PackageReference Include="DynamoVisualProgramming.DynamoAssistant" Version="[0.3.1]" GeneratePathProperty="true" ExcludeAssets="all" />
2248+
</ItemGroup>
2249+
<!--
2250+
The NuGet wraps the assembled package under bin\, so $(PkgDynamoVisualProgramming_DynamoAssistant)\bin IS
2251+
the package layout (pkg.json + bin\ + extra\). Copy it verbatim into Built-In Packages.
2252+
-->
2253+
<Target Name="BuildDynamoAssistantDynamoPackage" AfterTargets="Build">
2254+
<PropertyGroup>
2255+
<DynamoAssistantDestRoot>$(OutputPath)\Built-In Packages\packages\DynamoAssistant\</DynamoAssistantDestRoot>
2256+
</PropertyGroup>
2257+
<ItemGroup>
2258+
<DynamoAssistantPkg Include="$(PkgDynamoVisualProgramming_DynamoAssistant)\bin\**\*" />
2259+
</ItemGroup>
2260+
<Copy SourceFiles="@(DynamoAssistantPkg)" DestinationFolder="$(DynamoAssistantDestRoot)%(RecursiveDir)" SkipUnchangedFiles="True" />
2261+
</Target>
22372262
<Target Name="CopyPMWizardHtmlFiles" AfterTargets="Build">
22382263
<ItemGroup>
22392264
<HtmlAndBundleFiles Include="Packages\PackageManagerWizard\dist\index.html" />

test/DynamoCoreWpf2Tests/PackageManager/PackageManagerExtensionLoadingTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public void PackageManagerLoadsAndAddsViewExtension()
6060
Is.EquivalentTo(
6161
new List<string>
6262
{
63+
"Autodesk Assistant",
6364
"Documentation Browser",
6465
"Dynamo MCP View Extension",
6566
"DynamoManipulationExtension",

test/DynamoCoreWpf2Tests/PackageManager/PackageManagerUITests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class PackageManagerUITests : SystemTestBase
3838

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

41-
internal int ExpectedNumberOfBuiltInPackages { get { return 3; } }
41+
internal int ExpectedNumberOfBuiltInPackages { get { return 4; } }
4242

4343
#region Utility functions
4444

test/DynamoCoreWpf2Tests/PackageManager/PackageManagerViewExtensionTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public void PackageManagerLoadsRuntimeGeneratedExtension()
159159
public void PackageManagerViewExtensionHasCorrectNumberOfRequestedExtensions()
160160
{
161161
var pkgViewExtension = View.viewExtensionManager.ViewExtensions.OfType<PackageManagerViewExtension>().FirstOrDefault();
162-
Assert.AreEqual(pkgViewExtension.RequestedExtensions.Count(), 3);
162+
Assert.AreEqual(pkgViewExtension.RequestedExtensions.Count(), 4);
163163
}
164164

165165
[Test]
@@ -208,7 +208,7 @@ public void LateLoadedViewExtensionsHaveMethodsCalled()
208208
var pkg = loader.ScanPackageDirectory(pkgDir);
209209
loader.LoadPackages(new List<Package> { pkg });
210210
Assert.AreEqual(1, loader.RequestedExtensions.Count());
211-
Assert.AreEqual(4, View.viewExtensionManager.ViewExtensions.OfType<PackageManagerViewExtension>().FirstOrDefault().RequestedExtensions.Count());
211+
Assert.AreEqual(5, View.viewExtensionManager.ViewExtensions.OfType<PackageManagerViewExtension>().FirstOrDefault().RequestedExtensions.Count());
212212
Assert.IsTrue(viewExtensionLoadStart);
213213
Assert.IsTrue(viewExtensionAdd);
214214
Assert.IsTrue(viewExtensionLoaded);

0 commit comments

Comments
 (0)