Skip to content

Add NET_OSX (osx-arm64) build target for DynamoCLI #17253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
saintentropy wants to merge 1 commit into
base: master
Choose a base branch
from
+315 −5
Open

Add NET_OSX (osx-arm64) build target for DynamoCLI #17253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions src/Config/CS_SDK.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Platforms>AnyCPU;NET_Linux;Publish_Linux;</Platforms>
<Platforms>AnyCPU;NET_Linux;Publish_Linux;NET_OSX;Publish_OSX;</Platforms>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<PlatformTarget >x64</PlatformTarget>
Expand Down Expand Up @@ -35,11 +35,11 @@
<DebugSymbols>true</DebugSymbols>
<SelfContained>false</SelfContained>
</PropertyGroup>
<!--generate windows pdbs on windows and portable pdbs for linux builds - CER currently does not support portable-->
<PropertyGroup Condition="!$(Platform.Contains('Linux'))">
<!--generate windows pdbs on windows and portable pdbs for linux/osx builds - CER currently does not support portable-->
<PropertyGroup Condition="!$(Platform.Contains('Linux')) AND !$(Platform.Contains('OSX'))">
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition="$(Platform.Contains('Linux'))" >
<PropertyGroup Condition="$(Platform.Contains('Linux')) OR $(Platform.Contains('OSX'))" >
<DebugType>portable</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug' ">
Expand All @@ -63,6 +63,13 @@
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<DefineConstants>$(DefineConstants);_LINUX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(Platform.Contains('OSX'))" >
<RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
<DefineConstants>$(DefineConstants);_OSX</DefineConstants>
<!--Base PlatformTarget is x64; override to AnyCPU so it is compatible with the osx-arm64 RID
(NETSDK1032) and stays processor-agnostic for the x64-built package references.-->
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(UILib)' == 'true' AND $(RuntimeIdentifier.Contains('win'))">
<TargetFramework>$(TargetFramework)-windows</TargetFramework>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoApplications/StartupUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@
{
throw new FileNotFoundException($"{nameof(asmPath)}:{asmPath}");
}
Version asmBinariesVersion = DynamoShapeManager.Utilities.GetVersionFromPath(asmPath, OSHelper.IsWindows() ? "*ASMAHL*.dll" : "*ASMahl*.so");
Version asmBinariesVersion = DynamoShapeManager.Utilities.GetVersionFromPath(asmPath, OSHelper.IsWindows() ? "*ASMAHL*.dll" : OperatingSystem.IsMacOS() ? "*ASMahl*.dylib" : "*ASMahl*.so");

Check warning on line 401 in src/DynamoApplications/StartupUtils.cs

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract this nested ternary operation into an independent statement. 


See more on https://sonarcloud.io/project/issues?id=DynamoDS_Dynamo&issues=AZ-pX7XoGYV1PN-QeX8V&open=AZ-pX7XoGYV1PN-QeX8V&pullRequest=17253

//get version of libG that matches the asm version that was supplied from geometryLibraryPath.
preloaderLocation = DynamoShapeManager.Utilities.GetLibGPreloaderLocation(asmBinariesVersion, rootFolder);
Expand Down
Loading
Loading