Skip to content

Commit f3ca98b

Browse files
dnenovzeusongit
dnenov
and
zeusongit
authored
DYN-9195: Net 10.0 update (#67)
* add node icon example - adding a simple icon to a node to demonstrate the 8.0 workflow to contrast and show a fix when introducing 10.0 * image to png update - now the image is added as a File and in .png format - this alone works in order to correctly provide the icon to Dynamo * .net 10.0 upgrade - updated all projects to target .net 10.0 - updated workflow yaml - updated readme reference to dotnet * add icon resources to build directory - add customisation.dll file to the build output directory * revert formatting changes * nuget update - updated nuget package references * nugets bump to 2685 * remove redundant file * removed resource custom tool * Update build.yml * update to nugs, yml - update the dotnet-version: "10.0.100-preview.5.25277.114" - update to latest nugets --------- Co-authored-by: Ashish Aggarwal <[email protected]>
1 parent bc05df0 commit f3ca98b

File tree

15 files changed

+360
-137
lines changed

15 files changed

+360
-137
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Build SampleIntegration.sln and DynamoSamples.sln with .NET 8.0
1+
# Build SampleIntegration.sln and DynamoSamples.sln with .NET 10.0
22
name: Build
33

44
on:
@@ -12,14 +12,14 @@ jobs:
1212
runs-on: windows-latest
1313
steps:
1414
- name: Checkout DynamoSamples Repo
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616
with:
1717
path: DynamoSamples
1818
repository: DynamoDS/DynamoSamples
1919
- name: Setup dotnet
20-
uses: actions/setup-dotnet@v4
20+
uses: actions/setup-dotnet@v5
2121
with:
22-
dotnet-version: '8.0.x'
22+
dotnet-version: "10.0.100-preview.5.25277.114"
2323
- name: Disable problem matcher
2424
run: echo "::remove-matcher owner=csc::"
2525
- name: Setup msbuild
@@ -66,7 +66,7 @@ jobs:
6666
ls
6767
- name: Extract DynamoRuntime
6868
run: |
69-
7z x DynamoRuntime.zip -o${{ github.workspace }}\DynamoSamples\src\SampleLibraryTests\bin\Release\DynamoRuntime
69+
7z x DynamoRuntime.zip -o${{ github.workspace }}\DynamoSamples\src\SampleLibraryTests\bin\Release\DynamoRuntime
7070
7171
- name: Run test with the dotnet CLI
7272
run: |

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ These samples make use of the [Dynamo NuGet packages](https://www.nuget.org/pack
1313
## Requirements
1414

1515
- Visual Studio 2022
16-
- .NET8
16+
- .NET 10.0
1717

1818
## Instructions
1919

‎src/SampleExtension/SampleExtension.csproj‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<ImportGroup Label="PropertySheets">
3-
<Import Project="$(SolutionDir)Config\CS.props" />
4-
</ImportGroup>
5-
<PropertyGroup>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<RootNamespace>SampleExtension</RootNamespace>
8-
<AssemblyName>SampleExtension</AssemblyName>
9-
<TargetFramework>net8.0</TargetFramework>
10-
<!--EnableDynamicLoading prepares the project so that it can be used as a plugin -->
11-
<!--https://learn.microsoft.com/en-us/dotnet/core/tutorials/creating-app-with-plugin-support#simple-plugin-with-no-dependencies-->
12-
<EnableDynamicLoading>true</EnableDynamicLoading>
13-
</PropertyGroup>
14-
<ItemGroup>
15-
<Content Include="SampleExtension_ExtensionDefinition.xml">
16-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
17-
</Content>
18-
</ItemGroup>
19-
<ItemGroup>
20-
<PackageReference Include="DynamoVisualProgramming.Core" Version="3.1.0-beta4081" ExcludeAssets="runtime" />
21-
</ItemGroup>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<ImportGroup Label="PropertySheets">
3+
<Import Project="$(SolutionDir)Config\CS.props" />
4+
</ImportGroup>
5+
<PropertyGroup>
6+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7+
<RootNamespace>SampleExtension</RootNamespace>
8+
<AssemblyName>SampleExtension</AssemblyName>
9+
<TargetFramework>net10.0</TargetFramework>
10+
<!--EnableDynamicLoading prepares the project so that it can be used as a plugin -->
11+
<!--https://learn.microsoft.com/en-us/dotnet/core/tutorials/creating-app-with-plugin-support#simple-plugin-with-no-dependencies-->
12+
<EnableDynamicLoading>true</EnableDynamicLoading>
13+
</PropertyGroup>
14+
<ItemGroup>
15+
<Content Include="SampleExtension_ExtensionDefinition.xml">
16+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
17+
</Content>
18+
</ItemGroup>
19+
<ItemGroup>
20+
<PackageReference Include="DynamoVisualProgramming.Core" Version="4.0.0-beta2860" ExcludeAssets="runtime" />
21+
</ItemGroup>
2222
</Project>

‎src/SampleIntegration/SampleIntegration.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<PropertyGroup>
66
<RootNamespace>SampleIntegration</RootNamespace>
77
<AssemblyName>SampleIntegration</AssemblyName>
8-
<TargetFramework>net8.0</TargetFramework>
8+
<TargetFramework>net10.0</TargetFramework>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<PackageReference Include="DynamoVisualProgramming.Core" Version="3.0.0-beta7064" />
11+
<PackageReference Include="DynamoVisualProgramming.Core" Version="4.0.0-beta2860" />
1212
</ItemGroup>
1313
</Project>

‎src/SampleLibraryTests/SampleLibraryTests.csproj‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<ImportGroup Label="PropertySheets">
3-
<Import Project="$(SolutionDir)Config\CS.props" />
4-
</ImportGroup>
5-
<PropertyGroup>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<RootNamespace>SampleLibraryTests</RootNamespace>
8-
<AssemblyName>SampleLibraryTests</AssemblyName>
9-
<!--Windows and WPF APIs are needed to support dynamo UI libs-->
10-
<TargetFramework>net8.0-windows</TargetFramework>
11-
<UseWPF>true</UseWPF>
12-
</PropertyGroup>
13-
<ItemGroup>
14-
<None Include="HelloDynamoSystemTest.dyn">
15-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
16-
</None>
17-
<None Include="RectangleUnitsExample.dyn">
18-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
19-
</None>
20-
<None Update="TestServices.dll.config">
21-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
22-
</None>
23-
</ItemGroup>
24-
<ItemGroup>
25-
<PackageReference Include="DynamoVisualProgramming.Tests" Version="3.1.0-beta4081" />
26-
<PackageReference Include="DynamoVisualProgramming.DynamoCoreNodes" Version="3.1.0-beta4081" ExcludeAssets="runtime" />
27-
</ItemGroup>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<ImportGroup Label="PropertySheets">
3+
<Import Project="$(SolutionDir)Config\CS.props" />
4+
</ImportGroup>
5+
<PropertyGroup>
6+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7+
<RootNamespace>SampleLibraryTests</RootNamespace>
8+
<AssemblyName>SampleLibraryTests</AssemblyName>
9+
<!--Windows and WPF APIs are needed to support dynamo UI libs-->
10+
<TargetFramework>net10.0-windows</TargetFramework>
11+
<UseWPF>true</UseWPF>
12+
</PropertyGroup>
13+
<ItemGroup>
14+
<None Include="HelloDynamoSystemTest.dyn">
15+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
16+
</None>
17+
<None Include="RectangleUnitsExample.dyn">
18+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
19+
</None>
20+
<None Update="TestServices.dll.config">
21+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
22+
</None>
23+
</ItemGroup>
24+
<ItemGroup>
25+
<PackageReference Include="DynamoVisualProgramming.Tests" Version="4.0.0-beta2860" />
26+
<PackageReference Include="DynamoVisualProgramming.DynamoCoreNodes" Version="4.0.0-beta2860" ExcludeAssets="runtime" />
27+
</ItemGroup>
2828
</Project>

‎src/SampleLibraryUI/Resources/LargeIcons/SampleLibraryUI.Examples.DropDownExample.Large.png‎

950 Bytes
Loading

‎src/SampleLibraryUI/Resources/SampleLibraryUI.Designer.cs‎

Lines changed: 83 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/SampleLibraryUI/Resources/SampleLibraryUI.resx‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="SampleLibraryUI.Examples.DropDownExample.Large" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>.\LargeIcons\SampleLibraryUI.Examples.DropDownExample.Large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
123+
</data>
124+
<data name="SampleLibraryUI.Examples.DropDownExample.Small" type="System.Resources.ResXFileRef, System.Windows.Forms">
125+
<value>.\SmallIcons\SampleLibraryUI.Examples.DropDownExample.Small.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
126+
</data>
127+
</root>

‎src/SampleLibraryUI/Resources/SampleLibraryUIImages.resources‎

1.74 KB
Binary file not shown.

‎src/SampleLibraryUI/Resources/SmallIcons/SampleLibraryUI.Examples.DropDownExample.Small.png‎

431 Bytes
Loading

0 commit comments

Comments
 (0)