Skip to content

Commit

Permalink
Merge branch 'master' into DYN-6009-Extended-Node-Help-Missing3
Browse files Browse the repository at this point in the history
  • Loading branch information
QilongTang authored Nov 2, 2023
2 parents 813e7f3 + 98d3097 commit 52a71c0
Show file tree
Hide file tree
Showing 17 changed files with 34 additions and 21 deletions.
19 changes: 16 additions & 3 deletions .github/workflows/check_file_size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,21 @@ jobs:
- name: Get changed files
id: get_changed_files
uses: tj-actions/changed-files@v40
with:
write_output_files: true
- name: List changed files
run: |
echo "# Changed Files" >> $GITHUB_STEP_SUMMARY
echo "Files changed - ${{ steps.get_changed_files.outputs.all_changed_files_count }}" >> $GITHUB_STEP_SUMMARY
echo "| File | Size | Check |" >> $GITHUB_STEP_SUMMARY
echo "| :-- | :-- | :-- |" >> $GITHUB_STEP_SUMMARY
for file in $(cat .github/outputs/all_changed_files.txt); do
size=$(ls -lh ${file} | awk '{print $5}')
check=$([[ -n $(find "${file}" -type f -size +50M) ]] && echo "❌" || echo "✅")
echo "| ${file} | ${size} | ${check} |" >> $GITHUB_STEP_SUMMARY
done
- name: Check file size
run: |
for file in ${{ steps.get_changed_files.outputs.all_changed_files }}; do
[[ -n $(find ${file} -type f -size +50M) ]] && { echo "❌ $file exceeds file size limit"; exit 1; } || echo "✅ $file"
done
for file in $(cat .github/outputs/all_changed_files.txt); do
[[ -n $(find "${file}" -type f -size +50M) ]] && { echo "❌ $file exceeds file size limit"; exit 1; } || echo "✅ $file"
done
6 changes: 3 additions & 3 deletions src/DynamoCore/DynamoCore.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)Config\CS_SDK.props" />
</ImportGroup>
Expand Down Expand Up @@ -28,8 +28,8 @@
<ItemGroup Label="Common dependencies">
<PackageReference Include="Autodesk.IDSDK" Version="1.1.6" />
<PackageReference Include="Greg" Version="3.0.0.2955" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" GeneratePathProperty="true" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2880" GeneratePathProperty="true" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2916" GeneratePathProperty="true" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" GeneratePathProperty="true" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
<PackageReference Include="RestSharp" Version="109.0.1" CopyXML="true" />
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoCoreWpf/DynamoCoreWpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
<PackageReference Include="HelixToolkit.SharpDX.Core.Wpf" Version="2.24.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
<PackageReference Include="FontAwesome5" Version="2.1.11" />
<PackageReference Include="AvalonEdit" Version="6.3.0.90" CopyXML="true" />
<PackageReference Include="Greg" Version="3.0.0.2955" />
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoManipulation/DynamoManipulation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855"/>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/Analysis/Analysis.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<None Remove="AnalysisImages.resources" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
<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
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Compile Remove="GeometryColor.cs" />
</ItemGroup>
<ItemGroup Label="Common dependencies">
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/GeometryColor/GeometryColor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/GeometryUI/GeometryUI.csproj
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="3.0.0.2855"/>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ReferenceCopyLocalPaths>
</ItemDefinitionGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
</ItemGroup>
<ItemGroup>
<Page Include="Controls\ExportWithUnitsControl.xaml">
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/Tesellation/Tessellation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
<PackageReference Include="MIConvexHull" version="1.1.17.411" CopyPDB="true" />
<PackageReference Include="StarMath" version="2.0.17.1019" CopyPDB="true" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Greg" Version="3.0.0.2955" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
<PackageReference Include="Magick.NET.Core" Version="7.0.1" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="7.24.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/AnalysisTests/AnalysisTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AssemblyName>AnalysisTests</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855"/>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
</ItemGroup>
<!--net6.0 net8.0 etc-->
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageReference Include="AvalonEdit" Version="6.3.0.90" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
<PackageReference Include="DynamicLanguageRuntime" Version="1.2.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AssemblyName>DisplayTests</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855"/>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
</ItemGroup>
<!--net6.0 net8.0 etc-->
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/IronPythonTests/IronPythonTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="AvalonEdit" Version="6.3.0.90"/>
<PackageReference Include="NUnit" Version="2.6.3" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
<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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AssemblyName>TestServices</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855"/>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net48' ">
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/WorkflowTests/WorkflowTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2965" />
</ItemGroup>
<!--net6.0 net8.0 etc-->
<ItemGroup Condition=" '$(TargetFramework)' != 'net48' ">
Expand Down

0 comments on commit 52a71c0

Please sign in to comment.