Skip to content

Commit 62c0c33

Browse files
pinzart90pinzart
pinzart90
and
pinzart
authored
update for the Dynamo 3.0 release (#50)
* update * update * update * update * Create Setup.cs * update trace * Update PeriodicUpdateExample.cs * update * Update Setup.cs * update * update --------- Co-authored-by: pinzart <[email protected]>
1 parent a8d5e57 commit 62c0c33

28 files changed

+297
-1147
lines changed

‎.github/dependabot.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
2+
3+
version: 2
4+
updates:
5+
- package-ecosystem: "github-actions"
6+
directory: ".github/workflows"
7+
schedule:
8+
interval: "weekly"

‎.github/workflows/build_dynamo_samples_net8.0.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# Build DynamoAll.sln with .NET 8.0
2+
name: Build DynamoSamples.sln net8.0
3+
4+
on:
5+
push:
6+
branches:
7+
- master
8+
pull_request:
9+
10+
jobs:
11+
build:
12+
runs-on: windows-latest
13+
steps:
14+
- name: Checkout DynamoSamples Repo
15+
uses: actions/checkout@v4
16+
with:
17+
path: DynamoSamples
18+
repository: DynamoDS/DynamoSamples
19+
- name: Setup dotnet
20+
uses: actions/setup-dotnet@v4
21+
with:
22+
dotnet-version: '8.0.x'
23+
- name: Disable problem matcher
24+
run: echo "::remove-matcher owner=csc::"
25+
- name: Install dependencies for SampleIntegration
26+
run: |
27+
dotnet restore $Env:GITHUB_WORKSPACE\DynamoSamples\src\SampleIntegration\SampleIntegration.sln /p:Configuration=Release --runtime=win-x64
28+
- name: Build SampleIntegration with MSBuild for Windows
29+
run: |
30+
echo "***Continue with the build, Good luck developer!***"
31+
cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\"
32+
.\MSBuild.exe $Env:GITHUB_WORKSPACE\DynamoSamples\src\SampleIntegration\SampleIntegration.sln /p:Configuration=Release
33+
# look for DynamoSamples outputs
34+
- name: Navigate to SampleIntegration Folder
35+
run: |
36+
cd "$Env:GITHUB_WORKSPACE\DynamoSamples\src\SampleIntegration\bin\Release"
37+
echo "***Locating SampleIntegration.dll for Windows!***"
38+
test ".\SampleIntegration.dll" && echo "SampleIntegration.dll exists!"
39+
- name: Install dependencies for windows runtime
40+
run: |
41+
dotnet restore $Env:GITHUB_WORKSPACE\DynamoSamples\src\DynamoSamples.sln /p:Configuration=Release --runtime=win-x64
42+
- name: Build DynamoSamples with MSBuild for Windows
43+
run: |
44+
echo "***Continue with the build, Good luck developer!***"
45+
cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\"
46+
.\MSBuild.exe $Env:GITHUB_WORKSPACE\DynamoSamples\src\DynamoSamples.sln /p:Configuration=Release
47+
# look for DynamoSamples outputs
48+
- name: Navigate to dynamo_linter Folder
49+
run: |
50+
cd "$Env:GITHUB_WORKSPACE\DynamoSamples\dynamo_linter\Sample Linter\bin"
51+
echo "***Locating SampleLinter.dll for Windows!***"
52+
test ".\SampleLinter.dll" && echo "SampleLinter.dll exists!"
53+
- name: Navigate to dynamo_package Folder
54+
run: |
55+
cd "$Env:GITHUB_WORKSPACE\DynamoSamples\dynamo_package\Dynamo Samples\bin"
56+
echo "***Locating dynamo_package dlls for Windows!***"
57+
test ".\SampleLibraryUI.dll" && echo "SampleLibraryUI.dll exists!" && test ".\SampleLibraryZeroTouch.dll" && echo "SampleLibraryZeroTouch.dll exists!"
58+
- name: Navigate to dynamo_viewExtension Folder
59+
run: |
60+
cd "$Env:GITHUB_WORKSPACE\DynamoSamples\dynamo_viewExtension\Sample View Extension\bin"
61+
echo "***Locating SampleViewExtension.dll for Windows!***"
62+
test ".\SampleViewExtension.dll" && echo "SampleViewExtension.dll exists!"

‎appveyor.yml‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/Config/CS.props‎

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,42 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ImportGroup Label="PropertySheets" Condition=" Exists('$(SolutionDir)Config/user_local.props') ">
4-
<Import Project="$(SolutionDir)Config/user_local.props" />
5-
</ImportGroup>
1+
<Project>
62
<PropertyGroup>
7-
<DynamoCorePath Condition = "!Exists('$(DynamoCorePath)')">$(SolutionDir)\packages\DynamoVisualProgramming.Core.1.0.0-beta3\lib\net45</DynamoCorePath>
8-
<DynamoZeroTouchPath Condition = "!Exists('$(DynamoZeroTouchPath)')">$(SolutionDir)\packages\DynamoVisualProgramming.ZeroTouchLibrary.1.0.0-beta3\lib\net45</DynamoZeroTouchPath>
9-
<DynamoWpfUIPath Condition = "!Exists('$(DynamoWpfUIPath)')">$(SolutionDir)\packages\DynamoVisualProgramming.WpfUILibrary.1.0.0-beta4\lib\net45</DynamoWpfUIPath>
10-
<DynamoWpfUINodesPath Condition = "!Exists('$(DynamoWpfUINodesPath)')">$(DynamoWpfUIPath)</DynamoWpfUINodesPath>
11-
<DynamoServicesPath Condition = "!Exists('$(DynamoServicesPath)')">$(SolutionDir)\packages\DynamoVisualProgramming.DynamoServices.1.0.0-beta3\lib\net45</DynamoServicesPath>
12-
<DynamoTestPackagePath Condition = "!Exists('$(DynamoTestPackagePath)')">$(SolutionDir)\packages\DynamoVisualProgramming.Tests.1.0.0-beta4\lib\net45</DynamoTestPackagePath>
13-
</PropertyGroup>
14-
</Project>
3+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5+
<PlatformTarget >x64</PlatformTarget>
6+
<TargetFramework>net8.0</TargetFramework>
7+
<FileAlignment>512</FileAlignment>
8+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
9+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10+
<ErrorReport>prompt</ErrorReport>
11+
<WarningLevel>4</WarningLevel>
12+
<Prefer32Bit>false</Prefer32Bit>
13+
<UICulture>en-US</UICulture>
14+
<OutputType Condition=" '$(OutputType)' == '' ">Library</OutputType>
15+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
16+
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
17+
<DebugSymbols>true</DebugSymbols>
18+
<SelfContained>false</SelfContained>
19+
</PropertyGroup>
20+
<PropertyGroup>
21+
<DebugType>full</DebugType>
22+
</PropertyGroup>
23+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
24+
<DebugSymbols>true</DebugSymbols>
25+
<DebugType>full</DebugType>
26+
<Optimize>false</Optimize>
27+
<OutputPath>bin\Debug\</OutputPath>
28+
<DefineConstants>TRACE;DEBUG</DefineConstants>
29+
<ErrorReport>prompt</ErrorReport>
30+
<WarningLevel>4</WarningLevel>
31+
<Prefer32Bit>false</Prefer32Bit>
32+
</PropertyGroup>
33+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
34+
<DebugType>pdbonly</DebugType>
35+
<Optimize>true</Optimize>
36+
<OutputPath>bin\Release\</OutputPath>
37+
<DefineConstants>TRACE</DefineConstants>
38+
<ErrorReport>prompt</ErrorReport>
39+
<WarningLevel>4</WarningLevel>
40+
<Prefer32Bit>false</Prefer32Bit>
41+
</PropertyGroup>
42+
</Project>

‎src/SampleExtension/SampleExtension.csproj‎

Lines changed: 11 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -1,157 +1,21 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<ImportGroup Label="PropertySheets">
3+
<Import Project="$(SolutionDir)Config\CS.props" />
4+
</ImportGroup>
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{8B27B070-8434-49C8-8D43-41A4AE53BC36}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
107
<RootNamespace>SampleExtension</RootNamespace>
118
<AssemblyName>SampleExtension</AssemblyName>
12-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
9+
<!--EnableDynamicLoading prepares the project so that it can be used as a plugin -->
10+
<!--https://learn.microsoft.com/en-us/dotnet/core/tutorials/creating-app-with-plugin-support#simple-plugin-with-no-dependencies-->
11+
<EnableDynamicLoading>true</EnableDynamicLoading>
1512
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
<Prefer32Bit>false</Prefer32Bit>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
<Prefer32Bit>false</Prefer32Bit>
34-
</PropertyGroup>
35-
<ItemGroup>
36-
<Reference Include="CoreNodeModels, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\DynamoVisualProgramming.WpfUILibrary.2.12.0-beta4933\lib\net48\CoreNodeModels.dll</HintPath>
38-
</Reference>
39-
<Reference Include="CoreNodeModelsWpf, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\DynamoVisualProgramming.WpfUILibrary.2.12.0-beta4933\lib\net48\CoreNodeModelsWpf.dll</HintPath>
41-
</Reference>
42-
<Reference Include="DesignScriptBuiltin, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\DynamoVisualProgramming.Core.2.12.0-beta4933\lib\net48\DesignScriptBuiltin.dll</HintPath>
44-
</Reference>
45-
<Reference Include="DSCPython, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\DynamoVisualProgramming.Core.2.12.0-beta4933\lib\net48\DSCPython.dll</HintPath>
47-
</Reference>
48-
<Reference Include="DSIronPython, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\DynamoVisualProgramming.Core.2.12.0-beta4933\lib\net48\DSIronPython.dll</HintPath>
50-
</Reference>
51-
<Reference Include="DynamoApplications, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\DynamoVisualProgramming.Core.2.12.0-beta4933\lib\net48\DynamoApplications.dll</HintPath>
53-
</Reference>
54-
<Reference Include="DynamoCore, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\DynamoVisualProgramming.Core.2.12.0-beta4933\lib\net48\DynamoCore.dll</HintPath>
56-
</Reference>
57-
<Reference Include="DynamoCoreWpf, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
58-
<HintPath>..\packages\DynamoVisualProgramming.WpfUILibrary.2.12.0-beta4933\lib\net48\DynamoCoreWpf.dll</HintPath>
59-
</Reference>
60-
<Reference Include="DynamoInstallDetective, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
61-
<HintPath>..\packages\DynamoVisualProgramming.Core.2.12.0-beta4933\lib\net48\DynamoInstallDetective.dll</HintPath>
62-
</Reference>
63-
<Reference Include="DynamoServices, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
64-
<HintPath>..\packages\DynamoVisualProgramming.DynamoServices.2.12.0-beta4933\lib\net48\DynamoServices.dll</HintPath>
65-
</Reference>
66-
<Reference Include="DynamoShapeManager, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
67-
<HintPath>..\packages\DynamoVisualProgramming.Core.2.12.0-beta4933\lib\net48\DynamoShapeManager.dll</HintPath>
68-
</Reference>
69-
<Reference Include="DynamoUnits, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.12.0-beta4933\lib\net48\DynamoUnits.dll</HintPath>
71-
</Reference>
72-
<Reference Include="DynamoUtilities, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
73-
<HintPath>..\packages\DynamoVisualProgramming.Core.2.12.0-beta4933\lib\net48\DynamoUtilities.dll</HintPath>
74-
</Reference>
75-
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76-
<HintPath>..\packages\Prism.4.1.0.0\lib\NET40\Microsoft.Expression.Interactions.dll</HintPath>
77-
<Private>False</Private>
78-
</Reference>
79-
<Reference Include="Microsoft.Practices.Prism, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\packages\Prism.4.1.0.0\lib\NET40\Microsoft.Practices.Prism.dll</HintPath>
81-
<Private>False</Private>
82-
</Reference>
83-
<Reference Include="Microsoft.Practices.Prism.Interactivity, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84-
<HintPath>..\packages\Prism.4.1.0.0\lib\NET40\Microsoft.Practices.Prism.Interactivity.dll</HintPath>
85-
<Private>False</Private>
86-
</Reference>
87-
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88-
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
89-
</Reference>
90-
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
91-
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
92-
</Reference>
93-
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
94-
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
95-
<Private>False</Private>
96-
</Reference>
97-
<Reference Include="PresentationCore" />
98-
<Reference Include="PresentationFramework" />
99-
<Reference Include="ProtoCore, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
100-
<HintPath>..\packages\DynamoVisualProgramming.Core.2.12.0-beta4933\lib\net48\ProtoCore.dll</HintPath>
101-
</Reference>
102-
<Reference Include="ProtoGeometry, Version=2.12.0.4706, Culture=neutral, processorArchitecture=AMD64">
103-
<HintPath>..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.12.0-beta4933\lib\net48\ProtoGeometry.dll</HintPath>
104-
</Reference>
105-
<Reference Include="System" />
106-
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
107-
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
108-
</Reference>
109-
<Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
110-
<HintPath>..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
111-
</Reference>
112-
<Reference Include="System.Core" />
113-
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
114-
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
115-
</Reference>
116-
<Reference Include="System.Numerics" />
117-
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
118-
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
119-
</Reference>
120-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
121-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
122-
</Reference>
123-
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124-
<HintPath>..\packages\Prism.4.1.0.0\lib\NET40\System.Windows.Interactivity.dll</HintPath>
125-
<Private>False</Private>
126-
</Reference>
127-
<Reference Include="System.Xaml" />
128-
<Reference Include="System.Xml.Linq" />
129-
<Reference Include="System.Data.DataSetExtensions" />
130-
<Reference Include="Microsoft.CSharp" />
131-
<Reference Include="System.Data" />
132-
<Reference Include="System.Xml" />
133-
<Reference Include="VMDataBridge, Version=2.12.0.4933, Culture=neutral, processorArchitecture=MSIL">
134-
<HintPath>..\packages\DynamoVisualProgramming.Core.2.12.0-beta4933\lib\net48\VMDataBridge.dll</HintPath>
135-
</Reference>
136-
<Reference Include="WindowsBase" />
137-
</ItemGroup>
138-
<ItemGroup>
139-
<Compile Include="Extension.cs" />
140-
<Compile Include="Properties\AssemblyInfo.cs" />
141-
</ItemGroup>
14213
<ItemGroup>
143-
<None Include="app.config" />
144-
<None Include="packages.config" />
14+
<Content Include="SampleExtension_ExtensionDefinition.xml">
15+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
16+
</Content>
14517
</ItemGroup>
14618
<ItemGroup>
147-
<Content Include="SampleExtension_ExtensionDefinition.xml" />
19+
<PackageReference Include="DynamoVisualProgramming.Core" Version="3.1.0-beta3755" ExcludeAssets="runtime" />
14820
</ItemGroup>
149-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
150-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
151-
Other similar extension points exist, see Microsoft.Common.targets.
152-
<Target Name="BeforeBuild">
153-
</Target>
154-
<Target Name="AfterBuild">
155-
</Target>
156-
-->
15721
</Project>

‎src/SampleExtension/app.config‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/SampleExtension/packages.config‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)