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.

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 for the Dynamo 3.0 release #50

Merged
merged 11 commits into from
Jan 11, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
update
pinzart90 committed Jan 8, 2024
commit d8c00b9a3c4a7077679dd8952b60ccbafc382e55
8 changes: 4 additions & 4 deletions .github/workflows/build_dynamo_samples_net8.0.yml
Original file line number Diff line number Diff line change
@@ -24,12 +24,12 @@ jobs:
run: echo "::remove-matcher owner=csc::"
- name: Install dependencies for SampleIntegration
run: |
dotnet restore $Env:GITHUB_WORKSPACE\DynamoSamples\src\SampleIntegration\SampleIntegration.sln /p:Configuration=Release --runtime=win-x64 -p:DotNet=net8.0
dotnet restore $Env:GITHUB_WORKSPACE\DynamoSamples\src\SampleIntegration\SampleIntegration.sln /p:Configuration=Release --runtime=win-x64
- name: Build SampleIntegration with MSBuild for Windows
run: |
echo "***Continue with the build, Good luck developer!***"
cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\"
.\MSBuild.exe $Env:GITHUB_WORKSPACE\DynamoSamples\src\SampleIntegration\SampleIntegration.sln /p:Configuration=Release /p:DotNet=net8.0
.\MSBuild.exe $Env:GITHUB_WORKSPACE\DynamoSamples\src\SampleIntegration\SampleIntegration.sln /p:Configuration=Release
# look for DynamoSamples outputs
- name: Navigate to SampleIntegration Folder
run: |
@@ -38,12 +38,12 @@ jobs:
test ".\SampleIntegration.dll" && echo "SampleIntegration.dll exists!"
- name: Install dependencies for windows runtime
run: |
dotnet restore $Env:GITHUB_WORKSPACE\DynamoSamples\src\DynamoSamples.sln /p:Configuration=Release --runtime=win-x64 -p:DotNet=net8.0
dotnet restore $Env:GITHUB_WORKSPACE\DynamoSamples\src\DynamoSamples.sln /p:Configuration=Release --runtime=win-x64
- name: Build DynamoSamples with MSBuild for Windows
run: |
echo "***Continue with the build, Good luck developer!***"
cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\"
.\MSBuild.exe $Env:GITHUB_WORKSPACE\DynamoSamples\src\DynamoSamples.sln /p:Configuration=Release /p:DotNet=net8.0
.\MSBuild.exe $Env:GITHUB_WORKSPACE\DynamoSamples\src\DynamoSamples.sln /p:Configuration=Release
# look for DynamoSamples outputs
- name: Navigate to dynamo_linter Folder
run: |
4 changes: 1 addition & 3 deletions src/Config/CS.props
Original file line number Diff line number Diff line change
@@ -3,10 +3,8 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<PlatformTarget >x64</PlatformTarget>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">16.0</VisualStudioVersion>
<TargetFramework>net8.0</TargetFramework>
<FileAlignment>512</FileAlignment>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<ErrorReport>prompt</ErrorReport>
@@ -21,7 +19,7 @@
</PropertyGroup>
<PropertyGroup>
<DebugType>full</DebugType>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
4 changes: 3 additions & 1 deletion src/SampleExtension/SampleExtension.csproj
Original file line number Diff line number Diff line change
@@ -6,6 +6,8 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<RootNamespace>SampleExtension</RootNamespace>
<AssemblyName>SampleExtension</AssemblyName>
<!--EnableDynamicLoading prepares the project so that it can be used as a plugin -->
<!--https://learn.microsoft.com/en-us/dotnet/core/tutorials/creating-app-with-plugin-support#simple-plugin-with-no-dependencies-->
<EnableDynamicLoading>true</EnableDynamicLoading>
Copy link
Member

Choose a reason for hiding this comment

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

because this is a sample and this is a pretty rare property, maybe add a comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

</PropertyGroup>
<ItemGroup>
@@ -14,6 +16,6 @@
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.Core" Version="3.0.0-beta7064" />
<PackageReference Include="DynamoVisualProgramming.Core" Version="3.0.0-beta7064" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/SampleLibraryTests/SampleLibraryTests.csproj
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<RootNamespace>SampleLibraryTests</RootNamespace>
<AssemblyName>SampleLibraryTests</AssemblyName>
<!--Windows and WPF APIs are needed to support dynamo UI libs-->
<TargetFramework>net8.0-windows</TargetFramework>
Copy link
Member

Choose a reason for hiding this comment

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

I think these are worth adding comments for so that sample users don't blindly add these to their repos if they don't need them.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

<UICulture>en-US</UICulture>
<UseWPF>true</UseWPF>
</PropertyGroup>
<ItemGroup>
@@ -16,6 +16,6 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.Tests" Version="1.0.0" />
<PackageReference Include="DynamoVisualProgramming.Tests" Version="0.0.1" />
</ItemGroup>
</Project>
11 changes: 7 additions & 4 deletions src/SampleLibraryUI/SampleLibraryUI.csproj
Original file line number Diff line number Diff line change
@@ -5,9 +5,12 @@
<PropertyGroup>
<RootNamespace>SampleLibraryUI</RootNamespace>
<AssemblyName>SampleLibraryUI</AssemblyName>
<!--Windows and WPF APIs are needed to support dynamo UI libs-->
<TargetFramework>net8.0-windows</TargetFramework>
Copy link
Member

Choose a reason for hiding this comment

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

yada yada, this is a UI project that references wpf so add these properties

<UseWPF>true</UseWPF>
<UICulture>en-US</UICulture>
<!--EnableDynamicLoading prepares the project so that it can be used as a plugin -->
<!--https://learn.microsoft.com/en-us/dotnet/core/tutorials/creating-app-with-plugin-support#simple-plugin-with-no-dependencies-->
<EnableDynamicLoading>true</EnableDynamicLoading>
<DocumentationFile>bin\$(Configuration)\$(UICulture)\SampleLibraryUI.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
@@ -21,9 +24,9 @@
<Content Include="images\logo.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.DynamoServices" Version="3.0.0-beta7064" />
<PackageReference Include="DynamoVisualProgramming.WpfUILibrary" Version="3.0.0-beta7064" />
<PackageReference Include="DynamoVisualProgramming.ZeroTouchLibrary" Version="3.0.0-beta7064" />
<PackageReference Include="DynamoVisualProgramming.DynamoServices" Version="3.0.0-beta7064" ExcludeAssets="runtime" />
<PackageReference Include="DynamoVisualProgramming.WpfUILibrary" Version="3.0.0-beta7064" ExcludeAssets="runtime" />
<PackageReference Include="DynamoVisualProgramming.ZeroTouchLibrary" Version="3.0.0-beta7064" ExcludeAssets="runtime" />
</ItemGroup>
<Target Name="AfterBuildOps" AfterTargets="Build">
<ItemGroup>
9 changes: 6 additions & 3 deletions src/SampleLibraryZeroTouch/SampleLibraryZeroTouch.csproj
Original file line number Diff line number Diff line change
@@ -6,12 +6,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SampleLibraryZeroTouch</RootNamespace>
<AssemblyName>SampleLibraryZeroTouch</AssemblyName>
<!--EnableDynamicLoading prepares the project so that it can be used as a plugin -->
<!--https://learn.microsoft.com/en-us/dotnet/core/tutorials/creating-app-with-plugin-support#simple-plugin-with-no-dependencies-->
<EnableDynamicLoading>true</EnableDynamicLoading>
<DocumentationFile>bin\$(Configuration)\SampleLibraryZeroTouch.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.Core" Version="3.0.0-beta7064" />
<PackageReference Include="DynamoVisualProgramming.DynamoServices" Version="3.0.0-beta7064" />
<PackageReference Include="DynamoVisualProgramming.ZeroTouchLibrary" Version="3.0.0-beta7064" />
<PackageReference Include="DynamoVisualProgramming.Core" Version="3.0.0-beta7064" ExcludeAssets="runtime" />
<PackageReference Include="DynamoVisualProgramming.DynamoServices" Version="3.0.0-beta7064" ExcludeAssets="runtime" />
<PackageReference Include="DynamoVisualProgramming.ZeroTouchLibrary" Version="3.0.0-beta7064" ExcludeAssets="runtime" />
</ItemGroup>
<Target Name="AfterBuildOps" AfterTargets="Build">
<Message Text="Should run after build" Importance="High" />
9 changes: 6 additions & 3 deletions src/SampleLinter/SampleLinter.csproj
Original file line number Diff line number Diff line change
@@ -8,12 +8,15 @@
<Copyright>Copyright © 2023</Copyright>
<AssemblyVersion>2.0.1.0</AssemblyVersion>
<FileVersion>2.0.1.0</FileVersion>
<!--EnableDynamicLoading prepares the project so that it can be used as a plugin -->
<!--https://learn.microsoft.com/en-us/dotnet/core/tutorials/creating-app-with-plugin-support#simple-plugin-with-no-dependencies-->
<EnableDynamicLoading>true</EnableDynamicLoading>
<OutputPath>bin\$(Configuration)\</OutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.DynamoServices" Version="3.0.0-beta7064" />
<PackageReference Include="DynamoVisualProgramming.WpfUILibrary" Version="3.0.0-beta7064" />
<PackageReference Include="DynamoVisualProgramming.ZeroTouchLibrary" Version="3.0.0-beta7064" />
<PackageReference Include="DynamoVisualProgramming.DynamoServices" Version="3.0.0-beta7064" ExcludeAssets="runtime" />
<PackageReference Include="DynamoVisualProgramming.WpfUILibrary" Version="3.0.0-beta7064" ExcludeAssets="runtime" />
<PackageReference Include="DynamoVisualProgramming.ZeroTouchLibrary" Version="3.0.0-beta7064" ExcludeAssets="runtime" />
</ItemGroup>
<ItemGroup>
<None Update="LinterSettings.xml">
1 change: 1 addition & 0 deletions src/SampleViewExtension/SampleViewExtension.csproj
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
<PropertyGroup>
<RootNamespace>SampleViewExtension</RootNamespace>
<AssemblyName>SampleViewExtension</AssemblyName>
<!--Windows and WPF APIs are needed to support dynamo UI extensions-->
<TargetFramework>net8.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
</PropertyGroup>