Skip to content
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

update libg #13804

Merged
merged 8 commits into from
Mar 9, 2023
Merged

update libg #13804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c39cec6
update libg
pinzart Mar 7, 2023
897cdce
Update DynamoCore.csproj
pinzart Mar 7, 2023
785a7a8
Update DynamoCore.csproj
pinzart Mar 7, 2023
dd715d7
Update DynamoCore.csproj
pinzart Mar 8, 2023
81f6bfa
update
pinzart Mar 8, 2023
2b4d1db
Update DynamoCore.csproj
pinzart Mar 8, 2023
4724564
update
pinzart Mar 8, 2023
4cf2d7e
Update Utilities.cs
pinzart Mar 8, 2023
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
24 changes: 16 additions & 8 deletions src/DynamoCore/DynamoCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<AssemblyName>DynamoCore</AssemblyName>
<UseVSHostingProcess>false</UseVSHostingProcess>
<DocumentationFile>$(OutputPath)\DynamoCore.XML</DocumentationFile>
<LibGOsToken>windows</LibGOsToken>
<LibGOsToken Condition="$(Platform.Contains('Linux'))">linux</LibGOsToken>
</PropertyGroup>
<PropertyGroup Condition=" '$(ExecutionEngine)' != 'FScheme' ">
<DefineConstants>$(DefineConstants);USE_DSENGINE</DefineConstants>
Expand All @@ -29,8 +31,8 @@
<ItemGroup Label="Common dependencies">
<PackageReference Include="Autodesk.IDSDK" Version="1.1.6" />
<PackageReference Include="DynamoVisualProgramming.Analytics" Version="3.0.0.2506" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967" GeneratePathProperty="true"/>
<PackageReference Include="DynamoVisualProgramming.LibG_228_0_0" Version="2.17.1.3967" GeneratePathProperty="true"/>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665" GeneratePathProperty="true"/>
<PackageReference Include="DynamoVisualProgramming.LibG_228_0_0" Version="2.18.0.665" GeneratePathProperty="true"/>
<PackageReference Include="Greg" Version="2.3.0.2505" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
<PackageReference Include="RestSharp" Version="106.12.0" CopyXML="true" />
Expand Down Expand Up @@ -122,14 +124,17 @@
</Choose>
<Target Name="BeforeBuildOps" BeforeTargets="Build">
<PropertyGroup>
<LibGProtoGeometryLibGLocale>$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\libg_locale</LibGProtoGeometryLibGLocale>
<LibGProtoGeometryLibGLocale>$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\libg_locale</LibGProtoGeometryLibGLocale>
</PropertyGroup>
<ItemGroup>
<LibGInterface Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\LibG.Interface.dll" />
<LibGProtoGeometryXml Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\lib\netstandard2.0\ProtoGeometry.XML" />
Copy link
Member

Choose a reason for hiding this comment

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

was the package layout modified?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes
I had to add both windows and linux flavors of all binaries (including managed)

<LibGProtoGeometryUICulture Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(UICulture)\*" />
<LibG228 Include="$(PkgDynamoVisualProgramming_LibG_228_0_0)\tools\netstandard2.0\LibG_228_0_0\*" />
<LibG229 Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\LibG_229_0_0\*" />
<LibGInterface Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG.Interface.dll" />
<LibGProtoGeometryDLL Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.dll" />
<LibGProtoGeometryXML Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.XML" />
<LibG229Deps Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
<LibG228Deps Include="$(PkgDynamoVisualProgramming_LibG_228_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
<LibGProtoGeometryUICulture Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\$(UICulture)\*" />
<LibG228 Include="$(PkgDynamoVisualProgramming_LibG_228_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_228_0_0\*" />
<LibG229 Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_229_0_0\*" />
<ExternSimplexNoise Include="$(SolutionDir)..\extern\SimplexNoise\*" />
<SampleFiles Include="$(SolutionDir)..\doc\distrib\Samples\**\*.*" />
<NodeHelpFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.*" />
Expand All @@ -147,9 +152,12 @@
<Copy SourceFiles="@(NodeHelpFiles)" DestinationFolder="$(OutputPath)\en-US\fallback_docs\" />
<Copy SourceFiles="@(OpenSourceLicenses)" DestinationFolder="$(OutputPath)Open Source Licenses\" />
<Copy SourceFiles="@(LibGInterface)" DestinationFolder="$(OutputPath)" />
<Copy SourceFiles="@(LibGProtoGeometryDLL)" DestinationFolder="$(OutputPath)" />
<Copy SourceFiles="@(LibGProtoGeometryXml)" DestinationFolder="$(OutputPath)" />
<Copy SourceFiles="@(LibGProtoGeometryXml)" DestinationFolder="$(OutputPath)\$(UICulture)" />
<Copy SourceFiles="@(LibGProtoGeometryUICulture)" DestinationFolder="$(OutputPath)\$(UICulture)" />
<Copy Condition="$(Platform.Contains('Linux'))" SourceFiles="@(LibG229Deps)" DestinationFolder="$(OutputPath)libg_228_0_0\asm_deps\" />
Copy link
Member

Choose a reason for hiding this comment

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

@annabunches FYI

<Copy Condition="$(Platform.Contains('Linux'))" SourceFiles="@(LibG228Deps)" DestinationFolder="$(OutputPath)libg_229_0_0\asm_deps\" />
<Exec Command="$(PowerShellCommand) -ExecutionPolicy ByPass -Command Copy-Item -Path $(LibGProtoGeometryLibGLocale) -Destination $(OutputPath) -Recurse -Force" />
<Copy SourceFiles="@(LibG228)" DestinationFolder="$(OutputPath)libg_228_0_0\" />
<Copy SourceFiles="@(LibG229)" DestinationFolder="$(OutputPath)libg_229_0_0\" />
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoCoreWpf/DynamoCoreWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<None Remove="Views\GuidedTour\HtmlPages\Resources\ConnectTheNode.gif" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665" />
<PackageReference Include="AvalonEdit" Version="4.3.1.9430" CopyXML="true" />
<PackageReference Include="Greg" Version="2.3.0.2505" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoManipulation/DynamoManipulation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967"/>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665"/>
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/Analysis/Analysis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<None Remove="AnalysisImages.resources" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967"/>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665"/>
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
<Project>{7858fa8c-475f-4b8e-b468-1f8200778cf8}</Project>
<Name>DynamoCore</Name>
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/CoreNodes/CoreNodes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<PackageReference Include="CoreCLR-NCalc" Version="2.2.92" />
</ItemGroup>
<ItemGroup Label="Common dependencies">
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967"/>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/GeometryColor/GeometryColor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<DocumentationFile>$(OutputPath)\$(UICulture)\GeometryColor.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967"/>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/GeometryUI/GeometryUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ReferenceCopyLocalPaths>
</ItemDefinitionGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967"/>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665"/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ReferenceCopyLocalPaths>
</ItemDefinitionGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Xaml" />
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/Tesellation/Tessellation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<DocumentationFile>$(OutputPath)\$(UICulture)\Tessellation.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967"/>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665"/>
<PackageReference Include="MIConvexHull" version="1.1.17.0411" CopyPDB="true" />
<PackageReference Include="StarMath" version="2.0.14.1114" CopyPDB="true" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967"/>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665"/>
<PackageReference Include="Greg" Version="2.3.0.2505" />
<PackageReference Include="Magick.NET.Core" Version="7.0.1" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="7.24.1" />
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/AnalysisTests/AnalysisTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="2.6.3" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967"/>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665"/>
<PackageReference Include="NUnitTestAdapter" Version="2.3.0" ExcludeAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/CoreNodesTests/CoreNodesTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="Moq" Version="4.18.4"/>
<PackageReference Include="NUnit" Version="2.6.3" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967"/>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665"/>
<PackageReference Include="NUnitTestAdapter" Version="2.3.0" ExcludeAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="AvalonEdit" Version="4.3.1.9430" />
<PackageReference Include="NUnit" Version="2.6.3" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665" />
<PackageReference Include="DynamicLanguageRuntime" Version="1.2.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NUnitTestAdapter" Version="2.3.0" ExcludeAssets="all" />
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/GeometryColorTests/GeometryColorTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="2.6.3" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967"/>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665"/>
<PackageReference Include="NUnitTestAdapter" Version="2.3.0" ExcludeAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/IronPythonTests/IronPythonTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="AvalonEdit" Version="4.3.1.9430" />
<PackageReference Include="NUnit" Version="2.6.3" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967"/>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665"/>
<PackageReference Include="DynamicLanguageRuntime" Version="1.2.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="IronPython" Version="2.7.9" />
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/TestServices/TestServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="NUnit" Version="3.13.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967"/>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665"/>


<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/WorkflowTests/WorkflowTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="2.6.3" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.665" />
<PackageReference Include="NUnitTestAdapter" Version="2.3.0" ExcludeAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<Reference Include="System" />
Expand Down